Build: #70 was successful Manual run by Tomasz Mueller
Code commits
openmrs-module-sync2
-
Kamil Madej 6c71a5db319b405bcc0fed01cf4a0a78717e580e
Merge pull request #130 from openmrs/snapshot-1.0.5
Update FHIR, Atomfeed versions to snapshot -
Kamil Madej 4cac637198293d5e885f5014581de41d08c81dd0
Update FHIR, Atomfeed versions to snapshot
-
Kamil Madej bd50b280ccaedc86216caf8d2c9c5c2aacef0f90
Merge pull request #129 from openmrs/release-1.0.4
Prepare for 1.4.0 release -
Kamil Madej 5df455900dd06fa7f0909f0fc5721e39df37bbbc
Prepare for 1.4.0 release
-
Kamil Madej b069abc7665cc219ce0554374cca04ec8afdfefa
Merge pull request #128 from areklalo/SYNCT-261
SYNCT-261: Move load configuration view -
areklalo <alalo@soldevelo.com> 627936bbc563f17d67da4ee683cdda591f1386e3
SYNCT-261: Changes after review
-
areklalo <alalo@soldevelo.com> 3aa3c73ca7cef46e81e07256da38a86320aff326
SYNCT-261: Moved alert message template to separate fragment
- omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version 3aa3c73ca7cef46e81e07256da38a86320aff326) (diffs)
- omod/src/main/webapp/resources/styles/alertMessage.css (version 3aa3c73ca7cef46e81e07256da38a86320aff326) (diffs)
- omod/src/main/webapp/resources/styles/sync2.css (version 3aa3c73ca7cef46e81e07256da38a86320aff326) (diffs)
- omod/src/main/webapp/sync2.jsp (version 3aa3c73ca7cef46e81e07256da38a86320aff326) (diffs)
- omod/src/main/webapp/sync2Configuration.jsp (version 3aa3c73ca7cef46e81e07256da38a86320aff326) (diffs)
- omod/src/main/webapp/template/alertMessage.jsp (version 3aa3c73ca7cef46e81e07256da38a86320aff326) (diffs)
-
areklalo <alalo@soldevelo.com> 1e3fdca1986312abfd0d3b464eb4cd4ff80f5056
SYNCT-261: Fixed issue with blocking the pull/ push buttons when the parent instance URI is not valid
-
areklalo <alalo@soldevelo.com> b10cf84c97d93360d8806587c29fc675ae8848e2
SYNCT-261: Fixed issue with the Sync 2 page
-
areklalo <alalo@soldevelo.com> bba861bc187321dbf3970358201f210cd8caab7c
SYNCT-261: Added the Javadocs to the sync2 controller
-
areklalo <alalo@soldevelo.com> 54659b4ac5bff46cdd81d6c5fc7657ab5eed125b
SYNCT-261: Added the Javadocs to the configuration controller
-
areklalo <alalo@soldevelo.com> 8d0bc00915fa2b625029c1113b27fa30c8e2f549
SYNCT-261: Added support of importing configuration from a file and the JSON validation. Extra fixes some issues with the Sync2 page.
- omod/src/main/java/org/openmrs/module/sync2/SyncMessageUtils.java (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ConfigurationController.java (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549) (diffs)
- omod/src/main/webapp/resources/scripts/sync2.js (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549) (diffs)
- omod/src/main/webapp/resources/styles/sync2.css (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549) (diffs)
- omod/src/main/webapp/sync2.jsp (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549) (diffs)
- omod/src/main/webapp/sync2Configuration.jsp (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549) (diffs)
- omod/src/main/webapp/template/localHeader.jsp (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549) (diffs)
-
areklalo <alalo@soldevelo.com> 1020fb687b49f07213e59ce50d5d8305648d2d2c
Renamed the Spring bean of the default conflict merge behavior
- api/src/main/java/org/openmrs/module/sync2/SyncConstants.java (version 1020fb687b49f07213e59ce50d5d8305648d2d2c) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/conflict/impl/RestrictConflictMergeBehaviourImpl.java (version 1020fb687b49f07213e59ce50d5d8305648d2d2c) (diffs)
- omod/src/main/resources/config.xml (version 1020fb687b49f07213e59ce50d5d8305648d2d2c) (diffs)
-
areklalo <alalo@soldevelo.com> 42ff4e58bbef30405cbedf68b732f9507d709e8b
SYNCT-261: Added page to the admin list and fixed issue with the subpages links
- omod/src/main/java/org/openmrs/module/sync2/extension/html/AdminList.java (version 42ff4e58bbef30405cbedf68b732f9507d709e8b) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ConfigurationController.java (version 42ff4e58bbef30405cbedf68b732f9507d709e8b) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version 42ff4e58bbef30405cbedf68b732f9507d709e8b) (diffs)
- omod/src/main/webapp/sync2Configuration.jsp (version 42ff4e58bbef30405cbedf68b732f9507d709e8b) (diffs)
- omod/src/main/webapp/template/localHeader.jsp (version 42ff4e58bbef30405cbedf68b732f9507d709e8b) (diffs)
-
rstencel <rstencel@soldevelo.com> bad8015711cbc18c26baa0c948594e995f955af7
Saving and importing JSON working
- omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ConfigurationController.java (version bad8015711cbc18c26baa0c948594e995f955af7) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version bad8015711cbc18c26baa0c948594e995f955af7) (diffs)
- omod/src/main/webapp/sync2Configuration.jsp (version bad8015711cbc18c26baa0c948594e995f955af7) (diffs)
-
Wyclif Luyima e08ba5d664c53cb15fe94692e453aad525536995
SYNCT-292 - Unable to sync a patient with a person attribute type value that is an instance of an Attributable type (#125)
SYNCT-292 - Unable to sync a patient with a person attribute type value that is an instance of an Attributable type
SYNCT-292 - Unable to sync a patient with a person attribute type value that is an instance of an Attributable type- api/src/main/java/org/openmrs/module/sync2/client/rest/impl/RestResourceConverterImpl.java (version e08ba5d664c53cb15fe94692e453aad525536995) (diffs)
- omod/pom.xml (version e08ba5d664c53cb15fe94692e453aad525536995) (diffs)
- omod/src/test/java/org/openmrs/module/sync2/RestResourceConverterTest.java (version e08ba5d664c53cb15fe94692e453aad525536995) (diffs)
-
Wyclif Luyima <wyclif.luyima@gmail.com> 72736d3041f9f73c6ccbcf3827a1657926c54b88
Added newer version is jackson-databind
-
Wyclif Luyima <wyclif.luyima@gmail.com> 088f3a602a29dc7134e963adb636604aeed7bffe
Excluded duplicate jackson-databind dependency
-
Wyclif Luyima <wyclif.luyima@gmail.com> cbac1908603f097e2d35976473007fdafdd8bd77
Removed duplicate dependency in api sub project
-
rstencel <44087721+rstencel@users.noreply.github.com> f94481ab660f954f143637c7bb10832d4066432e
SYNCT-260 Moved action buttons to Legacy UI (#126)
* Added 4 action buttons, added controllers for manual push and pull
* Added links to Audit Log and Configuration; added alerts for push and pull operations results (success, failure)
* Code cleaning, enabling custom SyncValidation errors alert messages
* Deleted mocks
* Added jsp page and a controller for it
* Revert "Added jsp page and a controller for it"
This reverts commit 08c77eb5e9444279dc70782f91b41724b5028bb4.- omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version f94481ab660f954f143637c7bb10832d4066432e) (diffs)
- omod/src/main/webapp/resources/styles/sync2.css (version f94481ab660f954f143637c7bb10832d4066432e) (diffs)
- omod/src/main/webapp/sync2.jsp (version f94481ab660f954f143637c7bb10832d4066432e) (diffs)
-
Wyclif Luyima <wyclif.luyima@gmail.com> 7970e4a2e191123281502721fbcb4e98eb1abb1a
Fixing broken build
-
Arkadiusz Lalo <alalo@soldevelo.com> 3f0fd954f5fc7b884d1445f397491fe6221e2ef2
SYNCT-288: Added configuration of an event handler (#124)
- api/src/main/java/org/openmrs/module/sync2/SyncConstants.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/mapper/impl/AtomfeedEventConfigurationMapperImpl.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/mapper/impl/EventConfigurationMapperImpl.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/scheduler/SyncPullTask.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/scheduler/SyncPushTask.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPullServiceImpl.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPushServiceImpl.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/atomfeed/AtomFeedEventConfigurationServiceImpl.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/atomfeed/AtomfeedEventConfigurationServiceImpl.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/utils/ContextUtils.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/utils/SyncUtils.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/LocalAtomfeedFeedReaderImpl.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/ParentAtomfeedFeedReaderImpl.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/mapper/impl/AtomfeedEventConfigurationMapperImplTest.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/mapper/impl/EventConfigurationMapperImplTest.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/service/impl/atomfeed/AtomFeedEventConfigurationServiceImplTest.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/service/impl/atomfeed/AtomfeedEventConfigurationServiceImplTest.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/page/controller/ManualSyncPullPageController.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/page/controller/ManualSyncPushPageController.java (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
- omod/src/main/resources/config.xml (version 3f0fd954f5fc7b884d1445f397491fe6221e2ef2) (diffs)
-
wojtekbu <wojtekbu@users.noreply.github.com> 65920a3403207db063acf8541ded143f1ae96bf2
SYNCT-286: Added java docs (#123)
* SYNCT-286: Replaced category with category enum
* SYNCT-286: Renamed implementation of Feed Reader
* SYNCT-286: Added java docs- api/src/main/java/org/openmrs/module/sync2/api/mapper/EventConfigurationMapper.java (version 65920a3403207db063acf8541ded143f1ae96bf2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/LocalFeedReader.java (version 65920a3403207db063acf8541ded143f1ae96bf2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/ParentFeedReader.java (version 65920a3403207db063acf8541ded143f1ae96bf2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/LocalAtomfeedFeedWorker.java (version 65920a3403207db063acf8541ded143f1ae96bf2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/LocalFeedWorker.java (version 65920a3403207db063acf8541ded143f1ae96bf2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/ParentAtomfeedFeedWorker.java (version 65920a3403207db063acf8541ded143f1ae96bf2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/ParentFeedWorker.java (version 65920a3403207db063acf8541ded143f1ae96bf2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/LocalAtomfeedFeedReaderImpl.java (version 65920a3403207db063acf8541ded143f1ae96bf2) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/ParentAtomfeedFeedReaderImpl.java (version 65920a3403207db063acf8541ded143f1ae96bf2) (diffs)
-
wojtekbu <wojtekbu@users.noreply.github.com> e08f575370e9549c49c21c3c326f5fc151ed8277
SYNCT-286: Refactoring of FeedReaders for increasing readability (#122)
* SYNCT-286: Replaced category with category enum
* SYNCT-286: Renamed implementation of Feed Reader- api/src/main/java/org/openmrs/module/sync2/api/filter/FilterService.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/filter/impl/PullFilterService.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/filter/impl/PushFilterService.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/scheduler/SyncPullTask.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/scheduler/SyncPushTask.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/SyncPullService.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/SyncPushService.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/UnifyService.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/AbstractSynchronizationService.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPullServiceImpl.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPushServiceImpl.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncRetryServiceImpl.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/UnifyServiceImpl.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/sync/SyncClient.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/LocalFeedReader.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/ParentFeedReader.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/LocalFeedWorker.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/ParentFeedWorker.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/AbstractAtomfeedFeedReader.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/AbstractFeedReader.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/LocalAtomfeedFeedReaderImpl.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/LocalFeedReaderImpl.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/ParentAtomfeedFeedReaderImpl.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/ParentFeedReaderImpl.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/sync/SyncClientTest.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/web/controller/rest/SyncConflictRestController.java (version e08f575370e9549c49c21c3c326f5fc151ed8277) (diffs)
-
Arkadiusz Lalo <alalo@soldevelo.com> 0a5fd8e013d07aa6a716365170893b206543098d
SYNCT-276: Fixed issue with the update operation (#121)
-
Arkadiusz Lalo <alalo@soldevelo.com> 166c4ec4b6ecf08b865f13025b172139d39f17e1
SYNCT-287: Create the more generic Sync event configuration (#119)
* SYNCT-287: Create the more generic Sync event configuration
* SYNCT-287: Made the EventConfigurationMapper interface more generic- api/src/main/java/org/openmrs/module/sync2/api/mapper/EventConfigurationMapper.java (version 166c4ec4b6ecf08b865f13025b172139d39f17e1) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/mapper/impl/EventConfigurationMapperImpl.java (version 166c4ec4b6ecf08b865f13025b172139d39f17e1) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/model/configuration/EventConfiguration.java (version 166c4ec4b6ecf08b865f13025b172139d39f17e1) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/EventConfigurationService.java (version 166c4ec4b6ecf08b865f13025b172139d39f17e1) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/AbstractSynchronizationService.java (version 166c4ec4b6ecf08b865f13025b172139d39f17e1) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/atomfeed/AtomFeedEventConfigurationServiceImpl.java (version 166c4ec4b6ecf08b865f13025b172139d39f17e1) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/utils/ContextUtils.java (version 166c4ec4b6ecf08b865f13025b172139d39f17e1) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/mapper/impl/EventConfigurationMapperImplTest.java (version 166c4ec4b6ecf08b865f13025b172139d39f17e1) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/service/impl/atomfeed/AtomFeedEventConfigurationServiceImplTest.java (version 166c4ec4b6ecf08b865f13025b172139d39f17e1) (diffs)
-
Arkadiusz Lalo <alalo@soldevelo.com> 2d839a27175fa585eb0efefa843b0447ee91fc98
SYNCT-276: Fixed issue with the delete operation (#120)
-
Arkadiusz Lalo <alalo@soldevelo.com> 304478276898d3c6dc909d952b8ab48705213c25
SYNCT-285: Improvement of the code readability (#118)
- api/src/main/java/org/openmrs/module/sync2/api/scheduler/SyncPullTask.java (version 304478276898d3c6dc909d952b8ab48705213c25) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/scheduler/SyncPushTask.java (version 304478276898d3c6dc909d952b8ab48705213c25) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/LocalFeedWorker.java (version 304478276898d3c6dc909d952b8ab48705213c25) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/ParentFeedWorker.java (version 304478276898d3c6dc909d952b8ab48705213c25) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/LocalFeedWorker.java (version 304478276898d3c6dc909d952b8ab48705213c25) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/ParentFeedWorker.java (version 304478276898d3c6dc909d952b8ab48705213c25) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/AbstractFeedReader.java (version 304478276898d3c6dc909d952b8ab48705213c25) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/LocalFeedReaderImpl.java (version 304478276898d3c6dc909d952b8ab48705213c25) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/atomfeed/impl/ParentFeedReaderImpl.java (version 304478276898d3c6dc909d952b8ab48705213c25) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/impl/AbstractFeedReader.java (version 304478276898d3c6dc909d952b8ab48705213c25) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/impl/LocalFeedReaderImpl.java (version 304478276898d3c6dc909d952b8ab48705213c25) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/reader/impl/ParentFeedReaderImpl.java (version 304478276898d3c6dc909d952b8ab48705213c25) (diffs)
-
Arkadiusz Lalo <alalo@soldevelo.com> a8461207a516d7fff570a3014af92be1ab20bcbe
SYNCT-276: Extend the configuration to give fine grained control (#117)
* SYNCT-276: Added the "preferredClient" field to the ClassConfig and added the Serializable interface to the config classes
* SYNCT-276: Changed the approach to determine the preferred client (first try to use the class preferred client) and updated the unit tests
* SYNCT-276: Added support of specific clients configuration
* SYNCT-276: Added the possibility to set specific clients credentials
* SYNCT-276: Changes after the review- api/src/main/java/org/openmrs/module/sync2/SyncConstants.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/model/configuration/ClassConfiguration.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/model/configuration/ClientConfiguration.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/model/configuration/GeneralConfiguration.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/model/configuration/SyncConfiguration.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/model/configuration/SyncMethodConfiguration.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/model/configuration/WhitelistConfiguration.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/model/enums/Operation.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/model/enums/SyncOperation.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/SyncConfigurationService.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/AbstractSynchronizationService.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncConfigurationServiceImpl.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPullServiceImpl.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPushServiceImpl.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/sync/SyncClient.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/utils/SyncAuditUtils.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/utils/SyncConfigurationUtils.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/utils/SyncUtils.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/mother/SyncConfigurationMother.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/service/impl/SyncConfigurationServiceImplTest.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/sync/SyncClientTest.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/utils/SyncConfigurationUtilsTest.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/utils/SyncUtilsTest.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/test/resources/noWhitelistConfiguration.json (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/test/resources/sampleSyncConfiguration.json (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- api/src/test/resources/sampleSyncConfiguration2.json (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/page/controller/Sync2PageController.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/web/controller/rest/SyncAuditRestController.java (version a8461207a516d7fff570a3014af92be1ab20bcbe) (diffs)
-
wojtekbu <wojtekbu@users.noreply.github.com> 517dd38154bc8dbdd734237669ebc0f1cf47f9f0
SYNCT-278 Fetch real objects and send merged object (#116)
* SYNCT-278: Added fetching end sending merged object
* SYNCT-278: Added handling merged conflict sync
* SYNCT-278: Added redirection on success
* SYNCT-278: Refactoring of conflict audit message handling- api/src/main/java/org/openmrs/module/sync2/SyncConstants.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/dao/SyncAuditDao.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/dao/impl/SyncAuditDaoImpl.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/SyncAuditService.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/SyncPushService.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncAuditServiceImpl.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPushServiceImpl.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/fragment/controller/AuditDetailsFragmentController.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/web/controller/ConflictResolutionController.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/web/controller/rest/SyncConflictRestController.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0) (diffs)
- omod/src/main/webapp/conflictResolution.jsp (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0) (diffs)
- omod/src/main/webapp/fragments/auditDetails.gsp (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0) (diffs)
-
rstencel <44087721+rstencel@users.noreply.github.com> 303ab4620aca75ee25b40c04dcf25ee0497e420b
SYNCT-244: Added frontend support for conflict resolution (#115)
* SYNCT-244: Initial commit for manual conflict resolution UI
* SYNCT-244: Conflict resolution page created, button redirecting from audit log to conflict resolution page added
* Object fields shown in table
* Two compared objects displayed, differences checked, radio buttons added
* Changed layout and CSS; changes are applied to object's JSON representation
* Merging objects working
* Integration with Audit Log
* Code cleaning
* Code cleaning
* Fixed usage of inexistent getter
* Removed unused link
* Improved code readibility- api/src/main/java/org/openmrs/module/sync2/api/model/audit/AuditMessage.java (version 303ab4620aca75ee25b40c04dcf25ee0497e420b) (diffs)
- api/src/main/resources/messages.properties (version 303ab4620aca75ee25b40c04dcf25ee0497e420b) (diffs)
- api/src/main/resources/messages_es.properties (version 303ab4620aca75ee25b40c04dcf25ee0497e420b) (diffs)
- api/src/main/resources/messages_fr.properties (version 303ab4620aca75ee25b40c04dcf25ee0497e420b) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/service/impl/SyncAuditServiceImplTest.java (version 303ab4620aca75ee25b40c04dcf25ee0497e420b) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/fragment/controller/AuditDetailsFragmentController.java (version 303ab4620aca75ee25b40c04dcf25ee0497e420b) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/web/controller/ConflictResolutionController.java (version 303ab4620aca75ee25b40c04dcf25ee0497e420b) (diffs)
- omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version 303ab4620aca75ee25b40c04dcf25ee0497e420b) (diffs)
- omod/src/main/webapp/conflictResolution.jsp (version 303ab4620aca75ee25b40c04dcf25ee0497e420b) (diffs)
- omod/src/main/webapp/fragments/auditDetails.gsp (version 303ab4620aca75ee25b40c04dcf25ee0497e420b) (diffs)
- omod/src/main/webapp/resources/scripts/sync2.conflict.js (version 303ab4620aca75ee25b40c04dcf25ee0497e420b) (diffs)
- omod/src/main/webapp/resources/styles/conflictResolution.css (version 303ab4620aca75ee25b40c04dcf25ee0497e420b) (diffs)
-
Arkadiusz Lalo <alalo@soldevelo.com> b3ed60cfd5b0cb773a30add07f70e33e2d3f7704
SYNCT-253: Improved the code readability (#111)
* SYNCT-253: Improved the code readability
* SYNCT-253: Changed the MD5 hash to the SHA512 hash
* SYNCT-253: Removed unnecessary REGEX
* SYNCT-253: Fixed build- api/src/main/java/org/openmrs/module/sync2/api/conflict/impl/NewIsTheBestMergeBehaviourImpl.java (version b3ed60cfd5b0cb773a30add07f70e33e2d3f7704) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/conflict/impl/RestrictConflictMergeBehaviourImpl.java (version b3ed60cfd5b0cb773a30add07f70e33e2d3f7704) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPushServiceImpl.java (version b3ed60cfd5b0cb773a30add07f70e33e2d3f7704) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/utils/SyncHashcodeUtils.java (version b3ed60cfd5b0cb773a30add07f70e33e2d3f7704) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/conflict/impl/ConflictDetectionImplTest.java (version b3ed60cfd5b0cb773a30add07f70e33e2d3f7704) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/conflict/impl/NewIsTheBestMergeBehaviourImplTest.java (version b3ed60cfd5b0cb773a30add07f70e33e2d3f7704) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/conflict/impl/RestrictConflictMergeBehaviourImplTest.java (version b3ed60cfd5b0cb773a30add07f70e33e2d3f7704) (diffs)
-
Arkadiusz Lalo <alalo@soldevelo.com> 5e1d42670cd48a4efab2bf983214ca321a0ac86d
SYNCT-253: Added logic used to detect and resolve the conflicts (#110)
* SYNCT-253: Added logic used to detect and resolve the conflicts
* SYNCT-253: Update the sync pull and push services
* SYNCT-253: Fixed issue with the newIsTheBest strategy- api/src/main/java/org/openmrs/module/sync2/SyncConstants.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/conflict/ConflictDetection.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/conflict/impl/ConflictDetectionImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/conflict/impl/NewIsTheBestMergeBehaviourImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/conflict/impl/RestrictConflictMergeBehaviourImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/converter/AuditMessageToStringConverter.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/converter/StringToAuditMessageConverter.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/exceptions/MergeConflictException.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/mapper/impl/MergeConflictMapperImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/model/SyncObject.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/model/audit/AuditMessage.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/model/enums/OpenMRSIdEnum.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/serializers/AuditMessageDeserializer.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/serializers/AuditMessageSerializer.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/ParentObjectHashcodeService.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/UnifyService.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/AbstractSynchronizationService.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/ParentObjectHashcodeServiceImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncAuditServiceImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPullServiceImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPushServiceImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/UnifyServiceImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/utils/SimpleObjectSerializationUtils.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/utils/SyncHashcodeUtils.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/api/utils/SyncUtils.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/java/org/openmrs/module/sync2/client/ClientHelperFactory.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/resources/SyncAuditMessage.hbm.xml (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/main/resources/liquibase.xml (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/conflict/impl/ConflictDetectionImplTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/conflict/impl/NewIsTheBestMergeBehaviourImplTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/conflict/impl/RestrictConflictMergeBehaviourImplTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/mother/ParentObjectHashcodeMother.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/mother/SimpleObjectMother.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/service/impl/AbstractSynchronizationServiceTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/service/impl/SyncAuditServiceImplTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/utils/SimpleObjectSerializationUtilsTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/java/org/openmrs/module/sync2/api/utils/SyncHashcodeUtilsUtilsTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/java/org/openmrs/module/sync2/client/rest/RESTClientHelperTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/resources/audit/sampleAuditMessage.json (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/resources/audit/sampleAuditMessages.json (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- api/src/test/resources/expectedSimpleObject.json (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)
- omod/src/main/resources/config.xml (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d) (diffs)