diff --git a/src/main/java/org/gcube/datatransfer/resolver/catalogue/resource/ApplicationProfileReaderForCatalogueResolver.java b/src/main/java/org/gcube/datatransfer/resolver/catalogue/resource/ApplicationProfileReaderForCatalogueResolver.java index fdc9be2..3c35ce5 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/catalogue/resource/ApplicationProfileReaderForCatalogueResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/catalogue/resource/ApplicationProfileReaderForCatalogueResolver.java @@ -19,7 +19,6 @@ import org.gcube.common.scope.api.ScopeProvider; import org.gcube.datatransfer.resolver.applicationprofile.ApplicationProfileNotFoundException; import org.gcube.datatransfer.resolver.applicationprofile.GcubeQuery; import org.gcube.datatransfer.resolver.applicationprofile.GcubeQuery.FIELD_TYPE; -import org.gcube.datatransfer.resolver.applicationprofile.ScopeUtil; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.Query; import org.gcube.resources.discovery.client.queries.impl.QueryBox; diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/error/ErrorReport.java b/src/main/java/org/gcube/datatransfer/resolver/services/error/ErrorReport.java index a088083..280a96b 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/error/ErrorReport.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/error/ErrorReport.java @@ -21,7 +21,7 @@ import lombok.experimental.Builder; @Getter @Setter @Builder -@XmlType (propOrder={"name","httpErrorCode","message","reportedBy"}) +@XmlType (propOrder={"name","httpErrorCode","message","thrownBy"}) public class ErrorReport implements Serializable{ /** @@ -31,6 +31,6 @@ public class ErrorReport implements Serializable{ private Integer httpErrorCode; private String name; private String message; - private String reportedBy; + private String thrownBy; } diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/BadParameterException.java b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/BadParameterException.java index 12e17b9..95ae6ae 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/BadParameterException.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/exceptions/BadParameterException.java @@ -38,9 +38,10 @@ public class BadParameterException extends WebApplicationException { * @param request the request * @param httpReturnStatus the http return status * @param message the message - * @param reportedBySource the reported by source + * @param thrownBySource the thrown by source + * @param help the help */ - public BadParameterException(HttpServletRequest request, Status httpReturnStatus, String message, Class reportedBySource, URI help) { + public BadParameterException(HttpServletRequest request, Status httpReturnStatus, String message, Class thrownBySource, URI help) { super(Response.status(httpReturnStatus).entity( ExceptionReport.builder(). @@ -53,7 +54,7 @@ public class BadParameterException extends WebApplicationException { httpErrorCode(Status.BAD_REQUEST.getStatusCode()). name(Status.BAD_REQUEST.name()) .message(message). - reportedBy(reportedBySource.getName()).build()) + thrownBy(thrownBySource.getName()).build()) .build()) .type(MediaType.APPLICATION_XML).build()); 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 c01bedf..3692c98 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 @@ -37,9 +37,10 @@ public class BadRequestException extends WebApplicationException { * @param request the request * @param httpReturnStatus the http return status * @param message the message - * @param reportedBySource the reported by source + * @param thrownBySource the thrown by source + * @param help the help */ - public BadRequestException(HttpServletRequest request, Status httpReturnStatus, String message, Class reportedBySource, URI help) { + public BadRequestException(HttpServletRequest request, Status httpReturnStatus, String message, Class thrownBySource, URI help) { super(Response.status(httpReturnStatus).entity( ExceptionReport.builder(). request(Util.getFullURL(request)). @@ -51,7 +52,7 @@ public class BadRequestException extends WebApplicationException { httpErrorCode(Status.BAD_REQUEST.getStatusCode()). name(Status.BAD_REQUEST.name()) .message(message). - reportedBy(reportedBySource.getName()).build()) + thrownBy(thrownBySource.getName()).build()) .build()) .type(MediaType.APPLICATION_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 cd883b4..18dbeed 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 @@ -37,9 +37,10 @@ public class InternalServerException extends InternalServerErrorException { * @param request the request * @param httpReturnStatus the http return status * @param message the message - * @param reportedBySource the reported by source + * @param thrownBySource the thrown by source + * @param help the help */ - public InternalServerException(HttpServletRequest request, Status httpReturnStatus, String message, Class reportedBySource, URI help) { + public InternalServerException(HttpServletRequest request, Status httpReturnStatus, String message, Class thrownBySource, URI help) { super(Response.status(httpReturnStatus).entity( ExceptionReport.builder(). request(Util.getFullURL(request)). @@ -51,7 +52,7 @@ public class InternalServerException extends InternalServerErrorException { httpErrorCode(Status.INTERNAL_SERVER_ERROR.getStatusCode()). name(Status.INTERNAL_SERVER_ERROR.name()) .message(message). - reportedBy(reportedBySource.getName()).build()) + thrownBy(thrownBySource.getName()).build()) .build()) .type(MediaType.APPLICATION_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 d2ea01c..a987c26 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 @@ -38,9 +38,10 @@ public class WrongParameterException extends WebApplicationException { * @param request the request * @param httpReturnStatus the http return status * @param message the message - * @param reportedBySource the reported by source + * @param thrownBySource the reported by source + * @param help the help */ - public WrongParameterException(HttpServletRequest request, Status httpReturnStatus, String message, Class reportedBySource, URI help) { + public WrongParameterException(HttpServletRequest request, Status httpReturnStatus, String message, Class thrownBySource, URI help) { super(Response.status(httpReturnStatus).entity( ExceptionReport.builder(). request(Util.getFullURL(request)). @@ -52,7 +53,7 @@ public class WrongParameterException extends WebApplicationException { httpErrorCode(Status.BAD_REQUEST.getStatusCode()). name(Status.BAD_REQUEST.name()) .message(message). - reportedBy(reportedBySource.getName()).build()) + thrownBy(thrownBySource.getName()).build()) .build()) .type(MediaType.APPLICATION_XML).build());