From 1c2d7f0246601edcd548bc42be16d512f57a1329 Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Sun, 9 Oct 2016 14:28:24 +0000 Subject: [PATCH] excluded author and author_contact from serialization/deserialization git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132964 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../grsf_publish_ws/json/input/Common.java | 10 ++++++---- .../gcube/data_catalogue/grsf_publish_ws/JTests.java | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java index ae5d671..f1a0933 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Common.java @@ -11,12 +11,14 @@ import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Source; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Status; import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Type; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; /** * Information that both Stock and Fishery must contain * @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it) */ +@JsonIgnoreProperties(value = {"author", "author_contact"}, ignoreUnknown = true) // ignore in serialization/deserialization public class Common { @JsonProperty("description") @@ -24,14 +26,14 @@ public class Common { @JsonProperty("license") private String license; - - @JsonProperty("author") // @JsonIgnoreProperties(ignoreUnknown=true) // ignore in serialization/deserialization + + @JsonProperty("author")// filled automatically by the server private String author; @JsonProperty("version") private Long version; - @JsonProperty("author_contact") + @JsonProperty("author_contact")// filled automatically by the service private String authorContact; @JsonProperty("maintainer") @@ -147,7 +149,7 @@ public class Common { public void setVersion(Long version) { this.version = version; } - + public String getAuthorContact() { return authorContact; } diff --git a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java index 851f8bb..1dda0d7 100644 --- a/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java +++ b/src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java @@ -108,6 +108,9 @@ public class JTests { FisheryRecord recordFishery = new FisheryRecord(); recordFishery.setType(Type.Fishing_Description); recordFishery.setDatabaseSources(Source.FIRMS); + recordFishery.setAuthor("Costantino Perciante"); + recordFishery.setMaintainer("Costantino Perciante"); + recordFishery.setAuthorContact("costantino.perciante@isti.cnr.it"); recordFishery.setStatus(Status.Pending); recordFishery.setVersion(new Long(10)); HashMap extras = new HashMap();