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 6b02894cab1b057adb9d7ba117287b9836077372 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 21 08:16:56 2015 +0100 Ajout propriétés sur le FormDto, revue du constructeur et de l'adapter json (on ne deserialise plus les labels qui de toute façon seront supprimés au prochain wagon...) --- .../main/java/fr/ird/observe/services/dto/FormDto.java | 4 ++++ .../java/fr/ird/observe/services/dto/FormDtos.java | 18 ++++++++---------- .../ird/observe/services/dto/gson/FormDtoAdapter.java | 12 ++++-------- 3 files changed, 16 insertions(+), 18 deletions(-) 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 2e12be5..1bd49ae 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 @@ -37,6 +37,10 @@ public class FormDto<R extends IdDto> extends AbstractFormDto { public static final String PROPERTY_FORM = "form"; + public static final String PROPERTY_REFERENTIAL_REFERENCE_SET_REQUEST_NAME = "referentialReferenceSetRequestName"; + + public static final String PROPERTY_DATA_REFERENCE_SET_REQUEST_NAME = "dataReferenceSetRequestName"; + protected final Class<R> type; protected R form; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java index d551993..8ac4ed4 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/FormDtos.java @@ -22,8 +22,6 @@ package fr.ird.observe.services.dto; * #L% */ -import java.util.Collection; - /** * Created on 17/08/15. * @@ -31,16 +29,16 @@ import java.util.Collection; */ public class FormDtos extends AbstractFormDtos { - public static <BeanType extends FormDto, R extends IdDto> BeanType newFormDto(Class<R> source) { - BeanType result = (BeanType) new FormDto<>(source); - return result; - } - - public static <BeanType extends FormDto, R extends IdDto> BeanType newFormDto(Class<R> source, R form, Collection<ReferenceSetDto> labels) { - BeanType result = (BeanType) new FormDto<>(source); + public static <R extends IdDto> FormDto<R> newFormDto(Class<R> source, + R form, + String referentialRequestDefinitionName, + String dataRequestDefinitionName) { + FormDto<R> result = new FormDto<>(source); result.setForm(form); - result.setLabels(labels); + result.setReferentialReferenceSetRequestName(referentialRequestDefinitionName); + result.setDataReferenceSetRequestName(dataRequestDefinitionName); return result; } + } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/FormDtoAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/FormDtoAdapter.java index 67bdc08..d7cacc9 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/FormDtoAdapter.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/FormDtoAdapter.java @@ -1,6 +1,5 @@ package fr.ird.observe.services.dto.gson; -import com.google.common.collect.Lists; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; import com.google.gson.JsonElement; @@ -9,29 +8,26 @@ import com.google.gson.JsonParseException; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.FormDtos; import fr.ird.observe.services.dto.IdDto; -import fr.ird.observe.services.dto.ReferenceSetDto; import java.lang.reflect.Type; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -public class FormDtoAdapter implements JsonDeserializer<FormDto<?>>{ +public class FormDtoAdapter implements JsonDeserializer<FormDto<?>> { @Override public FormDto<?> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { JsonObject jsonObject = json.getAsJsonObject(); Class dtoType = context.deserialize(jsonObject.get(FormDto.PROPERTY_TYPE), Class.class); + String referentialRequestDefinitionName = context.deserialize(jsonObject.get(FormDto.PROPERTY_REFERENTIAL_REFERENCE_SET_REQUEST_NAME), String.class); + String dataRequestDefinitionName = context.deserialize(jsonObject.get(FormDto.PROPERTY_DATA_REFERENCE_SET_REQUEST_NAME), String.class); JsonElement jsonFrom = jsonObject.get(FormDto.PROPERTY_FORM); IdDto form = context.deserialize(jsonFrom, dtoType); - JsonElement jsonLabels = jsonObject.get(FormDto.PROPERTY_LABELS); - - ReferenceSetDto[] labels = context.deserialize(jsonLabels, ReferenceSetDto[].class); - - FormDto<?> formDto = FormDtos.newFormDto(dtoType, form, Lists.newArrayList(labels)); + FormDto<?> formDto = FormDtos.newFormDto(dtoType, form, referentialRequestDefinitionName, dataRequestDefinitionName); return formDto; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.