Build: #111 was successful
Job: Default Job was successful
Code commits
Git
-
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)
- api/src/main/java/org/openmrs/module/sync2/api/conflict/ConflictDetection.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/conflict/impl/ConflictDetectionImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/conflict/impl/NewIsTheBestMergeBehaviourImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/conflict/impl/RestrictConflictMergeBehaviourImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/converter/AuditMessageToStringConverter.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/converter/StringToAuditMessageConverter.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/exceptions/MergeConflictException.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/mapper/impl/MergeConflictMapperImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/model/SyncObject.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/model/audit/AuditMessage.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/model/enums/OpenMRSIdEnum.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/serializers/AuditMessageDeserializer.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/serializers/AuditMessageSerializer.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/service/ParentObjectHashcodeService.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/service/UnifyService.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/AbstractSynchronizationService.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/ParentObjectHashcodeServiceImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncAuditServiceImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPullServiceImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPushServiceImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/service/impl/UnifyServiceImpl.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/utils/SimpleObjectSerializationUtils.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/utils/SyncHashcodeUtils.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/api/utils/SyncUtils.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/java/org/openmrs/module/sync2/client/ClientHelperFactory.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/resources/SyncAuditMessage.hbm.xml (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/main/resources/liquibase.xml (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/java/org/openmrs/module/sync2/api/conflict/impl/ConflictDetectionImplTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/java/org/openmrs/module/sync2/api/conflict/impl/NewIsTheBestMergeBehaviourImplTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/java/org/openmrs/module/sync2/api/conflict/impl/RestrictConflictMergeBehaviourImplTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/java/org/openmrs/module/sync2/api/mother/ParentObjectHashcodeMother.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/java/org/openmrs/module/sync2/api/mother/SimpleObjectMother.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/java/org/openmrs/module/sync2/api/service/impl/AbstractSynchronizationServiceTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/java/org/openmrs/module/sync2/api/service/impl/SyncAuditServiceImplTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/java/org/openmrs/module/sync2/api/utils/SimpleObjectSerializationUtilsTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/java/org/openmrs/module/sync2/api/utils/SyncHashcodeUtilsUtilsTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/java/org/openmrs/module/sync2/client/rest/RESTClientHelperTest.java (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/resources/audit/sampleAuditMessage.json (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/resources/audit/sampleAuditMessages.json (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- api/src/test/resources/expectedSimpleObject.json (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
- omod/src/main/resources/config.xml (version 5e1d42670cd48a4efab2bf983214ca321a0ac86d)
