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

task_24792 #7

Merged
francesco.mangiacrapa merged 35 commits from task_24792 into master 2023-03-28 12:30:20 +02:00
Conversation 0 Commits 35 Files Changed 14 +7 -5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1107c69b47 - Show all commits

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

@ -132,7 +132,8 @@ public class CatalogueResolver {
if (!(e instanceof WebApplicationException)) { if (!(e instanceof WebApplicationException)) {
// UNEXPECTED EXCEPTION managing it as WebApplicationException // UNEXPECTED EXCEPTION managing it as WebApplicationException
String error = "Error occurred on resolving the Catalgoue URL. Please, contact the support!"; String error = "Error occurred on resolving the " + CatalogueResolver.class.getSimpleName()
+ " URL. Please, contact the support!";
if (e.getCause() != null) if (e.getCause() != null)
error += "\n\nCaused: " + e.getCause().getMessage(); error += "\n\nCaused: " + e.getCause().getMessage();
throw ExceptionManager.internalErrorException(req, error, this.getClass(), helpURI); throw ExceptionManager.internalErrorException(req, error, this.getClass(), helpURI);
@ -207,14 +208,15 @@ public class CatalogueResolver {
linkURL += "?" + jsonRequest.getQuery_string(); linkURL += "?" + jsonRequest.getQuery_string();
} }
logger.info("Returning "+CatalogueResolver.class.getSimpleName()+" URL: " + linkURL); logger.info("Returning " + CatalogueResolver.class.getSimpleName() + " URL: " + linkURL);
return Response.ok(linkURL).header("Location", linkURL).build(); return Response.ok(linkURL).header("Location", linkURL).build();
} catch (Exception e) { } catch (Exception e) {
if (!(e instanceof WebApplicationException)) { if (!(e instanceof WebApplicationException)) {
// UNEXPECTED EXCEPTION managing it as WebApplicationException // UNEXPECTED EXCEPTION managing it as WebApplicationException
String error = "Error occurred on resolving the Analytics URL. Please, contact the support!"; String error = "Error occurred on creating the " + CatalogueResolver.class.getSimpleName()
+ " URL. Please, contact the support!";
throw ExceptionManager.internalErrorException(req, error, this.getClass(), helpURI); throw ExceptionManager.internalErrorException(req, error, this.getClass(), helpURI);
} }
// ALREADY MANAGED AS WebApplicationExceptiongetItemCatalogueURLs // ALREADY MANAGED AS WebApplicationExceptiongetItemCatalogueURLs

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

@ -177,7 +177,7 @@ public class GeoportalResolver {
if (!(e instanceof WebApplicationException)) { if (!(e instanceof WebApplicationException)) {
// UNEXPECTED EXCEPTION managing it as WebApplicationException // UNEXPECTED EXCEPTION managing it as WebApplicationException
String error = "Error occurred on resolving the Catalgoue URL. Please, contact the support!"; String error = "Error occurred on resolving the "+GeoportalResolver.class.getSimpleName()+" URL. Please, contact the support!";
if (e.getCause() != null) if (e.getCause() != null)
error += "\n\nCaused: " + e.getCause().getMessage(); error += "\n\nCaused: " + e.getCause().getMessage();
throw ExceptionManager.internalErrorException(req, error, this.getClass(), helpURI); throw ExceptionManager.internalErrorException(req, error, this.getClass(), helpURI);
@ -281,7 +281,7 @@ public class GeoportalResolver {
if (!(e instanceof WebApplicationException)) { if (!(e instanceof WebApplicationException)) {
// UNEXPECTED EXCEPTION managing it as WebApplicationException // UNEXPECTED EXCEPTION managing it as WebApplicationException
String error = "Error occurred on resolving the Analytics URL. Please, contact the support!"; String error = "Error occurred on creating the "+GeoportalResolver.class.getSimpleName()+" URL. Please, contact the support!";
throw ExceptionManager.internalErrorException(req, error, this.getClass(), helpURI); throw ExceptionManager.internalErrorException(req, error, this.getClass(), helpURI);
} }
// ALREADY MANAGED AS WebApplicationExceptiongetItemCatalogueURLs // ALREADY MANAGED AS WebApplicationExceptiongetItemCatalogueURLs