diff --git a/enunciate.xml b/enunciate.xml index f048813..716a60c 100644 --- a/enunciate.xml +++ b/enunciate.xml @@ -5,7 +5,7 @@ + pattern="org.gcube.datatransfer.resolver.services.DocsGenerator" /> - + - + \ No newline at end of file diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/AnalyticsCreateResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/AnalyticsCreateResolver.java index b8cd4ec..ad76f38 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/AnalyticsCreateResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/AnalyticsCreateResolver.java @@ -57,10 +57,9 @@ import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; /** - * The AnalyticsCreateResolver provides a method to get the Analytics URLs (that - * are simply URLs) by which is possible to invoke through the DataMiner - * Executor the run of an algorithm stored in a certain VRE. By the DataMiner - * Executor then the user is able to monitoring the algorithm execution. + * The AnalyticsCreateResolver provides a method to get the Analytics URLs by + * which is possible to invoke through the DataMiner Executor the run of an + * algorithm stored in a certain VRE. * * See more at * https://gcube.wiki.gcube-system.org/gcube/URI_Resolver#Analytics_Resolver diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/UriResolverDocs.java b/src/main/java/org/gcube/datatransfer/resolver/services/DocsGenerator.java similarity index 83% rename from src/main/java/org/gcube/datatransfer/resolver/services/UriResolverDocs.java rename to src/main/java/org/gcube/datatransfer/resolver/services/DocsGenerator.java index f610233..71661da 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/UriResolverDocs.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/DocsGenerator.java @@ -18,16 +18,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * The UriResolverDocs provides the URI Resolver API Documentation + * The Class DocsGenerator. * * @author Francesco Mangiacrapa at ISTI-CNR francesco.mangiacrapa@isti.cnr.it * - * Mar 24, 2022 + * Apr 1, 2022 */ @Path("docs") -public class UriResolverDocs { +public class DocsGenerator { - private static Logger logger = LoggerFactory.getLogger(UriResolverDocs.class); + private static Logger logger = LoggerFactory.getLogger(DocsGenerator.class); /** * To doc. @@ -39,14 +39,15 @@ public class UriResolverDocs { @GET @Path("/{any: .*}") public InputStream toDoc(@Context HttpServletRequest req) throws WebApplicationException { - logger.info(UriResolverDocs.class.getSimpleName() + " toDoc called"); + logger.info(DocsGenerator.class.getSimpleName() + " toDoc called"); String pathInfo = req.getPathInfo(); logger.info("pathInfo {}", pathInfo); try { - if (pathInfo.endsWith("/docs/")) + if (pathInfo.endsWith("/docs/")) { pathInfo += "index.html"; + } logger.info("redirecting to {}", pathInfo); diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java index 6992c81..6b75e52 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java @@ -48,11 +48,8 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; /** - * The GeonetworkResolver is a "middle tier" (like a Proxy) to perform queries - * on D4Science Geonetwork services. - * - * Request format - * [GEONETWORK_RESOLVER_BASE_URL]/[SCOPE]/[MODE]/[VISIBILITY]/[FILTER_KEY]/[FILTER_VALUE]/$$ + * The GeonetworkResolver is a "middle tier" to perform queries + * to D4Science's Geonetwork services. * * See more at * https://gcube.wiki.gcube-system.org/gcube/URI_Resolver#Geonetwork_Resolver diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/GisResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/GisResolver.java index cc24d7e..2d5d789 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/GisResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/GisResolver.java @@ -35,8 +35,7 @@ import com.google.common.cache.CacheLoader.InvalidCacheLoadException; /** * The GisResolver is able to resolve GIS Links (as a redirect to Gis Viewer * Application) in order to display and navigate on web-map the gis layers - * stored in D4Science Geonetwork - * (e.g. http://wiki.i-marine.eu/index.php/Blue_Hackathon_iMarine_Data_Challenges#iMarine_GeoNetwork) + * stored in D4Science's Geonetwork * * See more at * https://gcube.wiki.gcube-system.org/gcube/URI_Resolver#GIS_Resolver diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java index 51a7baa..edc1fae 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java @@ -38,9 +38,6 @@ import org.slf4j.LoggerFactory; /** * The StorageIDResolver is able to give HTTP resolution to storage resource by ID * - * Request Format - * [URI_RESOLVER_SERVICE_ENDPOINT]/[STORAGE_ID] - * * See more at * https://gcube.wiki.gcube-system.org/gcube/URI_Resolver#STORAGE-ID_Resolver * 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 757eb9b..af0c459 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/WekeoResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/WekeoResolver.java @@ -39,9 +39,6 @@ import org.slf4j.LoggerFactory; * The WekeoResolver provides a method to wrap the basic authentication from * D4Science account to WekeoBroker service. * - * Request format - * [URI_RESOLVER_SERVICE_ENDPOINT]/wekeo/gettoken?gcube-token=[YOUR_GCUBE_TOKEN] - * * See more at * https://gcube.wiki.gcube-system.org/gcube/URI_Resolver#Wekeo_Resolver *