branch develop updated (684ce44 -> 8aa82c1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 684ce44 Test si le stream en entrée est gzippé lors de l'import d'un dump new 8aa82c1 changement d'implantaton pour l'ajout de type de reference dans la transformation de l'entité en formulaire. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8aa82c1d1c8fb852bdbda9b867c2bf2e18494259 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 11:57:35 2015 +0200 changement d'implantaton pour l'ajout de type de reference dans la transformation de l'entité en formulaire. Summary of changes: .../java/fr/ird/observe/services/ObserveServiceTopia.java | 14 +++++++------- .../ird/observe/services/builder/EntityToDtoBuilder.java | 5 ++++- .../service/seine/GearUseFeaturesSeineServiceTopia.java | 7 ++----- 3 files changed, 13 insertions(+), 13 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 8aa82c1d1c8fb852bdbda9b867c2bf2e18494259 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Aug 27 11:57:35 2015 +0200 changement d'implantaton pour l'ajout de type de reference dans la transformation de l'entité en formulaire. --- .../java/fr/ird/observe/services/ObserveServiceTopia.java | 14 +++++++------- .../ird/observe/services/builder/EntityToDtoBuilder.java | 5 ++++- .../service/seine/GearUseFeaturesSeineServiceTopia.java | 7 ++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index 8c2f811..dfc644c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -5,7 +5,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import fr.ird.observe.ObserveTopiaApplicationContext; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.Entities; @@ -190,18 +189,19 @@ public class ObserveServiceTopia implements ObserveService { } } - protected <E extends TopiaEntity, D extends IdDto> FormDto<D> entityToEditFormDto(Class<D> dtoType, Class<E> entityType, E entity) { - return entityToEditFormDto(dtoType, entityType, entity, Sets.<Class<? extends IdDto>>newHashSet()); - } + protected <E extends TopiaEntity, D extends IdDto> FormDto<D> entityToEditFormDto( + Class<D> dtoType, + Class<E> entityType, + E entity, + Class<? extends IdDto> ... includeReferenceDtoTypes) { - protected <E extends TopiaEntity, D extends IdDto> FormDto<D> entityToEditFormDto(Class<D> dtoType, Class<E> entityType, E entity, Set<Class<? extends IdDto>> referenceDtoTypes) { try (EntityToDtoBuilder<E, D> dtoBuilder = EntityToDtoBuilder.create(entityType, dtoType)) { // copy entity - D dto = dtoBuilder.build(serviceContext.getReferentialLocale(), entity); + D dto = dtoBuilder.build(serviceContext.getReferentialLocale(), entity, includeReferenceDtoTypes); // build label sets detected while copy - referenceDtoTypes.addAll(dtoBuilder.getReferenceTypes()); + ImmutableSet<Class<? extends IdDto>> referenceDtoTypes = dtoBuilder.getReferenceTypes(); ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); for (Class<? extends IdDto> referenceDtoType : referenceDtoTypes) { ReferenceSetDto referenceSet = getReferenceSet((Class<ReferentialDto>) referenceDtoType); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java index 172460b..3142212 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java @@ -3,6 +3,7 @@ package fr.ird.observe.services.builder; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; import com.google.common.reflect.TypeToken; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveDtoBinders; @@ -57,13 +58,15 @@ public class EntityToDtoBuilder<E extends TopiaEntity, D extends IdDto> implemen } - public D build(ReferentialLocale referentialLocale, E entity) { + public D build(ReferentialLocale referentialLocale, E entity, Class<? extends IdDto> ... includeReferenceDtoTypes) { Preconditions.checkNotNull(referentialLocale, "'referentialLocale' can't be null."); Preconditions.checkNotNull(entity, "'entity' can't be null."); ImmutableSet.Builder<Class<? extends IdDto>> referenceTypesBuilder = new ImmutableSet.Builder<>(); + referenceTypesBuilder.addAll(Lists.newArrayList(includeReferenceDtoTypes)); + Map<String, Object> entityProperties = binder.obtainProperties(entity, true); ImmutableMap.Builder<String, Object> dtoPropertiesBuilder = new ImmutableMap.Builder<>(); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineServiceTopia.java index f40e8dd..526453f 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/GearUseFeaturesSeineServiceTopia.java @@ -1,18 +1,15 @@ package fr.ird.observe.services.service.seine; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.GearCaracteristicDto; import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.DataNotFoundException; -import org.apache.commons.lang3.StringUtils; import java.util.List; @@ -57,7 +54,7 @@ public class GearUseFeaturesSeineServiceTopia extends ObserveServiceTopia implem GearUseFeaturesSeineDto.class, GearUseFeaturesSeine.class, featuresSeine, - Sets.<Class<? extends IdDto>>newHashSet(GearDto.class, GearCaracteristicDto.class)); + GearDto.class, GearCaracteristicDto.class); return form; } @@ -71,7 +68,7 @@ public class GearUseFeaturesSeineServiceTopia extends ObserveServiceTopia implem GearUseFeaturesSeineDto.class, GearUseFeaturesSeine.class, featuresSeine, - Sets.<Class<? extends IdDto>>newHashSet(GearDto.class, GearCaracteristicDto.class)); + GearDto.class, GearCaracteristicDto.class); return form; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm