Ignored MacOs File

Conflicts:
	pom.xml

.gitignore

@@ -1,3 +1,4 @@
 target
 .classpath
 .project
+/.DS_Store

.settings/org.eclipse.core.resources.prefs

@@ -1,4 +1,6 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
 encoding/<project>=UTF-8

CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.13.3]
+
+- Adding support for "FAO SDG 14.4.1 Questionnaire" source [#23670] 
+
+
+## [v1.13.2]
+
+- Migrated request to social-service-client [#23679]
+- Added "Assessment Methods" as Group [#23409]
+
+
 ## [v1.13.1]
 
 - Aligned code and wiki to the new requirements [#23167]
@@ -10,6 +21,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Tag are added also to legacy records [#23216]
 - Fixed code which generated groups id from name [#23215]
 
+
 ## [v1.13.0]
 
 ### Added

pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>org.gcube.data-catalogue</groupId>
 	<artifactId>grsf-publisher-ws</artifactId>
-	<version>1.13.1</version>
+	<version>1.13.3</version>
 	<packaging>war</packaging>
 	<name>grsf-publisher-ws</name>
 	<description>Utility library to publish GRSF products on GRSF catalogue.</description>
@@ -26,6 +26,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jsoup.version>1.10.1</jsoup.version>
 		<serviceClass>DataPublishing</serviceClass>
+		<maven.compiler.release>8</maven.compiler.release>
 	</properties>
 
 	<scm>
@@ -39,7 +40,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
-				<version>2.1.1</version>
+				<version>2.2.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -50,12 +51,17 @@
 		<dependency>
 			<groupId>org.gcube.data-catalogue</groupId>
 			<artifactId>grsf-common-library</artifactId>
-			<version>[1-0-0, 2.0.0-SNAPSHOT)</version>
+			<version>[2.0.0, 3.0.0-SNAPSHOT)</version>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>storagehub-client-library</artifactId>
 		</dependency>
+		<dependency>
+ 			<groupId>org.gcube.social-networking</groupId>
+    		<artifactId>social-service-client</artifactId>
+			<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
+		</dependency>
 		<!-- jsoup HTML parser library @ http://jsoup.org/ -->
 		<dependency>
 			<groupId>org.jsoup</groupId>
@@ -162,6 +168,14 @@
 			<artifactId>jersey-test-framework-provider-jetty</artifactId>
 			<scope>test</scope>
 		</dependency>
+		
+		<!-- Added to support Java 11 JDK -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<!-- END Added to support Java 11 JDK -->
 	</dependencies>
 
 	<build>

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

@@ -46,6 +46,7 @@ public class StockRecord extends Common{
 
 	@JsonProperty(Constants.ASSESSMENT_METHODS_JSON_KEY)
 	@CustomField(key=Constants.ASSESSMENT_METHODS_CUSTOM_KEY)
+	@Group(groupNameOverValue=Constants.ASSESSMENT_METHODS_CUSTOM_KEY, prependSourceToGroupName=false)
 	private List<String> assessmentMethods;
 
 	@JsonProperty(Constants.FIRMS_ABUNDANCE_LEVEL_JSON_KEY)

src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherFisheryService.java

@@ -51,7 +51,7 @@ import eu.trentorise.opendata.jackan.model.CkanDataset;
  * @author Costantino Perciante (ISTI - CNR)
  * @author Luca Frosini (ISTI - CNR)
  */
-@Path("{source:firms|FIRMS|grsf|GRSF|FishSource|fishsource}/fishery/")
+@Path("{source:firms|FIRMS|grsf|GRSF|FishSource|fishsource|sdg|SDG}/fishery/")
 public class GrsfPublisherFisheryService {
 	
 	// the context

src/main/java/org/gcube/data_catalogue/grsf_publish_ws/services/GrsfPublisherStockService.java

@@ -51,7 +51,7 @@ import eu.trentorise.opendata.jackan.model.CkanDataset;
  * @author Costantino Perciante (ISTI - CNR)
  * @author Luca Frosini (ISTI - CNR)
  */
-@Path("{source:firms|FIRMS|ram|RAM|grsf|GRSF|FishSource|fishsource}/stock/")
+@Path("{source:firms|FIRMS|ram|RAM|grsf|GRSF|FishSource|fishsource|sdg|SDG}/stock/")
 public class GrsfPublisherStockService {
 	
 	// the context

src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/CommonServiceUtils.java

@@ -4,7 +4,6 @@ import java.beans.PropertyDescriptor;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -266,7 +265,7 @@ public class CommonServiceUtils {
 		if(match) {
 			StringBuffer stringBuffer = new StringBuffer();
 			if(prependSource) {
-				stringBuffer.append(source.toString());
+				stringBuffer.append(source.getURLPath());
 				stringBuffer.append(" ");
 			}
 			if(groupNameOverValue.isEmpty()) {
@@ -289,7 +288,7 @@ public class CommonServiceUtils {
 	 */
 	private static void addRecordToGroups(Set<String> groups, Set<String> sourcesList,  Product_Type productType, Sources sourceInPath) {
 		if(sourceInPath == Sources.GRSF) {
-			groups.add(getGroupId(Sources.GRSF.getOrigName())); // i.e. grsf_group
+			groups.add(getGroupId(Sources.GRSF.getURLPath())); // i.e. grsf_group
 		}else {
 			groups.add(getGroupId(Constants.SYSTEM_TYPE_LEGACY_RECORD)); // i.e. legacy_group
 		}
@@ -543,7 +542,7 @@ public class CommonServiceUtils {
 			if(databaseSources!=null) {
 				for(Resource<Sources> source : databaseSources) {
 					Sources sourceName = source.getName();
-					sourcesList.add(sourceName.getOrigName().toLowerCase());
+					sourcesList.add(sourceName.getURLPath());
 				}
 			}
 		}
@@ -719,6 +718,6 @@ public class CommonServiceUtils {
 				return Constants.GRSF_PRE_ORGANIZATION_NAME;
 			}
 		}else
-			return sourceInPath.getOrigName().toLowerCase();
+			return sourceInPath.getURLPath();
 	}
 }

src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java

@@ -31,6 +31,7 @@ import org.gcube.datacatalogue.common.caches.CacheInterface;
 import org.gcube.resources.discovery.client.api.DiscoveryClient;
 import org.gcube.resources.discovery.client.queries.api.Query;
 import org.gcube.resources.discovery.client.queries.impl.QueryBox;
+import org.gcube.social_networking.social_networking_client_library.UserClient;
 import org.jsoup.Jsoup;
 import org.jsoup.safety.Whitelist;
 import org.slf4j.LoggerFactory;
@@ -134,21 +135,18 @@ public abstract class HelperMethods {
 	 * @return
 	 * @throws Exception 
 	 */
-	public static String getUserEmail(String context, String token){
+	public static String getUserEmail(String context, String token) throws Exception{
 
 		// check in cache
-		String result = null;
-		if((result = (String) userEmailCache.get(token)) != null){
-			return result;
+		String email = null;
+		if((email = (String) userEmailCache.get(token)) != null){
+			return email;
 		}else{
-			String baseUrl = new GcoreEndPointReaderSocial(context).getBasePath();
-			String url = baseUrl.endsWith("/") ?  baseUrl + "users/getUserEmail?gcube-token=" + token :
-				baseUrl + "/users/getUserEmail?gcube-token=" + token;
-			logger.debug("Request url is " + url);
-			result = executGETHttpRequest(url, 200);
-			userEmailCache.insert(token, result);
+			UserClient userClient = new UserClient();
+			email = userClient.getEmail();
+			userEmailCache.insert(token, email);
 		}
-		return result;
+		return email;
 	}
 
 	/**
@@ -158,21 +156,18 @@ public abstract class HelperMethods {
 	 * @return
 	 * @throws Exception 
 	 */
-	public static String getUserFullname(String context, String token){
+	public static String getUserFullname(String context, String token) throws Exception{
 
 		// check in cache
-		String result = null;
-		if((result = (String) userFullnameCache.get(token)) != null){
-			return result;
+		String fullName = null;
+		if((fullName = (String) userFullnameCache.get(token)) != null){
+			return fullName;
 		}else{
-			String baseUrl = new GcoreEndPointReaderSocial(context).getBasePath();
-			String url = baseUrl.endsWith("/") ?  baseUrl + "users/getUserFullname?gcube-token=" + token :
-				baseUrl + "/users/getUserFullname?gcube-token=" + token;
-			logger.debug("Request url is " + url);
-			result = executGETHttpRequest(url, 200);
-			userFullnameCache.insert(token, result);
+			UserClient userClient = new UserClient();
+			fullName = userClient.getFullName();
+			userFullnameCache.insert(token, fullName);
 		}
-		return result;
+		return fullName;
 	}
 
 	/**

src/main/resources/GRSF Stock (GRSF VRE).xml

@@ -70,7 +70,7 @@
 				</field>				
 				<field>
 					<originalKey>Assessment Method</originalKey>
-					<modifiedKey>stock_data:Assessment Method</modifiedKey>
+					<modifiedKey>none:none</modifiedKey>
 				</field>
 				<field>
 					<originalKey>Abundance Level (FIRMS Standard)</originalKey>

src/test/java/org/gcube/data_catalogue/grsf_publish_ws/JTests.java

@@ -270,7 +270,7 @@ public class JTests {
 	}
 	
 	//@Test
-	public void testCaches(){
+	public void testCaches() throws Exception{
 		
 		String context = "/gcube/devNext/NextNext";
 		String token = "";

src/test/java/org/gcube/data_catalogue/grsf_publish_ws/TestJson.java

@@ -0,0 +1,38 @@
+package org.gcube.data_catalogue.grsf_publish_ws;
+
+import java.io.File;
+import java.net.URL;
+
+import org.gcube.data_catalogue.grsf_publish_ws.json.input.record.StockRecord;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ */
+public class TestJson {
+	
+	private static final Logger logger = LoggerFactory.getLogger(Test.class);
+	
+	public File getResourcesDirectory() throws Exception {
+		URL logbackFileURL = TestJson.class.getClassLoader().getResource("logback-test.xml");
+		File logbackFile = new File(logbackFileURL.toURI());
+		File resourcesDirectory = logbackFile.getParentFile();
+		return resourcesDirectory;
+	}
+	
+	@Test
+	public void testJsonDeserialization() throws Exception {
+		File jsonQueryFile = new File(getResourcesDirectory(), "70ae6895-7d3d-4f4a-86f9-bcb17d41bff6.json");
+		ObjectMapper objectMapper = new ObjectMapper();
+		JsonNode jsonNode = objectMapper.readTree(jsonQueryFile);
+		logger.debug("{}", jsonNode);
+		StockRecord sr = objectMapper.readValue(jsonQueryFile, StockRecord.class);
+		logger.debug("{}", sr);
+	}
+	
+}

src/test/resources/70ae6895-7d3d-4f4a-86f9-bcb17d41bff6.json

@@ -0,0 +1,34 @@
+{
+  "stock_name" : "European hake - Southern Adriatic",
+  "license_id" : "CC-BY-SA-4.0",
+  "version" : 1.0,
+  "database_sources" : [ {
+    "name" : "FAO SDG 14.4.1 questionnaire",
+    "description" : "FAO SDG 14.4.1 questionnaire",
+    "url" : "https://www.fao.org/sustainable-development-goals/indicators/14.4.1/en/"
+  } ],
+  "stock_uri" : "https://github.com/grsf/resource/sdg_14_4_1/stock/70ae6895-7d3d-4f4a-86f9-bcb17d41bff6",
+  "grsf_uuid" : "70ae6895-7d3d-4f4a-86f9-bcb17d41bff6",
+  "short_name" : "European hake - Southern Adriatic",
+  "description" : "European hake - Southern Adriatic",
+  "grsf_type" : "assessment unit",
+  "species" : [ "Code: HKE, Classification System: ASFIS, Scientific Name: Merluccius merluccius" ],
+  "assessment_area" : [ "Code: 18, System: gfcm, Name: Southern Adriatic " ],
+  "source_of_information" : [ {
+    "name" : "https://www.fao.org/sustainable-development-goals/indicators/14.4.1/en/sdg-alb-1",
+    "description" : "",
+    "url" : "https://www.fao.org/sustainable-development-goals/indicators/14.4.1/en/sdg-alb-1"
+  } ],
+  "data_owner" : [ "Albania" ],
+  "assessment_methods" : [ "The official stock assessment concludes 'Overfished' with respect to abundance reference points. [Rep. Year or Assessment ID: 2019, Ref. Year: 2018]" ],
+  "connections_indicator" : "not connected",
+  "similarities_indicator" : "without similar records",
+  "landings" : [ {
+    "value" : "872",
+    "unit" : "Tonnes",
+    "reference_year" : 2018,
+    "reporting_year_or_assessment_id" : "2020",
+    "data_owner" : "Albania"
+  } ],
+  "citation" : "citation TBD"
+}

src/test/resources/logback-test.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xml>
+<configuration>
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+   <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{0}: %msg%n</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <logger name="org.gcube" level="INFO" />
+  <logger name="org.gcube.data_catalogue.grsf_publish_ws" level="TRACE" />
+
+  <root level="WARN">
+    <appender-ref ref="STDOUT" />
+  </root>
+  
+</configuration>