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

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
This commit is contained in:
Francesco Mangiacrapa 2018-10-23 13:02:50 +00:00
parent eab0b57fa5
commit b4e35b7e48
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/gcube/datatransfer/resolver/services/CatalogueResolver.java
View File

@ -88,6 +88,7 @@ public class CatalogueResolver {
@Consumes(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.TEXT_PLAIN) @Produces(MediaType.TEXT_PLAIN)
public Response postCatalogue(@Context HttpServletRequest req, CatalogueRequest jsonRequest) { public Response postCatalogue(@Context HttpServletRequest req, CatalogueRequest jsonRequest) {
logger.info(CatalogueResolver.class.getSimpleName()+" POST starts...");
//final CatalogueEntityRequest cer = new CatalogueEntityRequest(); //final CatalogueEntityRequest cer = new CatalogueEntityRequest();
//CHECK IF INPUT SCOPE IS VALID //CHECK IF INPUT SCOPE IS VALID

3
src/main/java/org/gcube/datatransfer/resolver/services/GeonetworkResolver.java
View File

@ -131,7 +131,7 @@ public class GeonetworkResolver {
@PathParam(PATH_PARAM_REQUEST_DELIMITER) String requestDelimiter, @PathParam(PATH_PARAM_REQUEST_DELIMITER) String requestDelimiter,
@QueryParam(QUERY_PARAM_RESET_CACHE_PARAM) String resetCache, @QueryParam(QUERY_PARAM_RESET_CACHE_PARAM) String resetCache,
@QueryParam(QUERY_PARAM_RESET_CACHED_SCOPE_PARAM) String resetScope) { @QueryParam(QUERY_PARAM_RESET_CACHED_SCOPE_PARAM) String resetScope) {
logger.info(this.getClass().getSimpleName()+" GET starts...");
//Checking mandatory parameters //Checking mandatory parameters
if(mode==null){ if(mode==null){
@ -270,6 +270,7 @@ public class GeonetworkResolver {
@PathParam(PATH_PARAM_REQUEST_DELIMITER) String requestDelimiter, @PathParam(PATH_PARAM_REQUEST_DELIMITER) String requestDelimiter,
@QueryParam(QUERY_PARAM_RESET_CACHE_PARAM) String resetCache, @QueryParam(QUERY_PARAM_RESET_CACHE_PARAM) String resetCache,
@QueryParam(QUERY_PARAM_RESET_CACHED_SCOPE_PARAM) String resetScope){ @QueryParam(QUERY_PARAM_RESET_CACHED_SCOPE_PARAM) String resetScope){
logger.info(this.getClass().getSimpleName()+" POST starts...");
//Checking mandatory parameters //Checking mandatory parameters
if(mode==null){ if(mode==null){

2
src/main/java/org/gcube/datatransfer/resolver/services/SMPIDResolver.java
View File

@ -44,7 +44,7 @@ public class SMPIDResolver {
@GET @GET
@Path("id") @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){ 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 //Checking mandatory parameter smpId
if(smpId==null || smpId.isEmpty()){ if(smpId==null || smpId.isEmpty()){

4
src/main/java/org/gcube/datatransfer/resolver/services/SMPResolver.java
View File

@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
public class SMPResolver { public class SMPResolver {
/** /**
* *
*/ */
private static final String help = "https://wiki.gcube-system.org/gcube/URI_Resolver#SMP_Resolver"; private static final String help = "https://wiki.gcube-system.org/gcube/URI_Resolver#SMP_Resolver";
@ -45,7 +45,7 @@ public class SMPResolver {
@GET @GET
@Path("smp") @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){ 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 //Checking mandatory parameter smpURI
if(smpURI==null || smpURI.isEmpty()){ if(smpURI==null || smpURI.isEmpty()){

2
src/main/java/org/gcube/datatransfer/resolver/services/StorageHubResolver.java
View File

@ -33,7 +33,7 @@ public class StorageHubResolver {
@GET @GET
@Path("") @Path("")
public Response download(@Context HttpServletRequest httpRequest) { public Response download(@Context HttpServletRequest httpRequest) {
logger.info(StorageHubResolver.class.getSimpleName() +" download called"); logger.info(this.getClass().getSimpleName()+" GET starts...");
StorageHubClient shc = new StorageHubClient(); StorageHubClient shc = new StorageHubClient();
//Checking mandatory parameter id //Checking mandatory parameter id

6
src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java
View File

@ -64,7 +64,7 @@ public class StorageIDResolver {
@Path("{storage-id:(?!index)[^/?$]*}") @Path("{storage-id:(?!index)[^/?$]*}")
//@Path("{storage-id}") //@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) { 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 //Checking mandatory parameter storageId
if(storageId==null || storageId.isEmpty()){ if(storageId==null || storageId.isEmpty()){
logger.error(STORAGE_ID+" not found"); logger.error(STORAGE_ID+" not found");
@ -161,9 +161,9 @@ public class StorageIDResolver {
* @throws IOException Signals that an I/O exception has occurred. * @throws IOException Signals that an I/O exception has occurred.
*/ */
@HEAD @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 { 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 //THIS IS FOR HPROXY CHECK
if(hproxycheck==null || hproxycheck){ if(hproxycheck==null || hproxycheck){