gCubeSystem
/
uri-resolver
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated Paths

This commit is contained in:
Francesco Mangiacrapa 2023-03-24 15:03:22 +01:00
parent 0b7ca3d03f
commit 0b23748a3b
1 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java
View File

@ -49,9 +49,9 @@ import com.google.common.cache.CacheLoader.InvalidCacheLoadException;
@Path("/") @Path("/")
public class GeoportalResolver { public class GeoportalResolver {
public static final String GEO_DE = "geo-de"; public static final String GEO_DE = "geode";
public static final String GEO = "geo"; public static final String GEO = "geo";
public static final String GEO_DV = "geo-dv"; public static final String GEO_DV = "geodv";
private static final String QP_RESOLVE_AS = "res"; private static final String QP_RESOLVE_AS = "res";
private static final String PATH_PROJECT_ID = "project_id"; private static final String PATH_PROJECT_ID = "project_id";
@ -77,6 +77,7 @@ public class GeoportalResolver {
* Resolve geoportal. * Resolve geoportal.
* *
* @param req the req * @param req the req
* @param targetAppId the target app id
* @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
@ -95,26 +96,26 @@ public class GeoportalResolver {
} }
/** // /**
* 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.
@ -146,13 +147,13 @@ public class GeoportalResolver {
* @throws WebApplicationException the web application exception * @throws WebApplicationException the web application exception
*/ */
@POST @POST
@Path(GEO) @Path("{targetAppId:" + GEO + "|" + GEO_DV + "|" + GEO_DE + "}")
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.TEXT_PLAIN) @Produces(MediaType.TEXT_PLAIN)
public Response postGeoportal(@Context HttpServletRequest req, GeoportalRequest jsonRequest) public Response postGeoportal(@Context HttpServletRequest req, @PathParam(PATH_TARGET_APP) String targetAppId, GeoportalRequest jsonRequest)
throws WebApplicationException { throws WebApplicationException {
LOG.info(this.getClass().getSimpleName() + " POST starts..."); LOG.info(this.getClass().getSimpleName() + " POST starts...");
String targetAppId = GEO; //String targetAppId = GEO;
return genericPost(req, jsonRequest, targetAppId); return genericPost(req, jsonRequest, targetAppId);
} }