From 983104aad2e713e7656ea69790902ad7670c3dac Mon Sep 17 00:00:00 2001 From: Costantino Perciante Date: Mon, 10 Jul 2017 14:41:24 +0000 Subject: [PATCH] minor fixes git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@150982 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../grsf_publish_ws/json/input/Base.java | 4 +-- .../grsf_publish_ws/json/input/Common.java | 19 ++--------- .../json/input/FisheryRecord.java | 32 +++++-------------- .../json/input/StockRecord.java | 28 ++++++++++++++-- .../services/GrsfPublisherFisheryService.java | 1 + .../services/GrsfPublisherStockService.java | 1 + 6 files changed, 40 insertions(+), 45 deletions(-) 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 3edd60e..d7a975e 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 @@ -37,7 +37,7 @@ public class Base { // filled automatically by the service @JsonProperty("author") private String author; - + // filled automatically by the service @JsonProperty("author_contact") private String authorContact; @@ -175,7 +175,7 @@ public class Base { public void setUuid(String uuid) { this.uuid = uuid; } - + /** * Use for generics object (unrecognized from Jackson) to be put into the map * @param key 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 c5f272e..c484c36 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 @@ -95,12 +95,6 @@ public class Common extends Base{ @CustomField(key="Species") private List species; - @JsonProperty("fao_state") - @CustomField(key="Fao State") - @TimeSeries - @Valid - private List> faoState; - public Common() { super(); } @@ -145,7 +139,6 @@ public class Common extends Base{ this.catches = catches; this.landings = landings; this.species = species; - this.faoState = faoState; } public String getGrsfType() { @@ -159,7 +152,7 @@ public class Common extends Base{ public String getSourceType() { - return sourceType; + return sourceType; } @@ -268,14 +261,6 @@ public class Common extends Base{ this.referenceYear = referenceYear; } - public List> getFaoState() { - return faoState; - } - - public void setFaoState(List> faoState) { - this.faoState = faoState; - } - @Override public String toString() { return "Common [dataOwner=" + dataOwner + ", databaseSources=" @@ -286,7 +271,7 @@ public class Common extends Base{ + reportingYear + ", referenceYear=" + referenceYear + ", grsfType=" + grsfType + ", sourceType=" + sourceType + ", catches=" + catches + ", landings=" + landings - + ", species=" + species + ", faoState=" + faoState + "]"; + + ", species=" + species + "]"; } } 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 1816857..251726a 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 @@ -31,14 +31,9 @@ public class FisheryRecord extends Common{ @CustomField(key="Fishery id") private String fisheryId; - @JsonProperty("species") - @Tag - @CustomField(key="Species") - private List species; - @JsonProperty("fishing_area") @CustomField(key="Fishing area") - @Tag + //@Tag private List fishingArea; @JsonProperty("exploited_stocks") @@ -47,7 +42,7 @@ public class FisheryRecord extends Common{ @JsonProperty("management_entity") @CustomField(key="Management entity") - @Tag + //@Tag private List managementEntity; @JsonProperty("jurisdiction_area") @@ -67,14 +62,14 @@ public class FisheryRecord extends Common{ private List flagState; @JsonProperty("fishing_gear") - @Tag + //@Tag @CustomField(key="Fishing gear") private List fishingGear; @JsonProperty("environment") @CustomField(key="Environment") private String environment; - + @JsonProperty("fishery_uri") @CustomField(key="Fishery Uri") private String fisheryUri; @@ -92,7 +87,6 @@ public class FisheryRecord extends Common{ /** * @param fisheryName * @param fisheryId - * @param species * @param fishingArea * @param exploitingStocks * @param managementEntity @@ -105,16 +99,14 @@ public class FisheryRecord extends Common{ * @param type */ public FisheryRecord(String fisheryName, String fisheryId, - List species, List fishingArea, - List exploitingStocks, List managementEntity, - List jurisdictionArea, + List fishingArea, List exploitingStocks, + List managementEntity, List jurisdictionArea, List productionSystemType, List flagState, List fishingGear, String environment, String fisheryUri, Fishery_Type type) { super(); this.fisheryName = fisheryName; this.fisheryId = fisheryId; - this.species = species; this.fishingArea = fishingArea; this.exploitingStocks = exploitingStocks; this.managementEntity = managementEntity; @@ -183,14 +175,6 @@ public class FisheryRecord extends Common{ this.type = type; } - public List getSpecies() { - return species; - } - - public void setSpecies(List species) { - this.species = species; - } - public List getExploitingStocks() { return exploitingStocks; } @@ -235,8 +219,8 @@ public class FisheryRecord extends Common{ @Override public String toString() { return "FisheryRecord [fisheryName=" + fisheryName + ", fisheryId=" - + fisheryId + ", species=" + species + ", fishingArea=" - + fishingArea + ", exploitingStocks=" + exploitingStocks + + fisheryId + ", fishingArea=" + fishingArea + + ", exploitingStocks=" + exploitingStocks + ", managementEntity=" + managementEntity + ", jurisdictionArea=" + jurisdictionArea + ", productionSystemType=" + productionSystemType 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 591ec73..80a491b 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 @@ -120,6 +120,12 @@ public class StockRecord extends Common{ @Group private Stock_Type type; + @JsonProperty("fao_state") + @CustomField(key="Fao State") + @TimeSeries + @Valid + private List> faoState; + public StockRecord() { super(); } @@ -144,6 +150,7 @@ public class StockRecord extends Common{ * @param stockUri * @param waterArea * @param type + * @param faoState */ public StockRecord( String stockName, @@ -161,7 +168,8 @@ public class StockRecord extends Common{ List> fishingPressure, List> narrativeState, String scientificAdvice, String assessor, String stockUri, - List waterArea, Stock_Type type) { + List waterArea, Stock_Type type, + List> faoState) { super(); this.stockName = stockName; this.stockId = stockId; @@ -182,8 +190,11 @@ public class StockRecord extends Common{ this.stockUri = stockUri; this.waterArea = waterArea; this.type = type; + this.faoState = faoState; } + + public void setAssessmentMethods(List assessmentMethods) { this.assessmentMethods = assessmentMethods; } @@ -338,6 +349,18 @@ public class StockRecord extends Common{ this.exploitationRate = exploitationRate; } + public List> getFaoState() { + return faoState; + } + + public void setFaoState(List> faoState) { + this.faoState = faoState; + } + + public List getAssessmentMethods() { + return assessmentMethods; + } + @Override public String toString() { return "StockRecord [stockName=" + stockName + ", stockId=" + stockId @@ -353,7 +376,8 @@ public class StockRecord extends Common{ + ", fishingPressure=" + fishingPressure + ", narrativeState=" + narrativeState + ", scientificAdvice=" + scientificAdvice + ", assessor=" + assessor + ", stockUri=" + stockUri - + ", waterArea=" + waterArea + ", type=" + type + "]"; + + ", waterArea=" + waterArea + ", type=" + type + ", faoState=" + + faoState + "]"; } } diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java index 3e1422b..4f783d3 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java @@ -291,6 +291,7 @@ public class GrsfPublisherFisheryService { // write a post if the product has been published in grsf context if(context.equals((String)contextServlet.getInitParameter(HelperMethods.PUBLIC_CONTEX_KEY))){ + // TODO uncomment later /*new WritePostCatalogueManagerThread( context, token, diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java index 4a3232d..ea64594 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java @@ -288,6 +288,7 @@ public class GrsfPublisherStockService { // write a post if the product has been published in grsf context if(context.equals((String)contextServlet.getInitParameter(HelperMethods.PUBLIC_CONTEX_KEY))){ + // TODO uncomment later /*new WritePostCatalogueManagerThread( context, token,