added 'envirnoment' property to Fishery model
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133122 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
de77721aab
commit
24fc97c02d
|
@ -62,6 +62,10 @@ public class FisheryRecord extends Common{
|
||||||
@CustomField(key="Status")
|
@CustomField(key="Status")
|
||||||
private Status status;
|
private Status status;
|
||||||
|
|
||||||
|
@JsonProperty("environment")
|
||||||
|
@CustomField(key="Environment")
|
||||||
|
private String environment;
|
||||||
|
|
||||||
public FisheryRecord() {
|
public FisheryRecord() {
|
||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
@ -77,12 +81,14 @@ public class FisheryRecord extends Common{
|
||||||
* @param productionSystemType
|
* @param productionSystemType
|
||||||
* @param flagState
|
* @param flagState
|
||||||
* @param fishingGear
|
* @param fishingGear
|
||||||
|
* @param status
|
||||||
|
* @param environment
|
||||||
*/
|
*/
|
||||||
public FisheryRecord(String fisheryName, String fisheryId,
|
public FisheryRecord(String fisheryName, String fisheryId,
|
||||||
String scientificName, String fishingArea, String exploitingStocks,
|
String scientificName, String fishingArea, String exploitingStocks,
|
||||||
String managementEntity, String jurisdictionArea,
|
String managementEntity, String jurisdictionArea,
|
||||||
Production_System_Type productionSystemType, String flagState,
|
Production_System_Type productionSystemType, String flagState,
|
||||||
String fishingGear) {
|
String fishingGear, Status status, String environment) {
|
||||||
super();
|
super();
|
||||||
this.fisheryName = fisheryName;
|
this.fisheryName = fisheryName;
|
||||||
this.fisheryId = fisheryId;
|
this.fisheryId = fisheryId;
|
||||||
|
@ -94,6 +100,8 @@ public class FisheryRecord extends Common{
|
||||||
this.productionSystemType = productionSystemType;
|
this.productionSystemType = productionSystemType;
|
||||||
this.flagState = flagState;
|
this.flagState = flagState;
|
||||||
this.fishingGear = fishingGear;
|
this.fishingGear = fishingGear;
|
||||||
|
this.status = status;
|
||||||
|
this.environment = environment;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getFisheryName() {
|
public String getFisheryName() {
|
||||||
|
@ -184,6 +192,14 @@ public class FisheryRecord extends Common{
|
||||||
this.status = status;
|
this.status = status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getEnvironment() {
|
||||||
|
return environment;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setEnvironment(String environment) {
|
||||||
|
this.environment = environment;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "FisheryRecord [" + super.toString() + ", fisheryName=" + fisheryName + ", fisheryId="
|
return "FisheryRecord [" + super.toString() + ", fisheryName=" + fisheryName + ", fisheryId="
|
||||||
|
@ -193,7 +209,7 @@ public class FisheryRecord extends Common{
|
||||||
+ ", jurisdictionArea=" + jurisdictionArea
|
+ ", jurisdictionArea=" + jurisdictionArea
|
||||||
+ ", productionSystemType=" + productionSystemType
|
+ ", productionSystemType=" + productionSystemType
|
||||||
+ ", flagState=" + flagState + ", fishingGear=" + fishingGear
|
+ ", flagState=" + flagState + ", fishingGear=" + fishingGear
|
||||||
+ ", status=" + status + "]";
|
+ ", status=" + status + ", environment=" + environment + "]";
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,13 +28,15 @@
|
||||||
<description>Scope of pending products</description>
|
<description>Scope of pending products</description>
|
||||||
<param-name>PendingContext</param-name>
|
<param-name>PendingContext</param-name>
|
||||||
<!-- <param-value>/d4science.research-infrastructures.eu/FARM/GRSF</param-value> -->
|
<!-- <param-value>/d4science.research-infrastructures.eu/FARM/GRSF</param-value> -->
|
||||||
<param-value>/gcube/devNext/NextNext</param-value>
|
<!-- <param-value>/gcube/devNext/NextNext</param-value> -->
|
||||||
|
<param-value>/gcube/preprod/Dorne</param-value>
|
||||||
</context-param>
|
</context-param>
|
||||||
|
|
||||||
<context-param>
|
<context-param>
|
||||||
<description>Scope of confirmed products</description>
|
<description>Scope of confirmed products</description>
|
||||||
<param-name>ConfirmedContext</param-name>
|
<param-name>ConfirmedContext</param-name>
|
||||||
<!-- <param-value>/d4science.research-infrastructures.eu/FARM/GRSFAccepted</param-value> -->
|
<!-- <param-value>/d4science.research-infrastructures.eu/FARM/GRSFAccepted</param-value> -->
|
||||||
<param-value>/gcube/devNext/NextNext</param-value>
|
<!-- <param-value>/gcube/devNext/NextNext</param-value> -->
|
||||||
|
<param-value>/gcube/preprod/Dorne</param-value>
|
||||||
</context-param>
|
</context-param>
|
||||||
</web-app>
|
</web-app>
|
||||||
|
|
Loading…
Reference in New Issue