json field names changed
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@151512 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante
parent
7fd2b3a435
commit
6fd75bd8bc
|
|
@ -62,10 +62,10 @@ public class Base {
|
|||
@JsonProperty("extras_resources")
|
||||
private List<ResourceBean> extrasResources = new ArrayList<ResourceBean>();
|
||||
|
||||
@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() {
|
||||
|
|
|
|||
|
|
@ -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<String> species;
|
||||
|
||||
@JsonProperty("similar_records")
|
||||
@JsonProperty("similar_grsf_records")
|
||||
@CustomField(key="Similar GRSF Records")
|
||||
private List<SimilarRecordBean> similarRecords;
|
||||
private List<SimilarRecordBean> similarGRSFRecords;
|
||||
|
||||
@JsonProperty("similar_source_records")
|
||||
@CustomField(key="Similar Source Records")
|
||||
private List<SimilarRecordBean> 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<String> dataOwner,
|
||||
List<Resource<Sources>> databaseSources,
|
||||
|
|
@ -108,7 +113,8 @@ public class Common extends Base{
|
|||
Boolean traceabilityFlag, Status status, String grsfType,
|
||||
List<TimeSeriesBean<String, String>> catches,
|
||||
List<TimeSeriesBean<String, String>> landings,
|
||||
List<String> species, List<SimilarRecordBean> similarRecords) {
|
||||
List<String> species, List<SimilarRecordBean> similarGRSFRecords,
|
||||
List<SimilarRecordBean> 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<SimilarRecordBean> getSimilarRecords() {
|
||||
return similarRecords;
|
||||
public List<SimilarRecordBean> getSimilarGRSFRecords() {
|
||||
return similarGRSFRecords;
|
||||
}
|
||||
|
||||
public void setSimilarRecords(List<SimilarRecordBean> similarRecords) {
|
||||
this.similarRecords = similarRecords;
|
||||
public void setSimilarGRSFRecords(List<SimilarRecordBean> similarGRSFRecords) {
|
||||
this.similarGRSFRecords = similarGRSFRecords;
|
||||
}
|
||||
|
||||
public List<SimilarRecordBean> getSimilarSourceRecords() {
|
||||
return similarSourceRecords;
|
||||
}
|
||||
|
||||
public void setSimilarSourceRecords(List<SimilarRecordBean> 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 + "]";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -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<String> fishingArea;
|
||||
|
||||
@JsonProperty("exploited_stocks")
|
||||
@JsonProperty("resources_exploited")
|
||||
@CustomField(key="Resources Exploited")
|
||||
private List<String> exploitingStocks;
|
||||
private List<String> resourcesExploited;
|
||||
|
||||
@JsonProperty("management_entity")
|
||||
@JsonProperty("management_body_authorities")
|
||||
@CustomField(key="Management Body/Authority(ies)")
|
||||
private List<String> managementEntity;
|
||||
private List<String> managementBodyAuthorities;
|
||||
|
||||
@JsonProperty("jurisdiction_area")
|
||||
@CustomField(key="Jurisdiction Area")
|
||||
|
|
@ -62,7 +62,7 @@ public class FisheryRecord extends Common{
|
|||
@CustomField(key="Fishing gear")
|
||||
private List<String> 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<String> fishingArea, List<String> exploitingStocks,
|
||||
List<String> managementEntity, List<String> jurisdictionArea,
|
||||
List<String> fishingArea, List<String> resourcesExploited,
|
||||
List<String> managementBodyAuthorities,
|
||||
List<String> jurisdictionArea,
|
||||
List<Production_System_Type> productionSystemType,
|
||||
List<String> flagState, List<String> 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<String> getExploitingStocks() {
|
||||
return exploitingStocks;
|
||||
public List<String> getResourcesExploited() {
|
||||
return resourcesExploited;
|
||||
}
|
||||
|
||||
public void setExploitingStocks(List<String> exploitingStocks) {
|
||||
this.exploitingStocks = exploitingStocks;
|
||||
public void setResourcesExploited(List<String> resourcesExploited) {
|
||||
this.resourcesExploited = resourcesExploited;
|
||||
}
|
||||
|
||||
public List<String> getManagementEntity() {
|
||||
return managementEntity;
|
||||
public List<String> getManagementBodyAuthorities() {
|
||||
return managementBodyAuthorities;
|
||||
}
|
||||
|
||||
public void setManagementEntity(List<String> managementEntity) {
|
||||
this.managementEntity = managementEntity;
|
||||
public void setManagementBodyAuthorities(List<String> managementBodyAuthorities) {
|
||||
this.managementBodyAuthorities = managementBodyAuthorities;
|
||||
}
|
||||
|
||||
public List<Production_System_Type> 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
|
||||
|
|
|
|||
|
|
@ -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<String> area;
|
||||
|
||||
|
|
@ -42,7 +42,7 @@ public class StockRecord extends Common{
|
|||
@CustomField(key="Exploiting Fishery")
|
||||
private List<String> 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<String> 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<TimeSeriesBean<String, String>> 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<TimeSeriesBean<String, String>> fishingPressure;
|
||||
|
||||
@JsonProperty("narrative_state")
|
||||
@JsonProperty("state_and_trend_of_marine_resources")
|
||||
@CustomField(key="State and trend of Marine Resource")
|
||||
@TimeSeries
|
||||
@Valid
|
||||
private List<TimeSeriesBean<String, Void>> narrativeState;
|
||||
|
||||
@JsonProperty("fao_state")
|
||||
@JsonProperty("fao_categories")
|
||||
@CustomField(key="Fao Categories")
|
||||
@TimeSeries
|
||||
@Valid
|
||||
|
|
|
|||
Loading…
Reference in New Issue