This is an automated email from the git hooks/post-receive script. New commit to branch feature/4309_refactoring_correction_synchro_ref_avancee_serveur_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c09c02df8f99a1bac5468fd2e6b26e9bb4e558a9 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Wed Aug 31 12:52:31 2016 +0200 Refactore les précédentes correcvtion concernant la synchro ref avancee en serveur distant refs #4309 --- .../synchro/referential/ng/ReferentialSynchronizeRequest.java | 6 +++--- .../fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java index b85011e..1b800ab 100644 --- a/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java +++ b/services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/ng/ReferentialSynchronizeRequest.java @@ -50,11 +50,11 @@ public class ReferentialSynchronizeRequest implements ObserveDto { private final ImmutableMultimap<ReferentialSynchronizeTaskType, ReferentialSynchronizeTask<?>> tasks; private final ImmutableSet<Class<? extends ReferentialDto>> types; - private final ImmutableSetMultimap<Class<? extends ReferentialDto>, String> idsOnlyExistingOnThisSide; + private final ArrayListMultimap<Class<? extends ReferentialDto>, String> idsOnlyExistingOnThisSide; private ReferentialSynchronizeRequest(ImmutableMultimap<ReferentialSynchronizeTaskType, ReferentialSynchronizeTask<?>> tasks, ImmutableSet<Class<? extends ReferentialDto>> types, - ImmutableSetMultimap<Class<? extends ReferentialDto>, String> idsOnlyExistingOnThisSide) { + ArrayListMultimap<Class<? extends ReferentialDto>, String> idsOnlyExistingOnThisSide) { this.tasks = tasks; this.types = types; this.idsOnlyExistingOnThisSide = idsOnlyExistingOnThisSide; @@ -116,7 +116,7 @@ public class ReferentialSynchronizeRequest implements ObserveDto { } public ReferentialSynchronizeRequest build() { - return new ReferentialSynchronizeRequest(tasksBuilder.build(), typesBuilder.build(), ImmutableSetMultimap.copyOf(idsOnlyExistingOnThisSide)); + return new ReferentialSynchronizeRequest(tasksBuilder.build(), typesBuilder.build(), ArrayListMultimap.create(idsOnlyExistingOnThisSide)); } public <R extends ReferentialDto> Builder addTask(ReferentialSynchronizeTaskType taskType, Class<R> type, String referentialId, String replaceReferentialId) { diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java index 4dca077..6cc8d53 100644 --- a/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java +++ b/services-model/src/main/java/fr/ird/observe/services/dto/gson/ImmutableMultimapAdapter.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.dto.gson; */ import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.ImmutableSetMultimap; import com.google.common.reflect.TypeParameter; import com.google.common.reflect.TypeToken; import com.google.gson.JsonDeserializationContext; @@ -52,7 +53,7 @@ public class ImmutableMultimapAdapter implements JsonSerializer<ImmutableMultima @Override public ImmutableMultimap deserialize(JsonElement json, Type type, JsonDeserializationContext context) throws JsonParseException { - ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); + ImmutableMultimap.Builder builder = ImmutableSetMultimap.builder(); Type[] actualTypeArguments = ((ParameterizedType) type).getActualTypeArguments(); Type keyType = actualTypeArguments[0]; @@ -62,11 +63,10 @@ public class ImmutableMultimapAdapter implements JsonSerializer<ImmutableMultima Map map = context.deserialize(json, type2); for (Object key : map.keySet()) { - Object multimapKeyType = ((Class) keyType).cast(key); List multimapValues = (List) map.get(key); for (Object multimapValue : multimapValues) { - builder.put(multimapKeyType, multimapValue); + builder.put(key, multimapValue); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.