Build: #44 was successful Changes by Dimitri Renault <dimitri@mekomsolutions.com>
Code commits
Git
-
Dimitri Renault <dimitri@mekomsolutions.com> 17605366e442dc695185a9abfafd6809d852fb67
ADDR-109: Activator to process and load the metadata provided in configuration/addresshierarchy. (#18)
Spike on a first pass at enabling configuration of address hierarchy, levels, and address template from xml configuration
modified: api/pom.xml
modified: api/src/main/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivator.java
new file: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressComponent.java
new file: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfiguration.java
new file: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfigurationLoader.java
new file: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressHierarchyFile.java
new file: api/src/test/java/org/openmrs/module/addresshierarchy/AddressConfigurationLoaderTest.java
new file: api/src/test/resources/org/openmrs/module/addresshierarchy/include/addressConfiguration.xml
modified: omod/pom.xml
modified: omod/src/main/resources/config.xml
modified: pom.xml
Added context sensitive AddressHierarchyActivatorTest.
Asserting that the configuration provided through configuration/addresshierarchy is loaded as expected.
modified: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfigurationLoader.java
new file: api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java
modified: api/src/test/resources/TestingApplicationContext.xml
new file: api/src/test/resources/testAppDataDir/configuration/addresshierarchy/address-hierarchy-entries.csv
new file: api/src/test/resources/testAppDataDir/configuration/addresshierarchy/addressConfiguration.xml
One ad-hoc checkum file per config. file.
modified: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfigurationLoader.java
modified: api/src/test/java/org/openmrs/module/addresshierarchy/AddressConfigurationLoaderTest.java
modified: api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java
Using MD5 instead of CRC32 for checksums.
modified: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfigurationLoader.java
modified: api/src/test/java/org/openmrs/module/addresshierarchy/AddressConfigurationLoaderTest.java
Dependency on Apache Commons Codec.
modified: api/pom.xml
Isolated config. related util features into ConfigLoaderUtil.
modified: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfigurationLoader.java
new file: api/src/main/java/org/openmrs/module/addresshierarchy/config/ConfigLoaderUtil.java
modified: api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java
renamed: api/src/test/java/org/openmrs/module/addresshierarchy/AddressConfigurationLoaderTest.java -> api/src/test/java/org/openmrs/module/addresshierarchy/config/AddressConfigurationLoaderTest.java
new file: api/src/test/java/org/openmrs/module/addresshierarchy/config/ConfigLoaderUtilTest.java
Using reflection on AddressTemplate.
Because of its change of package location before and after Core 2.x.
modified: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfiguration.java
modified: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfigurationLoader.java
ADDR-109: Import can force a wipe and matches provided levels with saved levels.
Added the <wipe> element, defaulting to false.
modified: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfiguration.java
modified: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfigurationLoader.java
modified: api/src/test/java/org/openmrs/module/addresshierarchy/config/AddressConfigurationLoaderTest.java
modified: api/src/test/resources/org/openmrs/module/addresshierarchy/include/addressConfiguration.xml
Added tests verifying that the wipe happens or not based on the provided config.
modified: api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java
This required a another test config.
new file: api/src/test/resources/testAppDataDir2/configuration/addresshierarchy/address-hierarchy-entries.csv
new file: api/src/test/resources/testAppDataDir2/configuration/addresshierarchy/addressConfiguration.xml
ADDR-109: Address hierarchy levels to be named as per the address template name mappings.
modified: api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfigurationLoader.java
ADDR-109: Enhancements to ConfigLoaderUtil.
modified: api/src/main/java/org/openmrs/module/addresshierarchy/config/ConfigLoaderUtil.java- api/pom.xml (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/main/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivator.java (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressComponent.java (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfiguration.java (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressConfigurationLoader.java (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/main/java/org/openmrs/module/addresshierarchy/config/AddressHierarchyFile.java (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/main/java/org/openmrs/module/addresshierarchy/config/ConfigLoaderUtil.java (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/test/java/org/openmrs/module/addresshierarchy/AddressHierarchyActivatorTest.java (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/test/java/org/openmrs/module/addresshierarchy/config/AddressConfigurationLoaderTest.java (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/test/java/org/openmrs/module/addresshierarchy/config/ConfigLoaderUtilTest.java (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/test/resources/TestingApplicationContext.xml (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/test/resources/org/openmrs/module/addresshierarchy/include/addressConfiguration.xml (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/test/resources/testAppDataDir/configuration/addresshierarchy/address-hierarchy-entries.csv (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/test/resources/testAppDataDir/configuration/addresshierarchy/addressConfiguration.xml (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/test/resources/testAppDataDir2/configuration/addresshierarchy/address-hierarchy-entries.csv (version 17605366e442dc695185a9abfafd6809d852fb67)
- api/src/test/resources/testAppDataDir2/configuration/addresshierarchy/addressConfiguration.xml (version 17605366e442dc695185a9abfafd6809d852fb67)
- omod/pom.xml (version 17605366e442dc695185a9abfafd6809d852fb67)
- omod/src/main/resources/config.xml (version 17605366e442dc695185a9abfafd6809d852fb67)
- pom.xml (version 17605366e442dc695185a9abfafd6809d852fb67)