diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java index ce75edf..58ba53e 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java @@ -46,7 +46,7 @@ import com.google.common.cache.CacheLoader.InvalidCacheLoadException; * * Mar 23, 2023 */ -@Path("/") +//@Path("/") public class GeoportalResolver { public static final String GEO_DE = "geode"; @@ -84,9 +84,10 @@ public class GeoportalResolver { * @param resolveAs the resolve as * @return the response * @throws WebApplicationException the web application exception + * @Path("/{targetAppId:" + GEO + "|" + GEO_DV + "|" + GEO_DE + "}" + "/{vre_name}/{usecase_id}/{project_id}") */ @GET - @Path("/{targetAppId:" + GEO + "|" + GEO_DV + "|" + GEO_DE + "}" + "/{vre_name}/{usecase_id}/{project_id}") + @Path("/"+GEO_DE + "/{vre_name}/{usecase_id}/{project_id}") public Response resolveGeoportal(@Context HttpServletRequest req, @PathParam(PATH_TARGET_APP) String targetAppId, @PathParam(PATH_VRE_NAME) String vreName, @PathParam(PATH_USECASE_ID) String ucdID, @PathParam(PATH_PROJECT_ID) String projectID, @QueryParam(QP_RESOLVE_AS) String resolveAs) @@ -95,6 +96,8 @@ public class GeoportalResolver { return genericGet(req, targetAppId, vreName, ucdID, projectID, resolveAs); } + + /** * Resolve geoportal DV. @@ -147,7 +150,7 @@ public class GeoportalResolver { * @throws WebApplicationException the web application exception */ @POST - @Path("{targetAppId:" + GEO + "|" + GEO_DV + "|" + GEO_DE + "}") + @Path("/{targetAppId:" + GEO + "|" + GEO_DV + "|" + GEO_DE + "}") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public Response postGeoportal(@Context HttpServletRequest req, @PathParam(PATH_TARGET_APP) String targetAppId, GeoportalRequest jsonRequest)