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

Aligned code

This commit is contained in:
Luca Frosini 2022-04-22 15:57:00 +02:00
parent eac93b33c5
commit 2b984aa712
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/Common.java
View File

@ -55,7 +55,7 @@ public abstract class Common extends Base {
@JsonProperty(Constants.SDG_FLAG_JSON_KEY)
@CustomField(key=Constants.SDG_FLAG_CUSTOM_KEY)
@Group(condition="true", groupNameOverValue=Constants.SDG_FLAG_GROUP_NAME) // record is added to group grsf-sdg-flag if sdg Flag is true
@Group(condition="true", groupNameOverValue=Constants.SDG_FLAG_GROUP_NAME, prependSourceToGroupName=true) // record is added to group grsf-sdg-flag if sdg Flag is true
private Boolean sdgFlag;
@JsonProperty(Constants.STATUS_OF_THE_GRSF_RECORD_JSON_KEY)
@ -89,10 +89,6 @@ public abstract class Common extends Base {
@CustomField(key=Constants.SIMILAR_GRSF_RECORDS_CUSTOM_KEY)
private List<SimilarRecordBean> similarGRSFRecords;
// @JsonProperty(Constants.SIMILAR_SOURCE_RECORDS_JSON_KEY)
// @CustomField(key=Constants.SIMILAR_SOURCE_RECORDS_CUSTOM_KEY)
// private List<SimilarRecordBean> similarSourceRecords;
// automatically set
@CustomField(key=Constants.DOMAIN_CUSTOM_KEY)
private String domain;

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

@ -22,9 +22,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class FisheryRecord extends Common {
@JsonProperty(Constants.FISHERY_NAME_JSON_KEY)
@CustomField(key=Constants.FISHERY_NAME_CUSTOM_KEY)
@NotNull(message="fishery_name cannot be null")
@Size(min=1, message="fishery_name cannot be empty")
@CustomField(key=Constants.FISHERY_NAME_CUSTOM_KEY)
private String fisheryName;
@JsonProperty(Constants.GRSF_SEMANTIC_IDENTIFIER_JSON_KEY)
@ -33,7 +33,7 @@ public class FisheryRecord extends Common {
@JsonProperty(Constants.TRACEABILITY_FLAG_JSON_KEY)
@CustomField(key=Constants.TRACEABILITY_FLAG_CUSTOM_KEY)
@Group(condition="true", groupNameOverValue=Constants.TRACEABILITY_FLAG_GROUP_NAME) // record is added to group grsf-traceability-flag if Traceability Flag is true
@Group(condition="true", groupNameOverValue=Constants.TRACEABILITY_FLAG_CUSTOM_KEY, prependSourceToGroupName=true) // record is added to group grsf-traceability-flag if Traceability Flag is true
private Boolean traceabilityFlag;
@JsonProperty(Constants.FISHING_AREA_JSON_KEY)
@ -43,6 +43,7 @@ public class FisheryRecord extends Common {
@JsonProperty(Constants.JURISDICTION_AREA_JSON_KEY)
@CustomField(key=Constants.JURISDICTION_AREA_CUSTOM_KEY)
@Tag
private List<String> jurisdictionArea;
@JsonProperty(Constants.RESOURCES_EXPLOITED_JSON_KEY)

2
src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java
View File

@ -26,9 +26,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class StockRecord extends Common{
@JsonProperty(Constants.STOCK_NAME_JSON_KEY)
@CustomField(key=Constants.STOCK_NAME_CUSTOM_KEY)
@NotNull(message=Constants.STOCK_NAME_JSON_KEY + " cannot be null")
@Size(min=2, message=Constants.STOCK_NAME_JSON_KEY + " cannot be empty")
@CustomField(key=Constants.STOCK_NAME_CUSTOM_KEY)
private String stockName;
@JsonProperty(Constants.GRSF_SEMANTIC_IDENTIFIER_JSON_KEY)