Updated paths

This commit is contained in:
Francesco Mangiacrapa 2023-03-24 14:54:23 +01:00
parent b57bd03889
commit 0b7ca3d03f
1 changed files with 26 additions and 25 deletions

View File

@ -85,35 +85,36 @@ public class GeoportalResolver {
* @throws WebApplicationException the web application exception * @throws WebApplicationException the web application exception
*/ */
@GET @GET
@Path(GEO + "/{vre_name}/{usecase_id}/{project_id}") @Path("{targetAppId:" + GEO + "|" + GEO_DV + "|" + GEO_DE + "}" + "/{vre_name}/{usecase_id}/{project_id}")
public Response resolveGeoportal(@Context HttpServletRequest req, @PathParam(PATH_VRE_NAME) String vreName, public Response resolveGeoportal(@Context HttpServletRequest req, @PathParam(PATH_TARGET_APP) String targetAppId,
@PathParam(PATH_USECASE_ID) String ucdID, @PathParam(PATH_PROJECT_ID) String projectID, @PathParam(PATH_VRE_NAME) String vreName, @PathParam(PATH_USECASE_ID) String ucdID,
@QueryParam(QP_RESOLVE_AS) String resolveAs) throws WebApplicationException { @PathParam(PATH_PROJECT_ID) String projectID, @QueryParam(QP_RESOLVE_AS) String resolveAs)
String targetAppId = GEO; throws WebApplicationException {
// String targetAppId = GEO;
return genericGet(req, targetAppId, vreName, ucdID, projectID, resolveAs); return genericGet(req, targetAppId, vreName, ucdID, projectID, resolveAs);
} }
// /** /**
// * Resolve geoportal DV. * Resolve geoportal DV.
// * *
// * @param req the req * @param req the req
// * @param vreName the vre name * @param vreName the vre name
// * @param ucdID the ucd ID * @param ucdID the ucd ID
// * @param projectID the project ID * @param projectID the project ID
// * @param resolveAs the resolve as * @param resolveAs the resolve as
// * @return the response * @return the response
// * @throws WebApplicationException the web application exception * @throws WebApplicationException the web application exception
// */ */
// @GET @GET
// @Path(GEO_DV + "/{vre_name}/{usecase_id}/{project_id}") @Path(GEO_DV + "/{vre_name}/{usecase_id}/{project_id}")
// public Response resolveGeoportalDV(@Context HttpServletRequest req, @PathParam(PATH_VRE_NAME) String vreName, public Response resolveGeoportalDV(@Context HttpServletRequest req, @PathParam(PATH_VRE_NAME) String vreName,
// @PathParam(PATH_USECASE_ID) String ucdID, @PathParam(PATH_PROJECT_ID) String projectID, @PathParam(PATH_USECASE_ID) String ucdID, @PathParam(PATH_PROJECT_ID) String projectID,
// @QueryParam(QP_RESOLVE_AS) String resolveAs) throws WebApplicationException { @QueryParam(QP_RESOLVE_AS) String resolveAs) throws WebApplicationException {
// String targetAppId = GEO_DV; String targetAppId = GEO_DV;
// return genericGet(req, targetAppId, vreName, ucdID, projectID, resolveAs); return genericGet(req, targetAppId, vreName, ucdID, projectID, resolveAs);
//
// } }
// //
// /** // /**
// * Resolve geoportal DE. // * Resolve geoportal DE.