This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d45ed4ef076673ad9a45621a131e63b8b6508cc7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 18:01:28 2016 +0200 Suppression de la propriété enabled sur les referentels --- .../services/dto/referential/ReferentialDto.java | 9 ++++++++- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42022 -> 41934 bytes .../ird/observe/services/binder/BinderSupport.java | 2 +- .../referential/ReferentialBinderSupport.java | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java index 1ada75b..a85f3c8 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java @@ -23,16 +23,23 @@ package fr.ird.observe.services.dto.referential; */ import com.google.common.base.MoreObjects; +import fr.ird.observe.services.dto.constants.ReferenceStatus; + +import static fr.ird.observe.services.dto.referential.ReferentialReference.PROPERTY_ENABLED; public abstract class ReferentialDto extends AbstractReferentialDto { private static final long serialVersionUID = 1L; + public boolean isEnabled() { + return ReferenceStatus.enabled == status; + } + @Override public String toString() { return MoreObjects.toStringHelper(this) .add(PROPERTY_ID, id) - .add(PROPERTY_ENABLED, enabled) + .add(PROPERTY_ENABLED, isEnabled()) .add(PROPERTY_NEED_COMMENT, needComment) .add(PROPERTY_CREATE_DATE, createDate) .add(PROPERTY_LAST_UPDATE_DATE, lastUpdateDate) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 7ad6973..2df0f74 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java index bfc49ce..a07faae 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/BinderSupport.java @@ -22,7 +22,6 @@ package fr.ird.observe.services.binder; * #L% */ -import com.google.common.base.Function; import com.google.common.collect.Iterables; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.entities.constants.GearTypePersist; @@ -56,6 +55,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.LinkedHashSet; import java.util.List; +import java.util.function.Function; /** * Created on 24/11/15. diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java index ddb88f2..fccbb3c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/referential/ReferentialBinderSupport.java @@ -146,7 +146,6 @@ public abstract class ReferentialBinderSupport<E extends ObserveReferentialEntit dto.setId(entity.getTopiaId()); dto.setStatus(REFERENCE_STATUS_TO_DTO.apply(entity.getStatus())); - dto.setEnabled(entity.isEnabled()); dto.setNeedComment(entity.isNeedComment()); dto.setLastUpdateDate(entity.getLastUpdateDate()); dto.setVersion(entity.getTopiaVersion()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.