diff --git a/.classpath b/.classpath index d346edf..277f1df 100644 --- a/.classpath +++ b/.classpath @@ -25,11 +25,11 @@ + - + - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index cac0df4..ca4c66e 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -6,6 +6,6 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error 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.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=1.8 diff --git a/CHANGELOG.md b/CHANGELOG.md index e010660..f073649 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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). +## [v1.8.0-SNAPSHOT] + +- Enhanced the Geoportal-Resolver. Supported share links to Geoportal Data-Entry app [#27160] + ## [v1.7.0] - Integrated the new Geoportal-Resolver [#24842] diff --git a/pom.xml b/pom.xml index db68757..f977f01 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ maven-parent org.gcube.tools - 1.1.0 + 1.2.0 4.0.0 org.gcube.portlets.user uri-resolver-manager - 1.7.0 + 1.8.0-SNAPSHOT jar uri-resolver-manager The URI Resolver Manager diff --git a/src/test/java/UriResolverManagerTest.java b/src/test/java/UriResolverManagerTest.java index e1f1a63..51c2135 100644 --- a/src/test/java/UriResolverManagerTest.java +++ b/src/test/java/UriResolverManagerTest.java @@ -132,28 +132,31 @@ public class UriResolverManagerTest { public void testGeoportalCreateLink() { try { - ScopeProvider.instance.set("/gcube"); + String scope = "/gcube/devsec/devVRE"; +// String scope = "/pred4s/preprod/preVRE"; + ScopeProvider.instance.set(scope); UriResolverManager resolver; - String gcubeScope = "/gcube/devsec/devVRE"; - String itemId = "63d011c4dcac4551b9a6b930"; + String gcubeScope = scope; + String itemId = "6384aaac308f5c28c5ee0888"; String itemType = "profiledConcessioni"; resolver = new UriResolverManager("GEO"); + Map params = null; //Method 1 -// Map params = new HashMap(); -// params.put(GeoportalResolverQueryStringBuilder.GCUBE_SCOPE_PARAMETER, gcubeScope); -// params.put(GeoportalResolverQueryStringBuilder.ITEM_ID_PARAMETER, itemId); -// params.put(GeoportalResolverQueryStringBuilder.ITEM_TYPE_PARAMETER, itemType); -// params.put(GeoportalResolverQueryStringBuilder.RESOLVE_AS_PARAMETER, GeoportalResolverQueryStringBuilder.RESOLVE_AS.PUBLIC.getParamValue()); + params = new HashMap(); + params.put(GeoportalResolverQueryStringBuilder.GCUBE_SCOPE_PARAMETER, gcubeScope); + params.put(GeoportalResolverQueryStringBuilder.ITEM_ID_PARAMETER, itemId); + params.put(GeoportalResolverQueryStringBuilder.ITEM_TYPE_PARAMETER, itemType); + params.put(GeoportalResolverQueryStringBuilder.RESOLVE_AS_PARAMETER, GeoportalResolverQueryStringBuilder.RESOLVE_AS.PUBLIC.getParamValue()); //Method 2 GeoportalResolverQueryStringBuilder builder = new GeoportalResolverQueryStringBuilder(itemType,itemId); builder.scope(gcubeScope); builder.resolverAs(RESOLVE_AS.PUBLIC); //builder.resolverAs(RESOLVE_AS.PRIVATE); - Map params = builder.buildQueryParameters(); + params = builder.buildQueryParameters(); String shortLink = resolver.getLink(params, true); System.out.println(shortLink);