From b4e35b7e489ec17eba6dfc599cd26deebf33cea4 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 23 Oct 2018 13:02:50 +0000 Subject: [PATCH] only added logs git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/uri-resolver@173790 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../datatransfer/resolver/services/CatalogueResolver.java | 1 + .../datatransfer/resolver/services/GeonetworkResolver.java | 3 ++- .../gcube/datatransfer/resolver/services/SMPIDResolver.java | 2 +- .../gcube/datatransfer/resolver/services/SMPResolver.java | 4 ++-- .../datatransfer/resolver/services/StorageHubResolver.java | 2 +- .../datatransfer/resolver/services/StorageIDResolver.java | 6 +++--- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/CatalogueResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/CatalogueResolver.java index f7595db..c79c966 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/CatalogueResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/CatalogueResolver.java @@ -88,6 +88,7 @@ public class CatalogueResolver { @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public Response postCatalogue(@Context HttpServletRequest req, CatalogueRequest jsonRequest) { + logger.info(CatalogueResolver.class.getSimpleName()+" POST starts..."); //final CatalogueEntityRequest cer = new CatalogueEntityRequest(); //CHECK IF INPUT SCOPE IS VALID diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java index 75305d0..b78cccd 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java @@ -131,7 +131,7 @@ public class GeonetworkResolver { @PathParam(PATH_PARAM_REQUEST_DELIMITER) String requestDelimiter, @QueryParam(QUERY_PARAM_RESET_CACHE_PARAM) String resetCache, @QueryParam(QUERY_PARAM_RESET_CACHED_SCOPE_PARAM) String resetScope) { - + logger.info(this.getClass().getSimpleName()+" GET starts..."); //Checking mandatory parameters if(mode==null){ @@ -270,6 +270,7 @@ public class GeonetworkResolver { @PathParam(PATH_PARAM_REQUEST_DELIMITER) String requestDelimiter, @QueryParam(QUERY_PARAM_RESET_CACHE_PARAM) String resetCache, @QueryParam(QUERY_PARAM_RESET_CACHED_SCOPE_PARAM) String resetScope){ + logger.info(this.getClass().getSimpleName()+" POST starts..."); //Checking mandatory parameters if(mode==null){ diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/SMPIDResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/SMPIDResolver.java index 0977495..9b4e51e 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/SMPIDResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/SMPIDResolver.java @@ -44,7 +44,7 @@ public class SMPIDResolver { @GET @Path("id") public Response getSMPID(@Context HttpServletRequest httpRequest, @QueryParam(SMP_ID) @Nullable String smpId, @QueryParam(ConstantsResolver.QUERY_PARAM_FILE_NAME) String fileName, @QueryParam(ConstantsResolver.QUERY_PARAM_CONTENT_TYPE) String contentType, @QueryParam(ConstantsResolver.QUERY_PARAM_VALIDATION) Boolean validation){ - logger.info("resolve smp-id called"); + logger.info(this.getClass().getSimpleName()+" GET starts..."); //Checking mandatory parameter smpId if(smpId==null || smpId.isEmpty()){ diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/SMPResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/SMPResolver.java index 13db014..786be71 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/SMPResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/SMPResolver.java @@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory; public class SMPResolver { /** - * + * */ private static final String help = "https://wiki.gcube-system.org/gcube/URI_Resolver#SMP_Resolver"; @@ -45,7 +45,7 @@ public class SMPResolver { @GET @Path("smp") public Response getSMPURI(@Context HttpServletRequest httpRequest, @QueryParam(SMP_URI) @Nullable String smpURI, @QueryParam(ConstantsResolver.QUERY_PARAM_FILE_NAME) String fileName, @QueryParam(ConstantsResolver.QUERY_PARAM_CONTENT_TYPE) String contentType, @QueryParam(ConstantsResolver.QUERY_PARAM_VALIDATION) Boolean validation){ - logger.info("resolve smp-uri called"); + logger.info(this.getClass().getSimpleName()+" GET starts..."); //Checking mandatory parameter smpURI if(smpURI==null || smpURI.isEmpty()){ diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/StorageHubResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/StorageHubResolver.java index adbc312..bc5d70c 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/StorageHubResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/StorageHubResolver.java @@ -33,7 +33,7 @@ public class StorageHubResolver { @GET @Path("") public Response download(@Context HttpServletRequest httpRequest) { - logger.info(StorageHubResolver.class.getSimpleName() +" download called"); + logger.info(this.getClass().getSimpleName()+" GET starts..."); StorageHubClient shc = new StorageHubClient(); //Checking mandatory parameter id diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java index 9550628..30b9f42 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java @@ -64,7 +64,7 @@ public class StorageIDResolver { @Path("{storage-id:(?!index)[^/?$]*}") //@Path("{storage-id}") public Response getStorageId(@Context HttpServletRequest httpRequest, @PathParam(STORAGE_ID) String storageId, @QueryParam(ConstantsResolver.QUERY_PARAM_FILE_NAME) String fileName, @QueryParam(ConstantsResolver.QUERY_PARAM_CONTENT_TYPE) String contentType, @QueryParam(ConstantsResolver.QUERY_PARAM_VALIDATION) Boolean validation) { - logger.info("resolve Storage-Id called"); + logger.info(this.getClass().getSimpleName()+" GET starts..."); //Checking mandatory parameter storageId if(storageId==null || storageId.isEmpty()){ logger.error(STORAGE_ID+" not found"); @@ -161,9 +161,9 @@ public class StorageIDResolver { * @throws IOException Signals that an I/O exception has occurred. */ @HEAD - @Path("{storage-id}") + @Path("{storage-id:(?!index)[^/?$]*}") public Response httpDoHead(@Context HttpServletRequest httpRequest, @PathParam(STORAGE_ID) String storageId, @QueryParam(ConstantsResolver.HPC) Boolean hproxycheck) throws ServletException, IOException { - logger.info("doHead working.."); + logger.info(this.getClass().getSimpleName()+" HEAD starts..."); //THIS IS FOR HPROXY CHECK if(hproxycheck==null || hproxycheck){