gCubeSystem
/
grsf-publisher-ws
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fisher fix (#8719) 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@150728 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2017-07-04 14:41:56 +00:00
parent 2f1e9cdcc5
commit 5b0488704a
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/FisheryRecord.java
View File

@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* A fishery record bean
* A record bean
* @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@ -74,13 +74,10 @@ public class FisheryRecord extends Common{
@JsonProperty("environment")
@CustomField(key="Environment")
private String environment;
// @JsonProperty("catches_or_landings")
// @CustomField(key="Catches or landings")
// //@Tag
// @TimeSeries
// @Valid
// private List<TimeSeriesBean<String, String>> catchesOrLandings;
@JsonProperty("fishery_uri")
@CustomField(key="Fishery Uri")
private String fisheryUri;
@JsonProperty("type")
@CustomField(key="Type")
@ -93,10 +90,9 @@ public class FisheryRecord extends Common{
}
/**
* Create a Fishery record.
* @param fisheryName
* @param fisheryId
* @param scientificName
* @param species
* @param fishingArea
* @param exploitingStocks
* @param managementEntity
@ -105,7 +101,7 @@ public class FisheryRecord extends Common{
* @param flagState
* @param fishingGear
* @param environment
* @param catchesOrLandings
* @param fisheryUri
* @param type
*/
public FisheryRecord(String fisheryName, String fisheryId,
@ -114,9 +110,7 @@ public class FisheryRecord extends Common{
List<String> jurisdictionArea,
List<Production_System_Type> productionSystemType,
List<String> flagState, List<String> fishingGear,
String environment,
// List<TimeSeriesBean<String, String>> catchesOrLandings,
Fishery_Type type) {
String environment, String fisheryUri, Fishery_Type type) {
super();
this.fisheryName = fisheryName;
this.fisheryId = fisheryId;
@ -129,10 +123,18 @@ public class FisheryRecord extends Common{
this.flagState = flagState;
this.fishingGear = fishingGear;
this.environment = environment;
// this.catchesOrLandings = catchesOrLandings;
this.fisheryUri = fisheryUri;
this.type = type;
}
public String getFisheryUri() {
return fisheryUri;
}
public void setFisheryUri(String fisheryUri) {
this.fisheryUri = fisheryUri;
}
public String getFisheryName() {
return fisheryName;
}
@ -173,14 +175,6 @@ public class FisheryRecord extends Common{
this.environment = environment;
}
// public List<TimeSeriesBean<String, String>> getCatchesOrLandings() {
// return catchesOrLandings;
// }
//
// public void setCatchesOrLandings(List<TimeSeriesBean<String, String>> catchesOrLandings) {
// this.catchesOrLandings = catchesOrLandings;
// }
public Fishery_Type getType() {
return type;
}
@ -247,7 +241,8 @@ public class FisheryRecord extends Common{
+ ", jurisdictionArea=" + jurisdictionArea
+ ", productionSystemType=" + productionSystemType
+ ", flagState=" + flagState + ", fishingGear=" + fishingGear
+ ", environment=" + environment + ", type=" + type + "]";
+ ", environment=" + environment + ", fisheryUri=" + fisheryUri
+ ", type=" + type + "]";
}
}