updated lower bound of geoportal-data-mapper at 1.1.0. Fixing

[#27494#note-14]

.project

@@ -30,6 +30,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>

.settings/org.eclipse.wst.common.component

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-                                                                                                                                                                        
+                                                                                                                                                                                                                                        
     
     
     
@@ -40,8 +40,40 @@
     
     
     
-    <wb-module deploy-name="uri-resolver-2.10.0-SNAPSHOT">
+    
-                                                                                                                                                                                                                                                                                                                                                
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    <wb-module deploy-name="uri-resolver-2.10.0">
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         
         
         
@@ -83,7 +115,23 @@
         
         
         <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         
         
         
@@ -125,7 +173,23 @@
         
         
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         
         
         
@@ -167,7 +231,23 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         
         
         
@@ -209,13 +289,29 @@
         
         
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="metadata-profile-form-builder-widget-2.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/metadata-profile-form-builder-widget/metadata-profile-form-builder-widget">
+        <dependent-module archiveName="geoportal-client-1.2.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-client/geoportal-client">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="geoportal-common-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-common/geoportal-common">
+        <dependent-module archiveName="geoportal-common-1.1.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-common/geoportal-common">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         
         
         
@@ -257,7 +353,23 @@
         
         
         <property name="context-root" value="uri-resolver"/>
-                                                                                                                                                                                                                                                                                                                                                
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
+        
         
         
         
@@ -299,7 +411,23 @@
         
         
         <property name="java-output-path" value="/uri-resolver/target/classes"/>
-                                                                                                                                                                                                                                                                                                                                            
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                            
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -341,7 +469,23 @@
     
     
     </wb-module>
-                                                                                                                                                                    
+                                                                                                                                                                                                                                    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

.settings/org.springframework.ide.eclipse.prefs

@@ -0,0 +1,2 @@
+boot.validation.initialized=true
+eclipse.preferences.version=1

CHANGELOG.md

@@ -4,11 +4,15 @@
 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).
 
-## [v2.10.0-SNAPSHOT]
+## [v2.10.0]
 
 - GeoPortal-Resolver enhancement: implemented share link towards Geoportal Data-Entry facility [#27135]
 - Added Geoportal Exporter as PDF [#27274]
 - Migrated to `catalogue-util-library` [#27423]
+- Included new SHUB client library [#27944]
+- Moved to `gcube-smartgears-bom 2.5.1{-SNAPSHOT}` [#28026]
+- Bug fixing StorageID resolver [#28276]
+- Added HealthCheckResponse via `microprofile-health-api` (see https://microprofile.io/specifications/microprofile-health/)
 
 ## [v2.9.0]
 

pom.xml

@@ -9,7 +9,7 @@
 	</parent>
 	<groupId>org.gcube.data.transfer</groupId>
 	<artifactId>uri-resolver</artifactId>
-	<version>2.10.0-SNAPSHOT</version>
+	<version>2.10.0</version>
 	<packaging>war</packaging>
 	<description>The URI Resolver is an HTTP URI resolver implemented as a REST service which gives access trough HTTP to different gcube Resolvers and gCube Applications.</description>
 
@@ -31,7 +31,7 @@
 			</activation>
 			<properties>
 				<!-- <gcube-bom>2.4.0</gcube-bom> -->
-				<gcube-smartgears-bom-version>2.5.0</gcube-smartgears-bom-version>
+				<gcube-smartgears-bom-version>2.5.1</gcube-smartgears-bom-version>
 				<authorization-utils-range>[2.0.0, 3.0.0-SNAPSHOT)</authorization-utils-range>
 			</properties>
 		</profile>
@@ -45,7 +45,7 @@
 			</activation>
 			<properties>
 				<!-- <gcube-bom>2.4.1-SNAPSHOT</gcube-bom> -->
-				<gcube-smartgears-bom-version>2.5.0</gcube-smartgears-bom-version>
+				<gcube-smartgears-bom-version>2.5.1-SNAPSHOT</gcube-smartgears-bom-version>
 				<authorization-utils-range>[2.0.0, 3.0.0-SNAPSHOT)</authorization-utils-range>
 			</properties>
 		</profile>
@@ -54,7 +54,8 @@
 
 	<properties>
 		<jersey.version>2.25.1</jersey.version>
-		<!-- Using 2.8.4 because storagehub-model.1.1.1 uses indirectly this version via jsersey-media-json -->
+		<!-- Using 2.8.4 because storagehub-model.1.1.1 uses indirectly this version 
+			via jsersey-media-json -->
 		<jackson.version>2.8.4</jackson.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
@@ -63,13 +64,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<!-- <dependency> -->
-			<!-- <groupId>org.gcube.distribution</groupId> -->
-			<!-- <artifactId>gcube-bom</artifactId> -->
-			<!-- <version>${gcube-bom}</version> -->
-			<!-- <type>pom</type> -->
-			<!-- <scope>import</scope> -->
-			<!-- </dependency> -->
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>gcube-smartgears-bom</artifactId>
@@ -88,6 +82,13 @@
 			<artifactId>common-smartgears</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.eclipse.microprofile.health</groupId>
+			<artifactId>microprofile-health-api</artifactId>
+			<version>4.0</version>
+		</dependency>
+
+
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-smartgears-app</artifactId>
@@ -101,13 +102,13 @@
 		<dependency>
 			<groupId>org.gcube.contentmanagement</groupId>
 			<artifactId>storage-manager-wrapper</artifactId>
-			<version>[3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>
+			<version>[3.0.0, 4.0.0-SNAPSHOT)</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.contentmanagement</groupId>
 			<artifactId>storage-manager-core</artifactId>
-			<version>[3.0.0-SNAPSHOT,4.0.0-SNAPSHOT)</version>
+			<version>[3.0.0,4.0.0-SNAPSHOT)</version>
 			<exclusions>
 				<exclusion>
 					<artifactId>slf4j-nop</artifactId>
@@ -132,7 +133,7 @@
 		<dependency>
 			<groupId>org.gcube.data.analysis</groupId>
 			<artifactId>dataminer-invocation-model</artifactId>
-			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+			<version>[1.0.0,2.0.0-SNAPSHOT)</version>
 		</dependency>
 
 		<dependency>
@@ -313,7 +314,7 @@
 		<dependency>
 			<groupId>org.gcube.application</groupId>
 			<artifactId>geoportal-data-mapper</artifactId>
-			<version>[1.0.0, 2.0.0-SNAPSHOT)</version>
+			<version>[1.1.0, 2.0.0-SNAPSHOT)</version>
 			<!-- Excluding these beacuse geoportal uses [2-3] ranges conflicting with 
 				[3-4] used by URI-Resolver -->
 			<exclusions>

src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java

@@ -169,6 +169,9 @@ public class StorageIDResolver {
 			//Reading the content size
 			size = metaFile.getSize();
 			LOG.debug("Read size {} from {}", size, StorageMetadataFile.class.getSimpleName());
+		}else {
+			//Bug fixing #28276
+			throw ExceptionManager.notFoundException(httpRequest, "Error on accessing the "+STORAGE_ID+ " '"+storageId+"'. Is it a valid id?", StorageIDResolver.class, help);
 		}
 
 		//CHECKING TO DEFAULT METADATA

src/main/java/org/gcube/datatransfer/resolver/services/UriResolverHealthCheck.java

@@ -0,0 +1,47 @@
+package org.gcube.datatransfer.resolver.services;
+
+import java.util.Map;
+import java.util.Optional;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.eclipse.microprofile.health.HealthCheck;
+import org.eclipse.microprofile.health.HealthCheckResponse;
+import org.eclipse.microprofile.health.HealthCheckResponse.Status;
+import org.eclipse.microprofile.health.Liveness;
+
+/**
+ * The Class UriResolverHealthCheck.
+ *
+ * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it
+ * 
+ *         Oct 15, 2024
+ */
+@Path("health")
+public class UriResolverHealthCheck implements HealthCheck {
+
+	@GET
+	@Path("")
+	@Produces({ MediaType.TEXT_HTML, MediaType.APPLICATION_JSON })
+	public Response check() {
+
+		HealthCheckResponse hcr = call();
+		return Response.ok().entity(hcr).build();
+	}
+
+	/**
+	 * Call.
+	 *
+	 * @return the health check response
+	 */
+	@Liveness
+	@Override
+	public HealthCheckResponse call() {
+
+		return new HealthCheckResponse("uri-resolver", Status.UP, Optional.empty());
+	}
+}

src/test/java/gis/RuntimeResourceReader.java

@@ -63,8 +63,10 @@ public class RuntimeResourceReader {
 			ScopeProvider.instance.set(scope);
 
 			SimpleQuery query = queryFor(ServiceEndpoint.class);
-			query.addCondition("$resource/Profile/Platform/Name/text() eq '" + platformName + "'");
+			if (platformName != null)
-			query.addCondition("$resource/Profile/Category/text() eq '" + category + "'");
+				query.addCondition("$resource/Profile/Platform/Name/text() eq '" + platformName + "'");
+			if (category != null)
+				query.addCondition("$resource/Profile/Category/text() eq '" + category + "'");
 			if (endPoint != null && !endPoint.isEmpty())
 				query.addCondition("$resource/Profile/AccessPoint/Interface/Endpoint/text() eq '" + endPoint + "'");
 
@@ -127,27 +129,28 @@ public class RuntimeResourceReader {
 
 //		String scope = "/pred4s/preprod/preVRE";
 //		String scope = "/d4science.research-infrastructures.eu/D4OS/GNA";
-		String scope = "/gcube/devsec/devVRE";
+		// String scope = "/gcube/devsec/devVRE";
-		//String scope = "/d4science.research-infrastructures.eu/gCubeApps/Esquiline";
+		String scope = "/d4science.research-infrastructures.eu/gCubeApps/ProtectedAreaImpactMaps";
+		// String scope = "/d4science.research-infrastructures.eu/gCubeApps/Esquiline";
 //		String scope = "/d4science.research-infrastructures.eu/D4OS/ARIADNEplus_Project";
 
 //		String platformName = "geonetwork";
 //		String category = "Gis";
 
-//		String platformName = "GeoServer";
+		String platformName = "GeoServer";
-//		String category = "Gis";
+		String category = null;
 
 //		String platformName = "postgis";
 //		String category = "Database";
 
-		String platformName = "postgres";
+//		String platformName = "postgres";
-		String category = "Database";
+//		String category = "Database";
-		
+
 //		String platformName = "mongodb";
 //		String category = "Database";
 
 		// scope = "/pred4s/preprod/preVRE";
-		
+
 //		scope = "/d4science.research-infrastructures.eu/D4OS/Blue-Cloud2026Project";
 //		platformName = "Zenodo";
 //		category = "Repository";