gCubeSystem
/
uri-resolver
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Migrated to Shlink service [#30388]

This commit is contained in:
Francesco Mangiacrapa 2025-11-14 12:00:40 +01:00
parent 1c66ada538
commit ac32aeed19
11 changed files with 197 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.classpath
View File

@ -17,11 +17,13 @@
<attributes>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
@ -35,5 +37,16 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

11
.project
View File

@ -44,4 +44,15 @@
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
<filteredResources>
<filter>
<id>1754551263784</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

4
.settings/org.eclipse.jdt.apt.core.prefs Normal file
View File

@ -0,0 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=true
org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations
org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations

1
.settings/org.eclipse.jdt.core.prefs
View File

@ -7,5 +7,6 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=enabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8

242
.settings/org.eclipse.wst.common.component
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
@ -63,8 +63,42 @@
<wb-module deploy-name="uri-resolver-2.10.1-SNAPSHOT">
<wb-module deploy-name="uri-resolver-2.10.2-SNAPSHOT">
@ -129,7 +163,24 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
@ -194,7 +245,24 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
@ -259,7 +327,24 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
@ -325,30 +410,25 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="uri-resolver-manager-1.8.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/uri-resolver-manager/uri-resolver-manager">
<dependency-type>uses</dependency-type>
</dependent-module>
<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.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/geoportal-common/geoportal-common">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="concessioni-model-1.0.4.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/concessioni-model/concessioni-model">
<dependency-type>uses</dependency-type>
</dependent-module>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/annotations"/>
@ -413,72 +493,27 @@
<property name="context-root" value="uri-resolver"/>
<property name="java-output-path" value="/uri-resolver/target/classes"/>
@ -543,7 +578,24 @@
</wb-module>

6
.settings/org.eclipse.wst.common.project.facet.core.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
<fixed facet="wst.jsdt.web"/>
<installed facet="wst.jsdt.web" version="1.0"/>
<installed facet="jst.jaxrs" version="2.0"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="java" version="1.8"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="jst.jaxrs" version="2.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>

4
CHANGELOG.md
View File

@ -3,6 +3,10 @@
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.2-SNAPSHOT]
- Migrated to Shlink service [#30388]
## [v2.10.1]
- Geoportal Exporter: added static pages as freemarker templates

2
pom.xml
View File

@ -9,7 +9,7 @@
</parent>
<groupId>org.gcube.data.transfer</groupId>
<artifactId>uri-resolver</artifactId>
<version>2.10.1</version>
<version>2.10.2-SNAPSHOT</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>

10
src/test/java/gis/RuntimeResourceReader.java
View File

@ -144,8 +144,8 @@ public class RuntimeResourceReader {
String resourceName = null;
// String scope = "/pred4s/preprod/preVRE";
// String scope = "/d4science.research-infrastructures.eu/D4OS/GNA";
String scope = "/d4science.research-infrastructures.eu/FARM/ITINERIS_AERO";
// String scope = "/gcube/devsec/devVRE";
//String scope = "/d4science.research-infrastructures.eu/FARM/ITINERIS_AERO";
String scope = "/gcube/devsec/devVRE";
// 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";
@ -170,9 +170,9 @@ public class RuntimeResourceReader {
// String category = "DataStorage";
String platformName = "Tomcat";
String category = "Application";
resourceName = "CKanDataCatalogue";
String platformName = null;
String category = "Service";
resourceName = "HTTP-URL-Shortener-DL_old";
// scope = "/pred4s/preprod/preVRE";
// scope = "/d4science.research-infrastructures.eu/D4OS/Blue-Cloud2026Project";

4
src/test/java/org/gcube/datatransfer/test/ServiceEndpointReader.java
View File

@ -24,8 +24,8 @@ import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
*/
public class ServiceEndpointReader {
private static final String RESOURCE_NAME = "DEV Geoserver";
private static final String CATEGORY_NAME = "Gis";
private static final String RESOURCE_NAME = "HTTP-URL-Shortener-DL_old";
private static final String CATEGORY_NAME = "Service";
private static final String SCOPE = "/gcube/devsec/devVRE";
public static Logger LOG = Logger.getLogger(ServiceEndpointReader.class);

13
src/test/java/org/gcube/datatransfer/test/StorageHubTest.java
View File

@ -5,6 +5,7 @@ import org.gcube.common.storagehub.client.StreamDescriptor;
import org.gcube.common.storagehub.client.plugins.AbstractPlugin;
import org.gcube.common.storagehub.client.proxies.ItemManagerClient;
import org.gcube.datatransfer.resolver.init.UriResolverSmartGearManagerInit;
import org.junit.Test;
/**
@ -16,11 +17,7 @@ import org.gcube.datatransfer.resolver.init.UriResolverSmartGearManagerInit;
*/
public class StorageHubTest {
private static String entityName = "using_e-infrastructures_for_biodiversity_conservation";
private static String entityContext = "ctlg";
private static String vreName = "BlueBridgeProject";
private String rootContextScope = "/d4science.research-infrastructures.eu";
private String rootContextScope = "/gcube";
private String authorizationToken = "";
//@Before
@ -29,17 +26,19 @@ public class StorageHubTest {
UriResolverSmartGearManagerInit.setRootContextScope(rootContextScope);
}
//@Test
@Test
public void testStreamDescriptorInfo() {
System.out.println("testStreamDescriptorInfo starts...");
ScopeProvider.instance.set(rootContextScope);
SecurityTokenProvider.instance.set(authorizationToken);
String storageHubId = "E_NGJIUEYvU09sNG1YY0R2VGIyaStWdGhDSW9sSjRNdDRkdVI2RHRGb1BZMVBaVFlzMG1mOU5QUEtFM1hQeE9kbw==";
String storageHubId = "E_ZXJhUWpYT04rekVBM3djUEwwd0k4bEo5NzlJa2VZS2VJd001bTJYTnZITXRzM2JtWlc1YVNiQzBXS0dRLzlpcQ==";
try{
ItemManagerClient client = AbstractPlugin.item().build();
StreamDescriptor descriptor = client.resolvePublicLink(storageHubId);
System.out.println("Descriptor: "+descriptor);
//Etc..
}catch(Exception e){
e.printStackTrace();