From b1e3dc5dbc40ece246f7d2c387f3ade94e875c93 Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Thu, 23 Mar 2023 16:52:08 +0100 Subject: [PATCH] Fixed Geoportal Get Request. --- .../gcube/datatransfer/resolver/services/GeoportalResolver.java | 2 +- .../resolver/services/exceptions/BadRequestException.java | 2 +- .../resolver/services/exceptions/ForbiddenRequestException.java | 2 +- .../resolver/services/exceptions/InternalServerException.java | 2 +- .../services/exceptions/NotAuthorizedRequestException.java | 2 +- .../resolver/services/exceptions/NotFoundException.java | 2 +- .../resolver/services/exceptions/WrongParameterException.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java index 8f7dae8..af051c7 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java @@ -265,7 +265,7 @@ public class GeoportalResolver { "Target application is null/malformed. It must be: " + targetApps, this.getClass(), helpURI); } - String linkURL = String.format("%s/%s/%s/%s%s", serverUrl, resoruceGeoportalCodes.getId(), vreName, + String linkURL = String.format("%s/%s/%s/%s/%s", serverUrl, resoruceGeoportalCodes.getId(), vreName, jsonRequest.getItemType(), jsonRequest.getItemID()); if (jsonRequest.getQueryString() != null) { diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/BadRequestException.java b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/BadRequestException.java index 22412e1..15c039c 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/BadRequestException.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/BadRequestException.java @@ -55,7 +55,7 @@ public class BadRequestException extends WebApplicationException { .message(message). thrownBy(thrownBySource.getName()).build()) .build()) - .type(MediaType.APPLICATION_XML).build()); + .type(MediaType.APPLICATION_XHTML_XML).build()); } } \ No newline at end of file diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/ForbiddenRequestException.java b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/ForbiddenRequestException.java index 0fd49f1..6c24ccb 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/ForbiddenRequestException.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/ForbiddenRequestException.java @@ -58,7 +58,7 @@ public class ForbiddenRequestException extends WebApplicationException { .message(message). thrownBy(thrownBySource.getName()).build()) .build()) - .type(MediaType.APPLICATION_XML).build()); + .type(MediaType.APPLICATION_XHTML_XML).build()); } diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/InternalServerException.java b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/InternalServerException.java index d50c73a..cb2e1be 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/InternalServerException.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/InternalServerException.java @@ -53,7 +53,7 @@ public class InternalServerException extends WebApplicationException { .message(message). thrownBy(thrownBySource.getName()).build()) .build()) - .type(MediaType.APPLICATION_XML).build()); + .type(MediaType.APPLICATION_XHTML_XML).build()); } } \ No newline at end of file diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/NotAuthorizedRequestException.java b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/NotAuthorizedRequestException.java index 76e2772..a65df92 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/NotAuthorizedRequestException.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/NotAuthorizedRequestException.java @@ -56,7 +56,7 @@ public class NotAuthorizedRequestException extends WebApplicationException { .message(message). thrownBy(thrownBySource.getName()).build()) .build()) - .type(MediaType.APPLICATION_XML).build()); + .type(MediaType.APPLICATION_XHTML_XML).build()); } diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/NotFoundException.java b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/NotFoundException.java index 489ca8b..b0c12b4 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/NotFoundException.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/NotFoundException.java @@ -56,7 +56,7 @@ public class NotFoundException extends WebApplicationException { .message(message). thrownBy(thrownBySource.getName()).build()) .build()) - .type(MediaType.APPLICATION_XML).build()); + .type(MediaType.APPLICATION_XHTML_XML).build()); } diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/WrongParameterException.java b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/WrongParameterException.java index cf456c3..28088c9 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/WrongParameterException.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/WrongParameterException.java @@ -55,7 +55,7 @@ public class WrongParameterException extends WebApplicationException { .message(message). thrownBy(thrownBySource.getName()).build()) .build()) - .type(MediaType.APPLICATION_XML).build()); + .type(MediaType.APPLICATION_XHTML_XML).build()); } } \ No newline at end of file