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