From 78784473f6a89b08ce5c31d3f8a6ec92087347fa Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Wed, 7 Apr 2021 16:55:12 +0200 Subject: [PATCH] changed the WekeoResolver --- .../resolver/services/WekeoResolver.java | 21 +++++- src/main/webapp/WEB-INF/jsp/cr7huevos.jsp | 22 ------- .../datatransfer/test/StorageHubTest.java | 64 +++++++++++++++++++ src/test/java/rest/TestResolvers.java | 10 ++- 4 files changed, 92 insertions(+), 25 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/jsp/cr7huevos.jsp create mode 100644 src/test/java/org/gcube/datatransfer/test/StorageHubTest.java diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/WekeoResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/WekeoResolver.java index fd72bfa..654b3ab 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/WekeoResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/WekeoResolver.java @@ -29,6 +29,7 @@ import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.datatransfer.resolver.requesthandler.RequestHandler; import org.gcube.datatransfer.resolver.services.error.ExceptionManager; +import org.gcube.datatransfer.resolver.util.Util; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.SimpleQuery; import org.slf4j.Logger; @@ -61,9 +62,8 @@ public class WekeoResolver { * @return the token * @throws WebApplicationException the web application exception */ - @POST + @GET @Path("/gettoken") - @Consumes(MediaType.TEXT_PLAIN) @Produces(MediaType.APPLICATION_JSON) public Response getToken(@Context HttpServletRequest req) throws WebApplicationException{ @@ -180,6 +180,23 @@ public class WekeoResolver { } } + @GET + @Path("") + @Produces(MediaType.TEXT_HTML) + public Response getIndex(@Context HttpServletRequest req) { + logger.info(this.getClass().getSimpleName()+" getIndex starts..."); + + StringBuilder wekeoResponse = new StringBuilder(); + wekeoResponse.append("

Welcome to Wekeo Resolver

"); + wekeoResponse.append("
See documentation at: "+helpURI +"
"); + String wekeoGetTokenURL = String.format("%s/%s", Util.getServerURL(req), "wekeo/gettoken"); + wekeoResponse.append("
Go to gettoken request: "+wekeoGetTokenURL +"
"); + + String theResponse = wekeoResponse.toString(); + logger.info("debug: \n"+theResponse); + return Response.ok(theResponse).build(); + } + /** * Reads the wekeo endpoint information from IS. {The SE name is: @link WekeoResolver#RUNTIME_WKEO_RESOURCE_NAME} diff --git a/src/main/webapp/WEB-INF/jsp/cr7huevos.jsp b/src/main/webapp/WEB-INF/jsp/cr7huevos.jsp deleted file mode 100644 index 3c2d1cc..0000000 --- a/src/main/webapp/WEB-INF/jsp/cr7huevos.jsp +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - -
- -
- - \ No newline at end of file diff --git a/src/test/java/org/gcube/datatransfer/test/StorageHubTest.java b/src/test/java/org/gcube/datatransfer/test/StorageHubTest.java new file mode 100644 index 0000000..7e146c2 --- /dev/null +++ b/src/test/java/org/gcube/datatransfer/test/StorageHubTest.java @@ -0,0 +1,64 @@ +package org.gcube.datatransfer.test; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.ResponseBuilder; + +import org.gcube.common.authorization.library.provider.SecurityTokenProvider; +import org.gcube.common.scope.api.ScopeProvider; +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.catalogue.resource.CkanCatalogueConfigurationsReader; +import org.gcube.datatransfer.resolver.catalogue.resource.GatewayCKANCatalogueReference; +import org.gcube.datatransfer.resolver.init.UriResolverSmartGearManagerInit; +import org.gcube.datatransfer.resolver.services.CatalogueResolver; +import org.gcube.datatransfer.resolver.services.StorageHubResolver; +import org.gcube.datatransfer.resolver.services.error.ExceptionManager; +import org.gcube.datatransfer.resolver.shub.StorageHubMetadataResponseBuilder; +import org.junit.Before; +import org.junit.Test; + +import com.itextpdf.text.log.SysoCounter; + + +/** + * The Class CatalogueResolverTest. + * + * @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it) + * + * May 13, 2019 + */ +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 authorizationToken = "ea16e0fa-722a-4589-83b0-0a731d2d4039-843339462"; + + //@Before + public void init() { + + UriResolverSmartGearManagerInit.setRootContextScope(rootContextScope); + } + + //@Test + public void testStreamDescriptorInfo() { + System.out.println("testStreamDescriptorInfo starts..."); + ScopeProvider.instance.set(rootContextScope); + SecurityTokenProvider.instance.set(authorizationToken); + String storageHubId = "E_NGJIUEYvU09sNG1YY0R2VGIyaStWdGhDSW9sSjRNdDRkdVI2RHRGb1BZMVBaVFlzMG1mOU5QUEtFM1hQeE9kbw=="; + try{ + + ItemManagerClient client = AbstractPlugin.item().build(); + StreamDescriptor descriptor = client.resolvePublicLink(storageHubId); + System.out.println("Descriptor: "+descriptor); + + }catch(Exception e){ + e.printStackTrace(); + } + } + + + +} diff --git a/src/test/java/rest/TestResolvers.java b/src/test/java/rest/TestResolvers.java index baf0ea1..2b510cb 100644 --- a/src/test/java/rest/TestResolvers.java +++ b/src/test/java/rest/TestResolvers.java @@ -15,10 +15,19 @@ import java.nio.file.StandardCopyOption; import java.util.List; import java.util.Map; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.ResponseBuilder; + import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.http.HttpStatus; +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.applicationprofile.ApplicationProfileReader; +import org.gcube.datatransfer.resolver.services.StorageHubResolver; +import org.gcube.datatransfer.resolver.services.error.ExceptionManager; +import org.gcube.datatransfer.resolver.shub.StorageHubMetadataResponseBuilder; import org.gcube.datatransfer.resolver.util.HTTPCallsUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,7 +90,6 @@ public class TestResolvers { } } - /** * Storage hub test. *