fixed Fishing_Pressure
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@150837 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
ed273bb6fa
commit
704984215c
|
@ -12,6 +12,7 @@ import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.Tag;
|
|||
import org.gcube.data_catalogue.grsf_publish_ws.custom_annotations.TimeSeries;
|
||||
import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Abundance_Level;
|
||||
import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Exploitation_Rate;
|
||||
import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Fishing_Pressure;
|
||||
import org.gcube.data_catalogue.grsf_publish_ws.utils.groups.Stock_Type;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||
|
@ -70,7 +71,6 @@ public class StockRecord extends Common{
|
|||
|
||||
@JsonProperty("standard_abundance_level")
|
||||
@CustomField(key="Standard Abundance Level")
|
||||
//@Tag
|
||||
@TimeSeries
|
||||
@Valid
|
||||
private List<TimeSeriesBean<Abundance_Level, Void>> abundanceLevelStandard;
|
||||
|
@ -85,7 +85,7 @@ public class StockRecord extends Common{
|
|||
@CustomField(key="Standard Fishing Pressure")
|
||||
@TimeSeries
|
||||
@Valid
|
||||
private List<TimeSeriesBean<String, Void>> fishingPressureStandard;
|
||||
private List<TimeSeriesBean<Fishing_Pressure, Void>> fishingPressureStandard;
|
||||
|
||||
@JsonProperty("fishing_pressure")
|
||||
@CustomField(key="Fishing Pressure")
|
||||
|
@ -157,7 +157,7 @@ public class StockRecord extends Common{
|
|||
List<TimeSeriesBean<String, String>> exploitationRate,
|
||||
List<TimeSeriesBean<Abundance_Level, Void>> abundanceLevelStandard,
|
||||
List<TimeSeriesBean<String, String>> abundanceLevel,
|
||||
List<TimeSeriesBean<String, Void>> fishingPressureStandard,
|
||||
List<TimeSeriesBean<Fishing_Pressure, Void>> fishingPressureStandard,
|
||||
List<TimeSeriesBean<String, String>> fishingPressure,
|
||||
List<TimeSeriesBean<String, Void>> narrativeState,
|
||||
String scientificAdvice, String assessor, String stockUri,
|
||||
|
@ -232,12 +232,12 @@ public class StockRecord extends Common{
|
|||
return area;
|
||||
}
|
||||
|
||||
public List<TimeSeriesBean<String, Void>> getFishingPressureStandard() {
|
||||
public List<TimeSeriesBean<Fishing_Pressure, Void>> getFishingPressureStandard() {
|
||||
return fishingPressureStandard;
|
||||
}
|
||||
|
||||
public void setFishingPressureStandard(
|
||||
List<TimeSeriesBean<String, Void>> fishingPressureStandard) {
|
||||
List<TimeSeriesBean<Fishing_Pressure, Void>> fishingPressureStandard) {
|
||||
this.fishingPressureStandard = fishingPressureStandard;
|
||||
}
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@ public enum Abundance_Level {
|
|||
Low_Abundance("Low abundance"),
|
||||
Uncertain_Not_Assessed("Uncertain/Not assessed"),
|
||||
Not_applicable("Not applicable"),
|
||||
Pre_exploitation_Or_High_Abundance("Pre-exploitation biomass or high abundance"),
|
||||
Depleted("Depleted");
|
||||
|
||||
private String subGroupNameOrig;
|
||||
|
|
|
@ -0,0 +1,48 @@
|
|||
package org.gcube.data_catalogue.grsf_publish_ws.utils.groups;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
|
||||
|
||||
/**
|
||||
* Fishing_Pressure for Stock records
|
||||
* @author Costantino Perciante at ISTI-CNR (costantino.perciante@isti.cnr.it)
|
||||
*/
|
||||
public enum Fishing_Pressure {
|
||||
|
||||
Not_Applicable("Not applicable"),
|
||||
Moderate_Fishing_Mortality("Moderate fishing mortality"),
|
||||
High_Fishing_Mortality("High fishing mortality"),
|
||||
No_Or_Low_Fishing_Mortality("No or low fishing mortality"),
|
||||
Uncertain_Not_assessed("Uncertain/Not assessed");
|
||||
|
||||
private String subGroupNameOrig;
|
||||
|
||||
private Fishing_Pressure(String origName) {
|
||||
this.subGroupNameOrig = origName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the original name
|
||||
* @return
|
||||
*/
|
||||
public String getOrigName(){
|
||||
return subGroupNameOrig;
|
||||
}
|
||||
|
||||
@JsonCreator
|
||||
public static Fishing_Pressure onDeserialize(String fishing_Pressure) {
|
||||
if(fishing_Pressure != null) {
|
||||
for (Fishing_Pressure fishingPressure : Fishing_Pressure.values()) {
|
||||
if(fishingPressure.getOrigName().replaceAll("[^A-Za-z]", " ").equalsIgnoreCase(fishing_Pressure.replaceAll("[^A-Za-z]", " ")))
|
||||
return fishingPressure;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return getOrigName();
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue