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 3cc570b7b0460ce9c31cff551dceedec891b519a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 20 09:49:42 2015 +0100 Amélioration des logs + bien transformer les références vers référentiels + prise en compte des champs techniques --- .../fr/ird/observe/services/dto/ReferenceDto.java | 20 +++++++--- .../dto/gson/ObserveReferenceSetAdapter.java | 2 +- .../dto/reference/ObserveReferenceSet.java | 44 +++++++++++++++++++--- .../dto/reference/ObserveReferenceSetRequest.java | 10 +++++ .../dto/reference/ObserveReferenceSetResult.java | 4 +- .../dto/reference/ObserveReferentialReference.java | 34 +++++++++++------ .../definition/ObserveReferenceSetDefinition.java | 19 ++++++++++ .../ObserveReferenceSetRequestKeyDefinition.java | 21 ++++++++--- .../dto/referential/ReferentialReferenceDto.java | 30 ++++++++++----- .../dto/reference/ObserveReferenceSetBuilder.java | 27 +++++++++---- .../services/service/ReferenceSetServiceTopia.java | 23 +++++++---- 11 files changed, 177 insertions(+), 57 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java index 7301ecf..06b9a3e 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceDto.java @@ -31,6 +31,8 @@ import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.referential.I18nReferentialDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -50,6 +52,9 @@ public class ReferenceDto<D extends IdDto> extends AbstractReferenceDto { private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(ReferenceDto.class); + protected Class<D> type; protected List<String> labelPropertyNames; @@ -160,12 +165,17 @@ public class ReferenceDto<D extends IdDto> extends AbstractReferenceDto { @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("type", type.getName()) - .add("id", id) - .add("labelPropertyNames", labelPropertyNames) + MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this) + .add("type", type.getSimpleName()) + .add("id", id); + + if (log.isDebugEnabled()) { + toStringHelper + .add("labelPropertyNames", labelPropertyNames) + .add("labelPropertyTypes", Arrays.toString(labelPropertyTypes)); + } + return toStringHelper .add("labelPropertyValues", Arrays.toString(labelPropertyValues)) - .add("labelPropertyTypes", Arrays.toString(labelPropertyTypes)) .toString(); } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveReferenceSetAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveReferenceSetAdapter.java index 300ae53..c37b255 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveReferenceSetAdapter.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveReferenceSetAdapter.java @@ -83,7 +83,7 @@ public class ObserveReferenceSetAdapter implements JsonDeserializer<ObserveRefer result.setVersion((long) context.deserialize(jsonObject.get(ReferentialDto.PROPERTY_VERSION), long.class)); result.setCreateDate((Date) context.deserialize(jsonObject.get(ReferentialDto.PROPERTY_CREATE_DATE), Date.class)); - result.setLastUpdate((Date) context.deserialize(jsonObject.get(ReferentialDto.PROPERTY_LAST_UPDATE), Date.class)); + result.setLastUpdateDate((Date) context.deserialize(jsonObject.get(ReferentialDto.PROPERTY_LAST_UPDATE), Date.class)); result.setEnabled((Boolean) context.deserialize(jsonObject.get(ReferentialDto.PROPERTY_ENABLED), boolean.class)); result.setNeedComment((Boolean) context.deserialize(jsonObject.get(ReferentialDto.PROPERTY_NEED_COMMENT), boolean.class)); diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSet.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSet.java index 79b98cb..9abd500 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSet.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSet.java @@ -5,6 +5,10 @@ import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetDefinition; +import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.io.Serializable; import java.util.Collection; @@ -19,6 +23,9 @@ public class ObserveReferenceSet<D extends IdDto, R extends ObserveReference> im private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(ObserveReferenceSet.class); + protected ObserveReferenceSetDefinition<D> definition; protected Collection<R> values; @@ -70,22 +77,47 @@ public class ObserveReferenceSet<D extends IdDto, R extends ObserveReference> im result.setLastUpdate(lastUpdate); result.setName(name); + boolean referential = ReferentialDto.class.isAssignableFrom(type); + for (R value : values) { - ReferenceDto<D> referenceDto = new ReferenceDto<>(); - referenceDto.init(type, propertyNames, propertyTypes, value.getValues()); - result.addReference(referenceDto); + if (referential) { + + ObserveReferentialReference referentialValue = (ObserveReferentialReference) value; + ReferentialReferenceDto referenceDto = new ReferentialReferenceDto<>(); + referenceDto.init(type, propertyNames, propertyTypes, value.getValues()); + referenceDto.setId(value.getId()); + referenceDto.setCreateDate(referentialValue.getCreateDate()); + referenceDto.setEnabled(referentialValue.isEnabled()); + referenceDto.setLastUpdate(referentialValue.getLastUpdateDate()); + referenceDto.setNeedComment(referentialValue.isNeedComment()); + referenceDto.setVersion(referentialValue.getVersion()); + result.addReference(referenceDto); + + } else { + + ReferenceDto<D> referenceDto = new ReferenceDto<>(); + referenceDto.setId(value.getId()); + referenceDto.init(type, propertyNames, propertyTypes, value.getValues()); + result.addReference(referenceDto); + + } } return result; } - + @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("definition", definition) + MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this); + if (log.isDebugEnabled()) { + toStringHelper.add("definition", definition); + } else { + toStringHelper.add("type", definition.getType().getSimpleName()); + } + return toStringHelper .add("values", values == null ? 0 : values.size()) .add("lastUpdate", lastUpdate) .toString(); diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetRequest.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetRequest.java index 25ea7b6..69cbda3 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetRequest.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetRequest.java @@ -13,6 +13,8 @@ public class ObserveReferenceSetRequest { private String requestName; + private boolean loadTechnicalInformations; + private ImmutableMap<String, Date> lastUpdateDates; public String getRequestName() { @@ -30,4 +32,12 @@ public class ObserveReferenceSetRequest { public void setLastUpdateDates(ImmutableMap<String, Date> lastUpdateDates) { this.lastUpdateDates = lastUpdateDates; } + + public boolean isLoadTechnicalInformations() { + return loadTechnicalInformations; + } + + public void setLoadTechnicalInformations(boolean loadTechnicalInformations) { + this.loadTechnicalInformations = loadTechnicalInformations; + } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetResult.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetResult.java index 2812e03..8eb4bf1 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetResult.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetResult.java @@ -56,9 +56,9 @@ public class ObserveReferenceSetResult<R extends ObserveReference> { this.referenceSetsMapBuilder = ImmutableMap.builder(); } - public Builder addKey(String name, ObserveReferenceSet<?, R> referenceSet) { + public Builder addReferenceSet(String name, ObserveReferenceSet<?, R> referenceSet) { if (log.isInfoEnabled()) { - log.info("Add reference set " + name + " : " + referenceSet); + log.info(String.format("Add reference set : %s", referenceSet)); } referenceSetsMapBuilder.put(name, referenceSet); return this; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferentialReference.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferentialReference.java index f82dd81..083eccb 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferentialReference.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferentialReference.java @@ -1,6 +1,8 @@ package fr.ird.observe.services.dto.reference; import com.google.common.base.MoreObjects; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.util.Arrays; import java.util.Date; @@ -14,13 +16,16 @@ public class ObserveReferentialReference extends ObserveReference { private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(ObserveReferentialReference.class); + protected boolean needComment; protected boolean enabled; protected Date createDate; - protected Date lastUpdate; + protected Date lastUpdateDate; protected long version; @@ -40,12 +45,12 @@ public class ObserveReferentialReference extends ObserveReference { this.enabled = enabled; } - public Date getLastUpdate() { - return lastUpdate; + public Date getLastUpdateDate() { + return lastUpdateDate; } - public void setLastUpdate(Date lastUpdate) { - this.lastUpdate = lastUpdate; + public void setLastUpdateDate(Date lastUpdateDate) { + this.lastUpdateDate = lastUpdateDate; } public Date getCreateDate() { @@ -66,13 +71,18 @@ public class ObserveReferentialReference extends ObserveReference { @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("id", id) - .add("needComment", needComment) - .add("enabled", enabled) - .add("version", version) - .add("createDate", createDate) - .add("lastUpdate", lastUpdate) + MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this) + .add("id", id); + + if (log.isDebugEnabled()) { + toStringHelper + .add("needComment", needComment) + .add("enabled", enabled) + .add("version", version) + .add("createDate", createDate) + .add("lastUpdate", lastUpdateDate); + } + return toStringHelper .add("values", Arrays.asList(values)) .toString(); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinition.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinition.java index 3a5f327..b510ab4 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinition.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetDefinition.java @@ -1,8 +1,12 @@ package fr.ird.observe.services.dto.reference.definition; +import com.google.common.base.MoreObjects; import fr.ird.observe.services.dto.IdDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.io.Serializable; +import java.util.Arrays; import java.util.LinkedList; /** @@ -16,6 +20,9 @@ public class ObserveReferenceSetDefinition<D extends IdDto> implements Serializa private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(ObserveReferenceSetDefinition.class); + /** * Le type du dto qui doit être transformé en références. * {@link ObserveReferenceSetDefinition#getType()}. @@ -48,6 +55,18 @@ public class ObserveReferenceSetDefinition<D extends IdDto> implements Serializa return propertyNames; } + @Override + public String toString() { + MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this) + .add("type", type.getSimpleName()); + if (log.isDebugEnabled()) { + toStringHelper + .add("propertyNames", Arrays.toString(propertyNames)) + .add("propertyTypes", Arrays.toString(propertyTypes)); + } + return toStringHelper.toString(); + } + public static class Builder<D extends IdDto> { private final Class<D> type; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestKeyDefinition.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestKeyDefinition.java index b086c7e..5272c90 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestKeyDefinition.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/definition/ObserveReferenceSetRequestKeyDefinition.java @@ -3,8 +3,11 @@ package fr.ird.observe.services.dto.reference.definition; import com.google.common.base.MoreObjects; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.io.Serializable; +import java.util.Arrays; import java.util.Objects; /** @@ -16,6 +19,9 @@ public class ObserveReferenceSetRequestKeyDefinition<D extends IdDto> implements private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(ObserveReferenceSetRequestKeyDefinition.class); + private final Class<? extends IdDto> parentType; private final ObserveReferenceSetDefinition<D> referenceSetDefinition; @@ -66,12 +72,15 @@ public class ObserveReferenceSetRequestKeyDefinition<D extends IdDto> implements @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("parentType", parentType) + MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this) + .add("parentType", parentType.getSimpleName()) .add("name", name) - .add("type", referenceSetDefinition.getType()) - .add("propertyNames", referenceSetDefinition.getPropertyNames()) - .add("propertyTypes", referenceSetDefinition.getPropertyTypes()) - .toString(); + .add("type", referenceSetDefinition.getType().getSimpleName()); + if (log.isDebugEnabled()) { + toStringHelper + .add("propertyNames", Arrays.toString(referenceSetDefinition.getPropertyNames())) + .add("propertyTypes", Arrays.toString(referenceSetDefinition.getPropertyTypes())); + } + return toStringHelper.toString(); } } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java index b594ae4..626d4bd 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReferenceDto.java @@ -27,6 +27,8 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.io.Serializable; import java.util.Arrays; @@ -35,6 +37,9 @@ public class ReferentialReferenceDto<D extends ReferentialDto> extends AbstractR private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(ReferentialReferenceDto.class); + public static final String PROPERTY_LABEL = "label"; public static final ImmutableSet<String> I18N_PROPERTY_NAMES = ImmutableSet.of( @@ -94,17 +99,22 @@ public class ReferentialReferenceDto<D extends ReferentialDto> extends AbstractR @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("type", type.getName()) - .add("id", id) - .add("enabled", enabled) - .add("needComment", needComment) - .add("createDate", createDate) - .add("lastUpdate", lastUpdate) - .add("version", version) - .add("labelPropertyNames", labelPropertyNames) + MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this) + .add("type", type.getSimpleName()) + .add("id", id); + + if (log.isDebugEnabled()) { + toStringHelper + .add("enabled", enabled) + .add("needComment", needComment) + .add("createDate", createDate) + .add("lastUpdate", lastUpdate) + .add("version", version) + .add("labelPropertyNames", labelPropertyNames) + .add("labelPropertyTypes", Arrays.toString(labelPropertyTypes)); + } + return toStringHelper .add("labelPropertyValues", Arrays.toString(labelPropertyValues)) - .add("labelPropertyTypes", Arrays.toString(labelPropertyTypes)) .toString(); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetBuilder.java index bda5a57..3845e25 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/reference/ObserveReferenceSetBuilder.java @@ -49,9 +49,14 @@ public class ObserveReferenceSetBuilder<D extends IdDto, R extends ObserveRefere private Date lastUpdateDate; + private boolean loadTechnicalInformations; + public static <D extends IdDto, R extends ObserveReference> ObserveReferenceSetBuilder<D, R> of( - ReferentialLocale referentialLocale, ObserveReferenceSetDefinition<D> definition, Class<TopiaEntity> entityType) { + ReferentialLocale referentialLocale, + ObserveReferenceSetDefinition<D> definition, + Class<TopiaEntity> entityType, + boolean loadTechnicalInformations) { ObserveReferenceSetBuilder<D, R> referenceDtoBuilder = new ObserveReferenceSetBuilder<>(); @@ -59,6 +64,7 @@ public class ObserveReferenceSetBuilder<D extends IdDto, R extends ObserveRefere referenceDtoBuilder.referentialLocaleOrdinal = referentialLocale.ordinal(); referenceDtoBuilder.binder = BinderFactory.newBinder(entityType); referenceDtoBuilder.propertyNames = definition.getPropertyNames(); + referenceDtoBuilder.loadTechnicalInformations = loadTechnicalInformations; List<String> entityPropertyNames = new ArrayList<>(); @@ -130,14 +136,21 @@ public class ObserveReferenceSetBuilder<D extends IdDto, R extends ObserveRefere result.setValues(propertyValues); result.setId(entity.getTopiaId()); - result.setVersion(entity.getTopiaVersion()); - result.setCreateDate(entity.getTopiaCreateDate()); + ReferenceEntity referenceEntity = (ReferenceEntity) entity; - result.setEnabled(referenceEntity.isEnabled()); - result.setNeedComment(referenceEntity.isNeedComment()); - result.setLastUpdate(referenceEntity.getLastUpdate()); - result.setEnabled(fr.ird.observe.entities.constants.ReferenceStatus.enabled == referenceEntity.getStatus()); + + if (loadTechnicalInformations) { + + result.setVersion(entity.getTopiaVersion()); + result.setCreateDate(entity.getTopiaCreateDate()); + result.setEnabled(referenceEntity.isEnabled()); + result.setNeedComment(referenceEntity.isNeedComment()); + result.setLastUpdateDate(referenceEntity.getLastUpdate()); + result.setEnabled(fr.ird.observe.entities.constants.ReferenceStatus.enabled == referenceEntity.getStatus()); + + } + references.add((R) result); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferenceSetServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferenceSetServiceTopia.java index a017b15..509b086 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferenceSetServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferenceSetServiceTopia.java @@ -34,6 +34,8 @@ public class ReferenceSetServiceTopia extends ObserveServiceTopia implements Ref String requestName = request.getRequestName(); ObserveReferenceSetRequestDefinition requestDefinition = ObserveReferenceSetRequestDefinitions.get(requestName); + boolean loadTechnicalInformations = request.isLoadTechnicalInformations(); + ObserveReferenceSetResult.Builder<ObserveReference> resultBuilder = ObserveReferenceSetResult.builder(requestName); for (ObserveReferenceSetRequestKeyDefinition definition : requestDefinition.getKeys()) { @@ -41,10 +43,10 @@ public class ReferenceSetServiceTopia extends ObserveServiceTopia implements Ref boolean referential = definition.isReferential(); Preconditions.checkArgument(!referential, "Can't obtain referenceSet of referential here, but try with " + definition); - ObserveReferenceSet<IdDto, ObserveReference> referenceSet = loadDataReferenceSet(definition); + ObserveReferenceSet<IdDto, ObserveReference> referenceSet = loadDataReferenceSet(definition, loadTechnicalInformations); String name = definition.getName(); - resultBuilder.addKey(name, referenceSet); + resultBuilder.addReferenceSet(name, referenceSet); } @@ -59,6 +61,8 @@ public class ReferenceSetServiceTopia extends ObserveServiceTopia implements Ref ObserveReferenceSetRequestDefinition requestDefinition = ObserveReferenceSetRequestDefinitions.get(requestName); + boolean loadTechnicalInformations = request.isLoadTechnicalInformations(); + ObserveReferenceSetResult.Builder<ObserveReferentialReference> resultBuilder = ObserveReferenceSetResult.builder(requestName); ImmutableMap<String, Date> lastUpdateDates = request.getLastUpdateDates(); Preconditions.checkNotNull(lastUpdateDates); @@ -71,9 +75,9 @@ public class ReferenceSetServiceTopia extends ObserveServiceTopia implements Ref String name = definition.getName(); Date lastUpdateDate = lastUpdateDates.get(name); - ObserveReferenceSet<ReferentialDto, ObserveReferentialReference> referenceSet = loadReferentialReferenceSet(definition, lastUpdateDate); + ObserveReferenceSet<ReferentialDto, ObserveReferentialReference> referenceSet = loadReferentialReferenceSet(definition, lastUpdateDate, loadTechnicalInformations); if (referenceSet != null) { - resultBuilder.addKey(name, referenceSet); + resultBuilder.addReferenceSet(name, referenceSet); } } @@ -82,11 +86,11 @@ public class ReferenceSetServiceTopia extends ObserveServiceTopia implements Ref } - protected <D extends IdDto> ObserveReferenceSet<D, ObserveReference> loadDataReferenceSet(ObserveReferenceSetRequestKeyDefinition<D> requestKeyDefinition) { + protected <D extends IdDto> ObserveReferenceSet<D, ObserveReference> loadDataReferenceSet(ObserveReferenceSetRequestKeyDefinition<D> requestKeyDefinition, boolean loadTechnicalInformations) { Class<TopiaEntity> entityType = getEntityType(requestKeyDefinition.getType()); - ObserveReferenceSetBuilder<D, ObserveReference> referenceBuilder = ObserveReferenceSetBuilder.of(serviceContext.getReferentialLocale(), requestKeyDefinition.getDefinition(), entityType); + ObserveReferenceSetBuilder<D, ObserveReference> referenceBuilder = ObserveReferenceSetBuilder.of(serviceContext.getReferentialLocale(), requestKeyDefinition.getDefinition(), entityType, loadTechnicalInformations); Iterable<TopiaEntity> entities = getEntities(requestKeyDefinition, Collections.<String, Object>emptyMap()); @@ -101,7 +105,7 @@ public class ReferenceSetServiceTopia extends ObserveServiceTopia implements Ref } - protected <D extends ReferentialDto> ObserveReferenceSet<D, ObserveReferentialReference> loadReferentialReferenceSet(ObserveReferenceSetRequestKeyDefinition<D> requestKeyDefinition, Date lastUpdateDate) { + protected <D extends ReferentialDto> ObserveReferenceSet<D, ObserveReferentialReference> loadReferentialReferenceSet(ObserveReferenceSetRequestKeyDefinition<D> requestKeyDefinition, Date lastUpdateDate, boolean loadTechnicalInformations) { Class<TopiaEntity> entityType = getEntityType(requestKeyDefinition.getType()); @@ -110,7 +114,10 @@ public class ReferenceSetServiceTopia extends ObserveServiceTopia implements Ref ObserveReferenceSet<D, ObserveReferentialReference> referenceSet; if (lastUpdateOptional.isPresent() && (lastUpdateDate == null || lastUpdateOptional.get().after(lastUpdateDate))) { - ObserveReferenceSetBuilder<D, ObserveReferentialReference> referenceBuilder = ObserveReferenceSetBuilder.of(serviceContext.getReferentialLocale(), requestKeyDefinition.getDefinition(), entityType); + ObserveReferenceSetBuilder<D, ObserveReferentialReference> referenceBuilder = ObserveReferenceSetBuilder.of(serviceContext.getReferentialLocale(), + requestKeyDefinition.getDefinition(), + entityType, + loadTechnicalInformations); referenceBuilder.setLastUpdateDate(lastUpdateOptional.get()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.