From 0b7ca3d03fe6a43332dc1f293a696eda678559dc Mon Sep 17 00:00:00 2001
From: "francesco.mangiacrapa" <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 24 Mar 2023 14:54:23 +0100
Subject: [PATCH] Updated paths

---
 .../resolver/services/GeoportalResolver.java  | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

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 1a01614..c6e7192 100644
--- a/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java
+++ b/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java
@@ -85,35 +85,36 @@ public class GeoportalResolver {
 	 * @throws WebApplicationException the web application exception
 	 */
 	@GET
-	@Path(GEO + "/{vre_name}/{usecase_id}/{project_id}")
-	public Response resolveGeoportal(@Context HttpServletRequest req, @PathParam(PATH_VRE_NAME) String vreName,
-			@PathParam(PATH_USECASE_ID) String ucdID, @PathParam(PATH_PROJECT_ID) String projectID,
-			@QueryParam(QP_RESOLVE_AS) String resolveAs) throws WebApplicationException {
-		String targetAppId = GEO;
+	@Path("{targetAppId:" + GEO + "|" + GEO_DV + "|" + 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)
+			throws WebApplicationException {
+		// String targetAppId = GEO;
 		return genericGet(req, targetAppId, vreName, ucdID, projectID, resolveAs);
 
 	}
 
-//	/**
-//	 * Resolve geoportal DV.
-//	 *
-//	 * @param req       the req
-//	 * @param vreName   the vre name
-//	 * @param ucdID     the ucd ID
-//	 * @param projectID the project ID
-//	 * @param resolveAs the resolve as
-//	 * @return the response
-//	 * @throws WebApplicationException the web application exception
-//	 */
-//	@GET
-//	@Path(GEO_DV + "/{vre_name}/{usecase_id}/{project_id}")
-//	public Response resolveGeoportalDV(@Context HttpServletRequest req, @PathParam(PATH_VRE_NAME) String vreName,
-//			@PathParam(PATH_USECASE_ID) String ucdID, @PathParam(PATH_PROJECT_ID) String projectID,
-//			@QueryParam(QP_RESOLVE_AS) String resolveAs) throws WebApplicationException {
-//		String targetAppId = GEO_DV;
-//		return genericGet(req, targetAppId, vreName, ucdID, projectID, resolveAs);
-//
-//	}
+	/**
+	 * Resolve geoportal DV.
+	 *
+	 * @param req       the req
+	 * @param vreName   the vre name
+	 * @param ucdID     the ucd ID
+	 * @param projectID the project ID
+	 * @param resolveAs the resolve as
+	 * @return the response
+	 * @throws WebApplicationException the web application exception
+	 */
+	@GET
+	@Path(GEO_DV + "/{vre_name}/{usecase_id}/{project_id}")
+	public Response resolveGeoportalDV(@Context HttpServletRequest req, @PathParam(PATH_VRE_NAME) String vreName,
+			@PathParam(PATH_USECASE_ID) String ucdID, @PathParam(PATH_PROJECT_ID) String projectID,
+			@QueryParam(QP_RESOLVE_AS) String resolveAs) throws WebApplicationException {
+		String targetAppId = GEO_DV;
+		return genericGet(req, targetAppId, vreName, ucdID, projectID, resolveAs);
+
+	}
 //
 //	/**
 //	 * Resolve geoportal DE.