From 22d311d807cc3c968cf5231e1f7e1493f487707f Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 9 Feb 2022 16:18:23 +0100 Subject: [PATCH] Reordered properties to be aligned with wiki --- .../json/input/record/FisheryRecord.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java index 0845022..9f3f57d 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/FisheryRecord.java @@ -21,11 +21,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; */ 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 - private Boolean traceabilityFlag; - @JsonProperty(Constants.FISHERY_NAME_JSON_KEY) @NotNull(message="fishery_name cannot be null") @Size(min=1, message="fishery_name cannot be empty") @@ -36,18 +31,23 @@ public class FisheryRecord extends Common { @CustomField(key=Constants.GRSF_SEMANTIC_IDENTIFIER_CUSTOM_KEY) private String fisheryId; + @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 + private Boolean traceabilityFlag; + @JsonProperty(Constants.FISHING_AREA_JSON_KEY) @CustomField(key=Constants.FISHING_AREA_CUSTOM_KEY) @Tag private List fishingArea; - @JsonProperty(Constants.RESOURCES_EXPLOITED_JSON_KEY) - @CustomField(key=Constants.RESOURCES_EXPLOITED_CUSTOM_KEY) - private List resourcesExploited; - @JsonProperty(Constants.JURISDICTION_AREA_JSON_KEY) @CustomField(key=Constants.JURISDICTION_AREA_CUSTOM_KEY) private List jurisdictionArea; + + @JsonProperty(Constants.RESOURCES_EXPLOITED_JSON_KEY) + @CustomField(key=Constants.RESOURCES_EXPLOITED_CUSTOM_KEY) + private List resourcesExploited; @JsonProperty(Constants.PRODUCTION_SYSTEM_TYPE_JSON_KEY) @CustomField(key=Constants.PRODUCTION_SYSTEM_TYPE_CUSTOM_KEY)