This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit 35a18ffa0ed0ce394b29960134c578c4784c9455 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 19 20:08:56 2015 +0100 Meilleure utilisation des ReferenceDto --- .../observe/services/service/ReferentialServiceTopia.java | 14 ++++++++------ .../service/seine/NonTargetSampleServiceTopia.java | 2 +- .../services/service/seine/TargetSampleServiceTopia.java | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index c4e9908..3d7d59a 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -195,17 +195,19 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe Iterable<E> entities = loadEntities(entityType); - LinkedHashSet<ReferentialReferenceDto<D>> labels = new LinkedHashSet<>(); + LinkedHashSet<ReferenceDto<D>> labels = new LinkedHashSet<>(); for (E entity : entities) { - ReferentialReferenceDto<D> dto = (ReferentialReferenceDto<D>) entityToReferenceDto(dtoType, entity); + ReferenceDto<D> dto = entityToReferenceDto(dtoType, entity); if (loadTechnicalInformations) { - dto.setVersion(entity.getTopiaVersion()); - dto.setCreateDate(entity.getTopiaCreateDate()); - dto.setLastUpdate(entity.getLastUpdate()); - dto.setEnabled(fr.ird.observe.entities.constants.ReferenceStatus.enabled == entity.getStatus()); + ReferentialReferenceDto<D> referentialReferenceDto = (ReferentialReferenceDto<D>) dto; + referentialReferenceDto.setVersion(entity.getTopiaVersion()); + referentialReferenceDto.setCreateDate(entity.getTopiaCreateDate()); + referentialReferenceDto.setLastUpdate(entity.getLastUpdate()); + referentialReferenceDto.setEnabled(fr.ird.observe.entities.constants.ReferenceStatus.enabled == entity.getStatus()); + } labels.add(dto); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java index fb02144..76ff6d3 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java @@ -117,7 +117,7 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements } - LinkedHashSet<ReferenceDto> speciesRefs = Sets.newLinkedHashSet(); + LinkedHashSet<ReferenceDto<SpeciesDto>> speciesRefs = Sets.newLinkedHashSet(); for (Species species : speciesSet ) { speciesRefs.add(entityToReferenceDto(SpeciesDto.class, species)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java index 727d4e9..d651f02 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java @@ -120,7 +120,7 @@ public class TargetSampleServiceTopia extends ObserveServiceTopia implements Tar } - LinkedHashSet<ReferenceDto> speciesRefs = Sets.newLinkedHashSet(); + LinkedHashSet<ReferenceDto<SpeciesDto>> speciesRefs = Sets.newLinkedHashSet(); for (Species species : speciesSet ) { speciesRefs.add(entityToReferenceDto(SpeciesDto.class, species)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.