diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 0fa49c2..6caf699 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -3,9 +3,6 @@ - - uses - 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 243b9ed..24603ac 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 @@ -44,9 +44,9 @@ public class Common extends Base{ @Valid private List refersTo; - @JsonProperty("short_title") + @JsonProperty("short_name") @CustomField(key="Short Name") - private String shortTitle; + private String shortName; @JsonProperty("traceability_flag") @CustomField(key="Traceability Flag") @@ -96,7 +96,7 @@ public class Common extends Base{ * @param databaseSources * @param sourceOfInformation * @param refersTo - * @param shortTitle + * @param shortName * @param traceabilityFlag * @param status * @param grsfType @@ -109,7 +109,7 @@ public class Common extends Base{ public Common(List dataOwner, List> databaseSources, List> sourceOfInformation, - List refersTo, String shortTitle, + List refersTo, String shortName, Boolean traceabilityFlag, Status status, String grsfType, List> catches, List> landings, @@ -120,7 +120,7 @@ public class Common extends Base{ this.databaseSources = databaseSources; this.sourceOfInformation = sourceOfInformation; this.refersTo = refersTo; - this.shortTitle = shortTitle; + this.shortName = shortName; this.traceabilityFlag = traceabilityFlag; this.status = status; this.grsfType = grsfType; @@ -166,12 +166,12 @@ public class Common extends Base{ this.sourceOfInformation = sourceOfInformation; } - public String getShortTitle() { - return shortTitle; + public String getShortName() { + return shortName; } - public void setShortTitle(String shortTitle) { - this.shortTitle = shortTitle; + public void setShortName(String shortName) { + this.shortName = shortName; } public Boolean isTraceabilityFlag() { @@ -243,7 +243,7 @@ public class Common extends Base{ return "Common [dataOwner=" + dataOwner + ", databaseSources=" + databaseSources + ", sourceOfInformation=" + sourceOfInformation + ", refersTo=" + refersTo - + ", shortTitle=" + shortTitle + ", traceabilityFlag=" + + ", shortName=" + shortName + ", traceabilityFlag=" + traceabilityFlag + ", status=" + status + ", grsfType=" + grsfType + ", catches=" + catches + ", landings=" + landings + ", species=" + species + ", similarGRSFRecords=" diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java index 5eeba6b..4157a90 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/StockRecord.java @@ -96,7 +96,7 @@ public class StockRecord extends Common{ @Tag private String assessor; - @JsonProperty("type") + @JsonProperty("grsf_type") @CustomField(key="GRSF Type") @Group private Stock_Type type; diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java index d907477..3158481 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/CommonServiceUtils.java @@ -79,7 +79,7 @@ public class CommonServiceUtils { public static void validateAggregatedRecord(Common record) throws Exception { List refersToList = record.getRefersTo(); - String shortTitle = record.getShortTitle(); + String shortTitle = record.getShortName(); Boolean traceabilityFlag = record.isTraceabilityFlag(); Status status = record.getStatus();