diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Base.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Base.java index 3c651d0..a319adc 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Base.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/Base.java @@ -62,10 +62,10 @@ public class Base { @JsonProperty("extras_resources") private List extrasResources = new ArrayList(); - @JsonProperty("uuid_knowledge_base") + @JsonProperty("grsf_uuid") @CustomField(key=UUID_KB_KEY) - @NotNull(message="uuid_knowledge_base cannot be null") - @Size(min=1, message="uuid_knowledge_base cannot be empty") + @NotNull(message="grsf_uuid cannot be null") + @Size(min=1, message="grsf_uuid cannot be empty") private String uuid; public Base() { 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 6ac8360..243b9ed 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 @@ -53,13 +53,13 @@ public class Common extends Base{ @Group(condition="true", groupNameOverValue="traceability-flag") // record is added to group traceability-flag if Traceability Flag is true private Boolean traceabilityFlag; - @JsonProperty("status") + @JsonProperty("status_grsf_record") @CustomField(key="Status of the GRSF record") @Group private Status status; // automatically compiled - @JsonProperty("grsf_type") + @JsonProperty("grsf_domain") @CustomField(key=GRSF_DOMAIN_KEY) private String grsfType; @@ -79,9 +79,13 @@ public class Common extends Base{ @CustomField(key="Species") private List species; - @JsonProperty("similar_records") + @JsonProperty("similar_grsf_records") @CustomField(key="Similar GRSF Records") - private List similarRecords; + private List similarGRSFRecords; + + @JsonProperty("similar_source_records") + @CustomField(key="Similar Source Records") + private List similarSourceRecords; public Common() { super(); @@ -99,7 +103,8 @@ public class Common extends Base{ * @param catches * @param landings * @param species - * @param similarRecords + * @param similarGRSFRecords + * @param similarSourceRecords */ public Common(List dataOwner, List> databaseSources, @@ -108,7 +113,8 @@ public class Common extends Base{ Boolean traceabilityFlag, Status status, String grsfType, List> catches, List> landings, - List species, List similarRecords) { + List species, List similarGRSFRecords, + List similarSourceRecords) { super(); this.dataOwner = dataOwner; this.databaseSources = databaseSources; @@ -121,7 +127,8 @@ public class Common extends Base{ this.catches = catches; this.landings = landings; this.species = species; - this.similarRecords = similarRecords; + this.similarGRSFRecords = similarGRSFRecords; + this.similarSourceRecords = similarSourceRecords; } public String getGrsfType() { @@ -215,12 +222,20 @@ public class Common extends Base{ this.dataOwner = dataOwner; } - public List getSimilarRecords() { - return similarRecords; + public List getSimilarGRSFRecords() { + return similarGRSFRecords; } - public void setSimilarRecords(List similarRecords) { - this.similarRecords = similarRecords; + public void setSimilarGRSFRecords(List similarGRSFRecords) { + this.similarGRSFRecords = similarGRSFRecords; + } + + public List getSimilarSourceRecords() { + return similarSourceRecords; + } + + public void setSimilarSourceRecords(List similarSourceRecords) { + this.similarSourceRecords = similarSourceRecords; } @Override @@ -231,8 +246,8 @@ public class Common extends Base{ + ", shortTitle=" + shortTitle + ", traceabilityFlag=" + traceabilityFlag + ", status=" + status + ", grsfType=" + grsfType + ", catches=" + catches + ", landings=" + landings - + ", species=" + species + ", similarRecords=" + similarRecords - + "]"; + + ", species=" + species + ", similarGRSFRecords=" + + similarGRSFRecords + ", similarSourceRecords=" + + similarSourceRecords + "]"; } - } \ No newline at end of file diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java index c2be5fa..cfcf729 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java @@ -24,7 +24,7 @@ public class FisheryRecord extends Common{ @JsonProperty("fishery_name") @NotNull(message="fishery_name cannot be null") @Size(min=1, message="fishery_name cannot be empty") - @CustomField(key="GRSF Name") + @CustomField(key="Fishery Name") private String fisheryName; @JsonProperty("fishery_id") @@ -35,13 +35,13 @@ public class FisheryRecord extends Common{ @CustomField(key="Fishing area") private List fishingArea; - @JsonProperty("exploited_stocks") + @JsonProperty("resources_exploited") @CustomField(key="Resources Exploited") - private List exploitingStocks; + private List resourcesExploited; - @JsonProperty("management_entity") + @JsonProperty("management_body_authorities") @CustomField(key="Management Body/Authority(ies)") - private List managementEntity; + private List managementBodyAuthorities; @JsonProperty("jurisdiction_area") @CustomField(key="Jurisdiction Area") @@ -62,7 +62,7 @@ public class FisheryRecord extends Common{ @CustomField(key="Fishing gear") private List fishingGear; - @JsonProperty("type") + @JsonProperty("grsf_type") @CustomField(key="GRSF Type") @Group private Fishery_Type type; @@ -75,8 +75,8 @@ public class FisheryRecord extends Common{ * @param fisheryName * @param fisheryId * @param fishingArea - * @param exploitingStocks - * @param managementEntity + * @param resourcesExploited + * @param managementBodyAuthorities * @param jurisdictionArea * @param productionSystemType * @param flagState @@ -84,16 +84,17 @@ public class FisheryRecord extends Common{ * @param type */ public FisheryRecord(String fisheryName, String fisheryId, - List fishingArea, List exploitingStocks, - List managementEntity, List jurisdictionArea, + List fishingArea, List resourcesExploited, + List managementBodyAuthorities, + List jurisdictionArea, List productionSystemType, List flagState, List fishingGear, Fishery_Type type) { super(); this.fisheryName = fisheryName; this.fisheryId = fisheryId; this.fishingArea = fishingArea; - this.exploitingStocks = exploitingStocks; - this.managementEntity = managementEntity; + this.resourcesExploited = resourcesExploited; + this.managementBodyAuthorities = managementBodyAuthorities; this.jurisdictionArea = jurisdictionArea; this.productionSystemType = productionSystemType; this.flagState = flagState; @@ -141,20 +142,20 @@ public class FisheryRecord extends Common{ this.type = type; } - public List getExploitingStocks() { - return exploitingStocks; + public List getResourcesExploited() { + return resourcesExploited; } - public void setExploitingStocks(List exploitingStocks) { - this.exploitingStocks = exploitingStocks; + public void setResourcesExploited(List resourcesExploited) { + this.resourcesExploited = resourcesExploited; } - public List getManagementEntity() { - return managementEntity; + public List getManagementBodyAuthorities() { + return managementBodyAuthorities; } - public void setManagementEntity(List managementEntity) { - this.managementEntity = managementEntity; + public void setManagementBodyAuthorities(List managementBodyAuthorities) { + this.managementBodyAuthorities = managementBodyAuthorities; } public List getProductionSystemType() { @@ -186,8 +187,8 @@ public class FisheryRecord extends Common{ public String toString() { return "FisheryRecord [fisheryName=" + fisheryName + ", fisheryId=" + fisheryId + ", fishingArea=" + fishingArea - + ", exploitingStocks=" + exploitingStocks - + ", managementEntity=" + managementEntity + + ", resourcesExploited=" + resourcesExploited + + ", managementBodyAuthorities=" + managementBodyAuthorities + ", jurisdictionArea=" + jurisdictionArea + ", productionSystemType=" + productionSystemType + ", flagState=" + flagState + ", fishingGear=" + fishingGear 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 b05ca72..5eeba6b 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 @@ -27,14 +27,14 @@ public class StockRecord extends Common{ @JsonProperty("stock_name") @NotNull(message="stock_name cannot be null") @Size(min=2, message="stock_name cannot be empty") - @CustomField(key="GRSF Name") + @CustomField(key="Stock Name") private String stockName; @JsonProperty("stock_id") @CustomField(key="GRSF Semantic identifier") private String stockId; - @JsonProperty("assessment_distribution_area") + @JsonProperty("assessment_area") @CustomField(key="Assessment Area") private List area; @@ -42,7 +42,7 @@ public class StockRecord extends Common{ @CustomField(key="Exploiting Fishery") private List exploitingFishery; - @JsonProperty("management_entity") + @JsonProperty("management_body_authorities") @CustomField(key="Management Body/Authority(ies)") @Tag private String managementEntity; @@ -51,7 +51,7 @@ public class StockRecord extends Common{ @CustomField(key="Assessment Methods") private List assessmentMethods; - @JsonProperty("standard_abundance_level") + @JsonProperty("firms_standard_abundance_level") @CustomField(key="Abundance Level (FIRMS Standard)") @TimeSeries @Valid @@ -63,7 +63,7 @@ public class StockRecord extends Common{ @Valid private List> abundanceLevel; - @JsonProperty("standard_fishing_pressure") + @JsonProperty("firms_standard_fishing_pressure") @CustomField(key="Fishing Pressure (FIRMS Standard)") @TimeSeries @Valid @@ -75,13 +75,13 @@ public class StockRecord extends Common{ @Valid private List> fishingPressure; - @JsonProperty("narrative_state") + @JsonProperty("state_and_trend_of_marine_resources") @CustomField(key="State and trend of Marine Resource") @TimeSeries @Valid private List> narrativeState; - @JsonProperty("fao_state") + @JsonProperty("fao_categories") @CustomField(key="Fao Categories") @TimeSeries @Valid