branch feature/7595_Le_nom_des_activites_absent_en_serveur_distant updated (2052103 -> c518cfc)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7595_Le_nom_des_activites_absent_en_serveur_distant in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 2052103 Use nuiton-maven-report-plugin 3.0.1 new c518cfc Corrige la serialisation/deserialisation des heures d'observation des activités seine The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c518cfc190f73cd2c828959f70f1f06c36611946 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Jul 19 11:30:45 2016 +0200 Corrige la serialisation/deserialisation des heures d'observation des activités seine refs #7595 Summary of changes: .../java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java | 4 ++-- .../observe/services/dto/reference/DataReferenceSetDefinitions.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7595_Le_nom_des_activites_absent_en_serveur_distant in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit c518cfc190f73cd2c828959f70f1f06c36611946 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Jul 19 11:30:45 2016 +0200 Corrige la serialisation/deserialisation des heures d'observation des activités seine refs #7595 --- .../java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java | 4 ++-- .../observe/services/dto/reference/DataReferenceSetDefinitions.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java index bd6b380..3c71fd4 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/ObserveDtoGsonSupplier.java @@ -41,7 +41,6 @@ import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import org.nuiton.version.Version; import java.sql.Blob; -import java.sql.Timestamp; import java.util.Date; /** @@ -93,7 +92,8 @@ public class ObserveDtoGsonSupplier implements Supplier<Gson> { // Type adapters : base types gsonBuilder.registerTypeAdapter(Integer.class, new IntegerAdapter()); gsonBuilder.registerTypeAdapter(Date.class, new DateAdapter()); - gsonBuilder.registerTypeAdapter(Timestamp.class, new DateAdapter()); + gsonBuilder.registerTypeAdapter(java.sql.Timestamp.class, new DateAdapter()); + gsonBuilder.registerTypeAdapter(java.sql.Time.class, new DateAdapter()); gsonBuilder.registerTypeAdapter(java.sql.Date.class, new DateAdapter()); gsonBuilder.registerTypeAdapter(Class.class, new ClassAdapter()); gsonBuilder.registerTypeAdapter(Blob.class, new BlobAdapter()); diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index d524f35..45d724f 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -68,7 +68,7 @@ public enum DataReferenceSetDefinitions { ), ACTIVITY_SEINE(newDefinitionBuilder(ActivitySeineDto.class) - .addProperty(String.class, ActivitySeineDto.PROPERTY_TIME) + .addProperty(Date.class, ActivitySeineDto.PROPERTY_TIME) .addProperty(String.class, ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE) .addProperty(DataReference.class, ActivitySeineDto.PROPERTY_SET_SEINE) ), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm