From ed467d1160de9bcf7bb368f3b2e95d5acfa4cc91 Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 4 Nov 2021 17:06:38 +0100
Subject: [PATCH] Fixing issues evidenced in #21995

---
 .../json/input/record/StockRecord.java               | 12 ++++++------
 .../grsf_publish_ws/utils/HelperMethods.java         |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java
index 3257939..0048521 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/json/input/record/StockRecord.java
@@ -65,7 +65,7 @@ public class StockRecord extends Common{
 	@JsonProperty(Constants.BIOMASS_JSON_KEY)
 	@CustomField(key=Constants.BIOMASS_CUSTOM_KEY)
 	@TimeSeries
-	@Group(groupNameOverValue=Constants.BIOMASS_CUSTOM_KEY, prependSourceToGroupName=false)
+	// @Group(groupNameOverValue=Constants.BIOMASS_CUSTOM_KEY, prependSourceToGroupName=false)
 	@Valid
 	private List<TimeSeriesBean<String, String>> biomass;
 	
@@ -86,7 +86,7 @@ public class StockRecord extends Common{
 	@JsonProperty(Constants.STATE_AND_TREND_MARINE_RESOURCE_JSON_KEY)
 	@CustomField(key=Constants.STATE_AND_TREND_MARINE_RESOURCE_CUSTOM_KEY)
 	@TimeSeries
-	@Group(groupNameOverValue=Constants.STATE_AND_TREND_MARINE_RESOURCE_CUSTOM_KEY, prependSourceToGroupName=false)
+	@Group(groupNameOverValue="State and Trend of Marine Resource", prependSourceToGroupName=false)
 	@Valid
 	private List<TimeSeriesBean<String, Void>> narrativeState;
 
@@ -100,7 +100,7 @@ public class StockRecord extends Common{
 	@JsonProperty(Constants.SCIENTIFIC_ADVICE_JSON_KEY)
 	@CustomField(key=Constants.SCIENTIFIC_ADVICE_CUSTOM_KEY)
 	@Group(groupNameOverValue=Constants.SCIENTIFIC_ADVICE_CUSTOM_KEY, prependSourceToGroupName=false)
-	private List<String> scientificAdvice;
+	private List<TimeSeriesBean<String, Void>> scientificAdvice;
 
 	@JsonProperty(Constants.ASSESSOR_JSON_KEY)
 	@CustomField(key=Constants.ASSESSOR_CUSTOM_KEY)
@@ -146,7 +146,7 @@ public class StockRecord extends Common{
 			List<TimeSeriesBean<String, String>> fishingPressure,
 			List<TimeSeriesBean<String, Void>> narrativeState,
 			List<TimeSeriesBean<String, Void>> faoState,
-			List<String> scientificAdvice, String assessor, Stock_Type type) {
+			List<TimeSeriesBean<String, Void>> scientificAdvice, String assessor, Stock_Type type) {
 		super();
 		this.stockName = stockName;
 		this.stockId = stockId;
@@ -262,11 +262,11 @@ public class StockRecord extends Common{
 		this.narrativeState = narrativeState;
 	}
 
-	public List<String> getScientificAdvice() {
+	public List<TimeSeriesBean<String, Void>> getScientificAdvice() {
 		return scientificAdvice;
 	}
 
-	public void setScientificAdvice(List<String> scientificAdvice) {
+	public void setScientificAdvice(List<TimeSeriesBean<String, Void>> scientificAdvice) {
 		this.scientificAdvice = scientificAdvice;
 	}
 
diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java
index dddc8be..974c765 100644
--- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java
+++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java
@@ -90,7 +90,9 @@ public abstract class HelperMethods {
 		if(origName == null)
 			throw new IllegalArgumentException("origName cannot be null");
 
-		String modified = origName.trim().toLowerCase().replaceAll("[^A-Za-z0-9-]", "-");
+		String modified = origName.replaceAll("(", "");
+		modified = origName.replaceAll(")", "");
+		modified = origName.trim().toLowerCase().replaceAll("[^A-Za-z0-9-]", "-");
 		if(modified.startsWith("-"))
 			modified = modified.substring(1);
 		if(modified.endsWith("-"))