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 14:47:32 +01:00
parent f6004df3db
commit b57bd03889
2 changed files with 103 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.settings/org.eclipse.wst.common.component
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
@ -12,7 +13,8 @@
<wb-module deploy-name="uri-resolver-2.8.1"> <wb-module deploy-name="uri-resolver-2.8.1">
@ -25,7 +27,8 @@
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
@ -38,7 +41,8 @@
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
@ -51,7 +55,8 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
@ -64,7 +69,11 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="uri-resolver-manager-1.6.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/uri-resolver-manager/uri-resolver-manager">
<dependency-type>uses</dependency-type>
</dependent-module>
@ -77,7 +86,8 @@
<property name="context-root" value="uri-resolver"/> <property name="context-root" value="uri-resolver"/>
@ -90,7 +100,8 @@
<property name="java-output-path" value="/uri-resolver/target/classes"/> <property name="java-output-path" value="/uri-resolver/target/classes"/>
@ -103,7 +114,8 @@
</wb-module> </wb-module>

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

@ -46,19 +46,19 @@ import com.google.common.cache.CacheLoader.InvalidCacheLoadException;
* *
* Mar 23, 2023 * Mar 23, 2023
*/ */
@Path("") @Path("/")
public class GeoportalResolver { public class GeoportalResolver {
public static final String GEO_DE = "geo-de"; public static final String GEO_DE = "geo-de";
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 = "geo-dv";
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";
private static final String PATH_USECASE_ID = "usecase_id"; private static final String PATH_USECASE_ID = "usecase_id";
private static final String PATH_VRE_NAME = "vre_name"; private static final String PATH_VRE_NAME = "vre_name";
private static final String PATH_TARGET_APP = "targetAppId"; private static final String PATH_TARGET_APP = "targetAppId";
private static final Logger LOG = LoggerFactory.getLogger(GeoportalResolver.class); private static final Logger LOG = LoggerFactory.getLogger(GeoportalResolver.class);
private static String helpURI = "https://wiki.gcube-system.org/gcube/URI_Resolver#Geoportal_Resolver"; private static String helpURI = "https://wiki.gcube-system.org/gcube/URI_Resolver#Geoportal_Resolver";
@ -85,7 +85,7 @@ 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(GEO + "/{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_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 {
@ -94,47 +94,47 @@ 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.
* // *
* @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_DE+"/{vre_name}/{usecase_id}/{project_id}") // @Path(GEO_DE + "/{vre_name}/{usecase_id}/{project_id}")
public Response resolveGeoportalDE(@Context HttpServletRequest req, @PathParam(PATH_VRE_NAME) String vreName, // public Response resolveGeoportalDE(@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_DE; // String targetAppId = GEO_DE;
return genericGet(req, targetAppId, vreName, ucdID, projectID, resolveAs); // return genericGet(req, targetAppId, vreName, ucdID, projectID, resolveAs);
//
} // }
/** /**
* Create a Catalogue Link. * Create a Catalogue Link.
@ -148,45 +148,48 @@ public class GeoportalResolver {
@Path(GEO) @Path(GEO)
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.TEXT_PLAIN) @Produces(MediaType.TEXT_PLAIN)
public Response postGeoportal(@Context HttpServletRequest req, GeoportalRequest jsonRequest) throws WebApplicationException { public Response postGeoportal(@Context HttpServletRequest req, GeoportalRequest jsonRequest)
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);
} }
/** // /**
* Post geoportal DV. // * Post geoportal DV.
* // *
* @param req the req // * @param req the req
* @param jsonRequest the json request // * @param jsonRequest the json request
* @return the response // * @return the response
* @throws WebApplicationException the web application exception // * @throws WebApplicationException the web application exception
*/ // */
@Path(GEO_DV) // @Path(GEO_DV)
@Consumes(MediaType.APPLICATION_JSON) // @Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.TEXT_PLAIN) // @Produces(MediaType.TEXT_PLAIN)
public Response postGeoportalDV(@Context HttpServletRequest req, GeoportalRequest jsonRequest) throws WebApplicationException { // public Response postGeoportalDV(@Context HttpServletRequest req, GeoportalRequest jsonRequest)
LOG.info(this.getClass().getSimpleName() + " POST starts..."); // throws WebApplicationException {
String targetAppId = GEO_DV; // LOG.info(this.getClass().getSimpleName() + " POST starts...");
return genericPost(req, jsonRequest, targetAppId); // String targetAppId = GEO_DV;
} // return genericPost(req, jsonRequest, targetAppId);
// }
/** //
* Post geoportal DE. // /**
* // * Post geoportal DE.
* @param req the req // *
* @param jsonRequest the json request // * @param req the req
* @return the response // * @param jsonRequest the json request
* @throws WebApplicationException the web application exception // * @return the response
*/ // * @throws WebApplicationException the web application exception
@Path(GEO_DE) // */
@Consumes(MediaType.APPLICATION_JSON) // @Path(GEO_DE)
@Produces(MediaType.TEXT_PLAIN) // @Consumes(MediaType.APPLICATION_JSON)
public Response postGeoportalDE(@Context HttpServletRequest req, GeoportalRequest jsonRequest) throws WebApplicationException { // @Produces(MediaType.TEXT_PLAIN)
LOG.info(this.getClass().getSimpleName() + " POST starts..."); // public Response postGeoportalDE(@Context HttpServletRequest req, GeoportalRequest jsonRequest)
String targetAppId = GEO_DE; // throws WebApplicationException {
return genericPost(req, jsonRequest, targetAppId); // LOG.info(this.getClass().getSimpleName() + " POST starts...");
} // String targetAppId = GEO_DE;
// return genericPost(req, jsonRequest, targetAppId);
// }
/** /**
* Generic get. * Generic get.