Skip to navigation
Skip to content

Stages & jobs

Test module
- Build and test Module
Release
Requires a user to start manually
- Release to Maven

Code commits

Git

Wyclif Luyima 19 Dec 2019 3ef3a4521dc495c695f5b4218569a2b6b5644156

Added support for filters to be added to module hbm files
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/DataFilterBeanFactoryPostProcessor.java (version 3ef3a4521dc495c695f5b4218569a2b6b5644156)
- api/src/main/java/org/openmrs/module/datafilter/DataFilterSessionFactoryBean.java (version 3ef3a4521dc495c695f5b4218569a2b6b5644156)
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version 3ef3a4521dc495c695f5b4218569a2b6b5644156)
Wyclif Luyima 17 Dec 2019 ed7e55f973dc877d2a1bbdc96a38b8d718f2b3d5

Moved some code to utility methods
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/DataFilterBeanFactoryPostProcessor.java (version ed7e55f973dc877d2a1bbdc96a38b8d718f2b3d5)
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version ed7e55f973dc877d2a1bbdc96a38b8d718f2b3d5)
Wyclif Luyima 17 Dec 2019 a631c0cd6a7cc36670228444a725b73cfb3e7878

Escape xml special characters in filter conditions
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version a631c0cd6a7cc36670228444a725b73cfb3e7878)
- api/src/main/resources/add-entity-filter-xslt-template.xml (version a631c0cd6a7cc36670228444a725b73cfb3e7878)
- api/src/test/resources/filters/hibernate/test.json (version a631c0cd6a7cc36670228444a725b73cfb3e7878)
Wyclif Luyima 15 Dec 2019 c8859100cc20454ba2c29e9199a2b918b6ccc0cf

Delete datafilter folder from temp dir on jvm exit
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/DataFilterBeanFactoryPostProcessor.java (version c8859100cc20454ba2c29e9199a2b918b6ccc0cf)
Wyclif Luyima 14 Dec 2019 3bbf8fa32ae2024d0aeb647033660c8fd298c2ce

Fixed issue where the session factory bean can't get reconfigured or slows down because it was depending on an internet connection to fetch hibernate dtds when parsing hbm and cfg files
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version 3bbf8fa32ae2024d0aeb647033660c8fd298c2ce)
- api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version 3bbf8fa32ae2024d0aeb647033660c8fd298c2ce)
Wyclif Luyima 14 Dec 2019 29da40827291d95bbde3d376fa55c6e0c7fba10c

Added integration tests for the bean factory post processor
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/test/java/org/openmrs/module/datafilter/DataFilterBeanFactoryPostProcessorTest.java (version 29da40827291d95bbde3d376fa55c6e0c7fba10c)
- api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version 29da40827291d95bbde3d376fa55c6e0c7fba10c)
- api/src/test/resources/filters/hibernate/test.json (version 29da40827291d95bbde3d376fa55c6e0c7fba10c)
Wyclif Luyima 13 Dec 2019 ebe0f127aee82f65d37f9de562d394d8d6576087

Refactored some code
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/DataFilterBeanFactoryPostProcessor.java (version ebe0f127aee82f65d37f9de562d394d8d6576087)
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version ebe0f127aee82f65d37f9de562d394d8d6576087)
Wyclif Luyima 13 Dec 2019 07f76b400f5eeff097cc0a1c56a25a84a3cd7475

Updated the javadocs of the factory processor, added missing method javadocs and also refactored some code out of the processor to utility methods
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/DataFilterBeanFactoryPostProcessor.java (version 07f76b400f5eeff097cc0a1c56a25a84a3cd7475)
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version 07f76b400f5eeff097cc0a1c56a25a84a3cd7475)
- api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version 07f76b400f5eeff097cc0a1c56a25a84a3cd7475)
Wyclif Luyima 12 Dec 2019 36d630745e3066812a877bf261671bba0b396fb9

Fixed issue where doctypes aren't getting included when transforming xml files
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/DataFilterBeanFactoryPostProcessor.java (version 36d630745e3066812a877bf261671bba0b396fb9)
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version 36d630745e3066812a877bf261671bba0b396fb9)
- api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version 36d630745e3066812a877bf261671bba0b396fb9)
Wyclif Luyima 12 Dec 2019 b1073eb7e78e148de54ab2047a110f12b0d02fc0

Implemented code in the BeanFactoryPostProcessor to create the new filtered hbm and cfg files
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/DataFilterBeanFactoryPostProcessor.java (version b1073eb7e78e148de54ab2047a110f12b0d02fc0)
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version b1073eb7e78e148de54ab2047a110f12b0d02fc0)
- api/src/main/resources/add-entity-filter-xslt-template.xml (version b1073eb7e78e148de54ab2047a110f12b0d02fc0)
- api/src/test/java/org/openmrs/module/datafilter/DataFilterBeanFactoryPostProcessorTest.java (version b1073eb7e78e148de54ab2047a110f12b0d02fc0)
Wyclif Luyima 10 Dec 2019 8ca8fb442517fe5a52c037c1083179b6def57213

Added xslt and code to change mapping resource locations in the hibernate cgf file
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version 8ca8fb442517fe5a52c037c1083179b6def57213)
- api/src/main/resources/update-mapping-loc-xslt-template.xml (version 8ca8fb442517fe5a52c037c1083179b6def57213)
- api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version 8ca8fb442517fe5a52c037c1083179b6def57213)
Wyclif Luyima 10 Dec 2019 a21500fbdbcb41d13576e7829768e2a0da3bc9b9

Added test to ensure null conditions are handled by the xslt
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version a21500fbdbcb41d13576e7829768e2a0da3bc9b9)
Wyclif Luyima 10 Dec 2019 a82f7b82b2d66175a86b13159258b26481b01486

Added processing of filter parameters when applying the filter xslt
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version a82f7b82b2d66175a86b13159258b26481b01486)
- api/src/main/resources/add-entity-filter-xslt-template.xml (version a82f7b82b2d66175a86b13159258b26481b01486)
- api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version a82f7b82b2d66175a86b13159258b26481b01486)
Wyclif Luyima 08 Dec 2019 a9e4acbeeef2af73a1bad417683d39dbd08b478f

Deleted datafilterHibernateCfg.xml file
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/resources/datafilterHibernate.cfg.xml (version a9e4acbeeef2af73a1bad417683d39dbd08b478f)
Wyclif Luyima 08 Dec 2019 3f68f8672433a66dfaeed1194b0d9a3d7c3cbb35

Added assertions to test for adding mapping resources
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/pom.xml (version 3f68f8672433a66dfaeed1194b0d9a3d7c3cbb35)
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version 3f68f8672433a66dfaeed1194b0d9a3d7c3cbb35)
- api/src/main/resources/add-entity-filter-xslt-template.xml (version 3f68f8672433a66dfaeed1194b0d9a3d7c3cbb35)
- api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version 3f68f8672433a66dfaeed1194b0d9a3d7c3cbb35)
Wyclif Luyima 08 Dec 2019 2c9de706591dc5b1826cac2c1b5f77e9fd4bf481

Added a freemarker template for the xslt to be used to add filters to hbm files
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version 2c9de706591dc5b1826cac2c1b5f77e9fd4bf481)
- api/src/main/resources/add-entity-filter-xslt-template.xml (version 2c9de706591dc5b1826cac2c1b5f77e9fd4bf481)
- api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version 2c9de706591dc5b1826cac2c1b5f77e9fd4bf481)
- pom.xml (version 2c9de706591dc5b1826cac2c1b5f77e9fd4bf481)
Wyclif Luyima 07 Dec 2019 5f1f62c5c24e9047b6bedf2b141c7f9bc6492524

Refactored exception handling in methods called by Util.getMappingResource
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version 5f1f62c5c24e9047b6bedf2b141c7f9bc6492524)
Wyclif Luyima 07 Dec 2019 8c74fc387f0c23d0a0908260b7c280ae71564410

Changed Util.getMappingResource to take a single classname
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version 8c74fc387f0c23d0a0908260b7c280ae71564410)
- api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version 8c74fc387f0c23d0a0908260b7c280ae71564410)
- api/src/test/resources/testCareSetting.hbm.xml (version 8c74fc387f0c23d0a0908260b7c280ae71564410)
- api/src/test/resources/testHibernateCfg.xml (version 8c74fc387f0c23d0a0908260b7c280ae71564410)
Wyclif Luyima 07 Dec 2019 53b8b3fa8f134fd1bacca239a1480a1bb2dd43d5

Added utility methods to look up hbm files for specific persistent classes
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/Util.java (version 53b8b3fa8f134fd1bacca239a1480a1bb2dd43d5)
- api/src/test/java/org/openmrs/module/datafilter/UtilTest.java (version 53b8b3fa8f134fd1bacca239a1480a1bb2dd43d5)
- api/src/test/resources/testCareSetting.hbm.xml (version 53b8b3fa8f134fd1bacca239a1480a1bb2dd43d5)
- api/src/test/resources/testEncounterType.hbm.xml (version 53b8b3fa8f134fd1bacca239a1480a1bb2dd43d5)
- api/src/test/resources/testHibernateCfg.xml (version 53b8b3fa8f134fd1bacca239a1480a1bb2dd43d5)
- api/src/test/resources/testLocation.hbm.xml (version 53b8b3fa8f134fd1bacca239a1480a1bb2dd43d5)
Wyclif Luyima 05 Dec 2019 342431c95a8ca2e301f087d4b8003f7895b7325e

Implemented the code that registers our custom hibernate.cfg.xml file
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/DataFilterBeanFactoryPostProcessor.java (version 342431c95a8ca2e301f087d4b8003f7895b7325e)
- api/src/main/java/org/openmrs/module/datafilter/DataFilterPostBeanProcessor.java (version 342431c95a8ca2e301f087d4b8003f7895b7325e)
Wyclif Luyima 05 Dec 2019 f06d92a72591097e4cf30e21a90cac8aa4ce6c8c

Spike to support filters in hbm files
Signed-off-by: Wyclif Luyima <wyclif@openmrs.org>
- api/src/main/java/org/openmrs/module/datafilter/DataFilterBeanFactoryPostProcessor.java (version f06d92a72591097e4cf30e21a90cac8aa4ce6c8c)
- api/src/main/java/org/openmrs/module/datafilter/DataFilterPostBeanProcessor.java (version f06d92a72591097e4cf30e21a90cac8aa4ce6c8c)
- api/src/main/resources/datafilterHibernate.cfg.xml (version f06d92a72591097e4cf30e21a90cac8aa4ce6c8c)