This is an automated email from the git hooks/post-receive script. New commit to branch feature/7458 in repository observe. See http://git.codelutin.com/observe.git commit a7d0bd51fbe8e816aa62025cf3687fc2ba774b29 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 18 09:59:18 2015 +0200 typage du labelset --- .../dto/referential/ReferentialLabelSetDto.java | 17 +++++++++++++++++ .../dto/referential/ReferentialLabelSetDtos.java | 14 ++++++++++++++ .../services/service/ReferentialServiceRest.java | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDto.java new file mode 100644 index 0000000..2b8a45d --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDto.java @@ -0,0 +1,17 @@ +package fr.ird.observe.services.dto.referential; + +public class ReferentialLabelSetDto<R extends ReferentialDto> extends AbstractReferentialLabelSetDto { + + private static final long serialVersionUID = 1L; + + protected final Class<R> type; + + public ReferentialLabelSetDto(Class<R> type) { + this.type = type; + } + + public Class<R> getType() { + return type; + } + +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java new file mode 100644 index 0000000..0baa167 --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ReferentialLabelSetDtos.java @@ -0,0 +1,14 @@ +package fr.ird.observe.services.dto.referential; + +import java.util.LinkedHashSet; + +public class ReferentialLabelSetDtos extends AbstractReferentialLabelSetDtos { + + public static <R extends ReferentialDto> ReferentialLabelSetDto<R> newReferentialLabelSetDto(Class<R> type, + LinkedHashSet<ReferentialLabelDto<R>> labels) { + ReferentialLabelSetDto<R> dto = new ReferentialLabelSetDto<>(type); + dto.setReferentialLabel((LinkedHashSet)labels); + return dto; + } + +} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java index d3d88e6..fe60d68 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/service/ReferentialServiceRest.java @@ -18,7 +18,7 @@ public class ReferentialServiceRest extends ObserveServiceRest implements Refere @Override public <R extends ReferentialDto> ReferentialLabelSetDto getReferentialLabelSet(Class<R> type) { - return new ReferentialLabelSetDto(); + return new ReferentialLabelSetDto(type); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.