This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 30cfea7f131091242fc8be4c121546f39a63acb9 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 15 12:21:11 2016 +0100 Le tableau des types des propriété n'est plus dans l'objet ReferenceDto (see #8124). --- .../services/dto/gson/reference/AbstractReferenceAdapter.java | 5 ++--- .../observe/services/dto/gson/reference/DataReferenceAdapter.java | 4 ++-- .../services/dto/gson/reference/ReferentialReferenceAdapter.java | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java index 50f6484..7a8342b 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/AbstractReferenceAdapter.java @@ -74,7 +74,6 @@ public abstract class AbstractReferenceAdapter<D extends IdDto, R extends Abstra for (int i = 0; i < propertiesSize; i++) { - String name = propertyNames[i]; Class type = propertyTypes[i]; JsonElement jsonValue = jsonPropertyValues.get(i); Serializable value = context.deserialize(jsonValue, type); @@ -82,7 +81,7 @@ public abstract class AbstractReferenceAdapter<D extends IdDto, R extends Abstra } - R reference = newReference(dtoType, propertyNames, propertyTypes, propertyValues); + R reference = newReference(dtoType, propertyNames, propertyValues); String id = context.deserialize(jsonObject.get(AbstractReference.PROPERTY_ID), String.class); reference.setId(id); @@ -126,6 +125,6 @@ public abstract class AbstractReferenceAdapter<D extends IdDto, R extends Abstra protected abstract ReferenceSetDefinition<D> getDefinition(Class<D> dtoType); - protected abstract R newReference(Class<D> dtoType, String[] propertyNames, Class<?>[] propertyTypes, Serializable... propertyValues); + protected abstract R newReference(Class<D> dtoType, String[] propertyNames, Serializable... propertyValues); } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java index 9f673b6..de76aaa 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/DataReferenceAdapter.java @@ -40,9 +40,9 @@ public class DataReferenceAdapter<D extends DataDto> extends AbstractReferenceAd } @Override - protected DataReference<D> newReference(Class<D> dtoType, String[] propertyNames, Class<?>[] propertyTypes, Serializable... propertyValues) { + protected DataReference<D> newReference(Class<D> dtoType, String[] propertyNames, Serializable... propertyValues) { DataReference<D> reference = new DataReference<>(); - reference.init(dtoType, propertyNames, propertyTypes, propertyValues); + reference.init(dtoType, propertyNames, propertyValues); return reference; } diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java index 5360207..4af234d 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/reference/ReferentialReferenceAdapter.java @@ -91,9 +91,9 @@ public class ReferentialReferenceAdapter<D extends ReferentialDto> extends Abstr } @Override - protected ReferentialReference<D> newReference(Class<D> dtoType, String[] propertyNames, Class<?>[] propertyTypes, Serializable... propertyValues) { + protected ReferentialReference<D> newReference(Class<D> dtoType, String[] propertyNames, Serializable... propertyValues) { ReferentialReference<D> reference = new ReferentialReference<>(); - reference.init(dtoType, propertyNames, propertyTypes, propertyValues); + reference.init(dtoType, propertyNames, propertyValues); return reference; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.