This is an automated email from the git hooks/post-receive script. New commit to branch feature/4309_synchro_referential in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit faf9de4e17496f1a0549b544f773922ef7c55914 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 11 15:49:44 2016 +0200 Do not use the sunchronize mode to build referential diffs --- .../diff/ReferentialSynchronizeDiffs.java | 27 ++++++---------------- .../diff/ReferentialSynchronizeDiffsEngine.java | 5 ++-- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java index 52bd198..ec1f0f1 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffs.java @@ -2,9 +2,7 @@ package fr.ird.observe.services.service.actions.synchro.referential.diff; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.referential.ReferentialDto; -import fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode; -import java.util.Objects; import java.util.Optional; /** @@ -14,48 +12,37 @@ import java.util.Optional; */ public class ReferentialSynchronizeDiffs { - public static Builder builder(ReferentialSynchronizeMode mode) { - return new Builder(mode); + public static Builder builder() { + return new Builder(); } public static class Builder { - private final ReferentialSynchronizeMode mode; private final ReferentialSynchronizeDiff.Builder leftBuilder; private final ReferentialSynchronizeDiff.Builder rightBuilder; - private Builder(ReferentialSynchronizeMode mode) { - Objects.nonNull(mode); - this.mode = mode; + private Builder() { leftBuilder = ReferentialSynchronizeDiff.builder(); rightBuilder = ReferentialSynchronizeDiff.builder(); } <R extends ReferentialDto> Builder addLeftAddedReferential(Class<R> referentialName, ReferentialSynchronizeDiffState referentialDto) { - if (mode.isLeftWrite()) { - leftBuilder.addAddedReferential(referentialName, referentialDto); - } + leftBuilder.addAddedReferential(referentialName, referentialDto); return this; } <R extends ReferentialDto> Builder addLeftUpdatedReferential(Class<R> referentialName, ReferentialSynchronizeDiffState referentialDto) { - if (mode.isLeftWrite()) { - leftBuilder.addUpdatedReferential(referentialName, referentialDto); - } + leftBuilder.addUpdatedReferential(referentialName, referentialDto); return this; } <R extends ReferentialDto> Builder addRightAddedReferential(Class<R> referentialName, ReferentialSynchronizeDiffState referentialDto) { - if (mode.isRightWrite()) { - rightBuilder.addAddedReferential(referentialName, referentialDto); - } + rightBuilder.addAddedReferential(referentialName, referentialDto); return this; } <R extends ReferentialDto> Builder addRightUpdatedReferential(Class<R> referentialName, ReferentialSynchronizeDiffState referentialDto) { - if (mode.isRightWrite()) { - rightBuilder.addUpdatedReferential(referentialName, referentialDto); - } + rightBuilder.addUpdatedReferential(referentialName, referentialDto); return this; } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java index f20ffc5..40dbcfc 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffsEngine.java @@ -4,7 +4,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; -import fr.ird.observe.services.service.actions.synchro.referential.ReferentialSynchronizeMode; import java.util.Set; import java.util.stream.Collectors; @@ -25,9 +24,9 @@ public class ReferentialSynchronizeDiffsEngine { this.rightDiffService = rightDiffService; } - public ReferentialSynchronizeDiffs build(ReferentialSynchronizeMode mode) { + public ReferentialSynchronizeDiffs build() { - ReferentialSynchronizeDiffs.Builder result = ReferentialSynchronizeDiffs.builder(mode); + ReferentialSynchronizeDiffs.Builder result = ReferentialSynchronizeDiffs.builder(); ReferentialDataSourceStates leftSourceReferentialStates = leftDiffService.getSourceReferentialStates(); ReferentialDataSourceStates rightSourceReferentialStates = rightDiffService.getSourceReferentialStates(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.