task_24792 #7

Merged
francesco.mangiacrapa merged 35 commits from task_24792 into master 2023-03-28 12:30:20 +02:00
1 changed files with 3 additions and 3 deletions
Showing only changes of commit 31fe390044 - Show all commits

View File

@ -46,7 +46,7 @@ import com.google.common.cache.CacheLoader.InvalidCacheLoadException;
* *
* Mar 23, 2023 * Mar 23, 2023
*/ */
@Path("/") @Path("{targetAppId:geo(-(dv|de))?}")
public class GeoportalResolver { public class GeoportalResolver {
private static final String QP_RESOLVE_AS = "res"; private static final String QP_RESOLVE_AS = "res";
@ -62,7 +62,7 @@ public class GeoportalResolver {
} }
@GET @GET
@Path("{targetAppId:geo|geo-dv|geo-de}/{vre_name}/{usecase_id}/{project_id}") @Path("/{vre_name}/{usecase_id}/{project_id}")
public Response resolveGeoportal(@Context HttpServletRequest req, @PathParam(PATH_TARGET_APP) String targetAppId, 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_VRE_NAME) String vreName, @PathParam(PATH_USECASE_ID) String ucdID,
@PathParam(PATH_PROJECT_ID) String projectID, @QueryParam(QP_RESOLVE_AS) String resolveAs) @PathParam(PATH_PROJECT_ID) String projectID, @QueryParam(QP_RESOLVE_AS) String resolveAs)
@ -230,7 +230,7 @@ public class GeoportalResolver {
* @throws WebApplicationException the web application exception * @throws WebApplicationException the web application exception
*/ */
@POST @POST
@Path("{targetAppId:geo|geo-dv|geo-de}") @Path("")
@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, GeoportalRequest jsonRequest,