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

Fixing groups refs #23215

This commit is contained in:
Luca Frosini 2022-04-27 13:10:23 +02:00
parent 5c1e3bc164
commit 51c91a3878
4 changed files with 5 additions and 7 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/custom_annotations/Group.java
View File

@ -21,8 +21,8 @@ public @interface Group {
String condition() default "";
/**
* If this value is set, it is the name of the group (apart the source, i.e. "grsf", "ram", "firms", "fishsource" that will be prepended) to which the
* record needs to be put.
* If this value is set, it is used as name of the group in place of the filed value.
* (apart the source, i.e. "grsf", "ram", "firms", "fishsource" that will be prepended depending on prependSourceToGroupName)
* @return
*/
String groupNameOverValue() default "";
@ -32,6 +32,6 @@ public @interface Group {
* Set to false to avoid source prepending
* @return
*/
boolean prependSourceToGroupName() default true;
boolean prependSourceToGroupName() default false;
}

2
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_CUSTOM_KEY, prependSourceToGroupName=true) // record is added to group grsf-sdg-flag if sdg Flag is true
@Group(condition="true", groupNameOverValue=Constants.SDG_FLAG_GROUP_NAME, prependSourceToGroupName=false) // 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)

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

@ -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_CUSTOM_KEY, prependSourceToGroupName=true) // record is added to group grsf-traceability-flag if Traceability Flag is true
@Group(condition="true", groupNameOverValue=Constants.TRACEABILITY_FLAG_GROUP_NAME, prependSourceToGroupName=false) // record is added to group grsf-traceability-flag if Traceability Flag is true
private Boolean traceabilityFlag;
@JsonProperty(Constants.FISHING_AREA_JSON_KEY)
@ -62,7 +62,6 @@ public class FisheryRecord extends Common {
@JsonProperty(Constants.GRSF_TYPE_JSON_KEY)
@CustomField(key=Constants.GRSF_TYPE_CUSTOM_KEY)
@Group(prependSourceToGroupName = false)
@Tag
private Fishery_Type type;

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

@ -109,7 +109,6 @@ public class StockRecord extends Common{
@JsonProperty(Constants.GRSF_TYPE_JSON_KEY)
@CustomField(key=Constants.GRSF_TYPE_CUSTOM_KEY)
@Group(prependSourceToGroupName = false)
@Tag
private Stock_Type type;