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 3b335ce0ae75aac94fe6d8714b56fbbae79b62b5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 22 08:51:29 2015 +0200 Ajout to toString sur les dto --- .../java/fr/ird/observe/services/dto/FormDto.java | 8 ++++++++ .../java/fr/ird/observe/services/dto/IdDto.java | 8 ++++++++ .../fr/ird/observe/services/dto/ReferenceDto.java | 13 +++++++++++++ .../ird/observe/services/dto/ReferenceSetDto.java | 9 +++++++++ .../services/dto/referential/ReferentialDto.java | 21 +++++++++++++++++++++ .../dto/referential/ReferentialReferenceDto.java | 17 +++++++++++++++++ 6 files changed, 76 insertions(+) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java index 7f64862..64077af 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDto.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.dto; * #L% */ +import com.google.common.base.MoreObjects; import com.google.common.base.Optional; import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -105,4 +106,11 @@ public class FormDto<R extends IdDto> extends AbstractFormDto { } + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("type", type.getName()) + .toString(); + } + } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java index 19f48fa..3d40e1d 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/IdDto.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.dto; * #L% */ +import com.google.common.base.MoreObjects; import org.apache.commons.lang3.StringUtils; import java.util.Objects; @@ -51,4 +52,11 @@ public abstract class IdDto extends AbstractIdDto { return Objects.hash(id); } + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("id", id) + .toString(); + } + } 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 9b29a5b..5bda88e 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 @@ -22,10 +22,12 @@ package fr.ird.observe.services.dto; * #L% */ +import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import java.io.Serializable; +import java.util.Arrays; public class ReferenceDto<D extends IdDto> extends AbstractReferenceDto { @@ -89,4 +91,15 @@ public class ReferenceDto<D extends IdDto> extends AbstractReferenceDto { public Class[] getLabelPropertyTypes() { return labelPropertyTypes; } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("type", type.getName()) + .add("id", id) + .add("labelPropertyNames", labelPropertyNames) + .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/ReferenceSetDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDto.java index 8210c57..1e9f5dc 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/ReferenceSetDto.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.dto; * #L% */ +import com.google.common.base.MoreObjects; import com.google.common.collect.Iterables; import java.util.Set; @@ -46,4 +47,12 @@ public class ReferenceSetDto<R extends IdDto> extends AbstractReferenceSetDto { return referenceDto; } + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("type", type.getName()) + .add("name", name) + .add("lastUpdate", lastUpdate) + .toString(); + } } 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 new file mode 100644 index 0000000..e9507ff --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java @@ -0,0 +1,21 @@ +package fr.ird.observe.services.dto.referential; + +import com.google.common.base.MoreObjects; + +public abstract class ReferentialDto extends AbstractReferentialDto { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("id", id) + .add("enabled", enabled) + .add("needComment", needComment) + .add("createDate", createDate) + .add("lastUpdate", lastUpdate) + .add("version", version) + .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 84b5114..982bc41 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 @@ -22,12 +22,14 @@ package fr.ird.observe.services.dto.referential; * #L% */ +import com.google.common.base.MoreObjects; 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 java.io.Serializable; +import java.util.Arrays; public class ReferentialReferenceDto<D extends ReferentialDto> extends AbstractReferentialReferenceDto { @@ -84,4 +86,19 @@ public class ReferentialReferenceDto<D extends ReferentialDto> extends AbstractR init(type, labelPropertyNamesBuilder.build()); } + @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) + .add("labelPropertyValues", Arrays.toString(labelPropertyValues)) + .add("labelPropertyTypes", Arrays.toString(labelPropertyTypes)) + .toString(); + } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.