diff --git a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMCreateContextCode.java b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMCreateContextCode.java index 5b08686..6949663 100644 --- a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMCreateContextCode.java +++ b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMCreateContextCode.java @@ -1,6 +1,6 @@ package org.gcube.resourcemanagement.manager.io.rs; -import org.gcube.common.gxrest.response.error.ErrorCode; +import org.gcube.common.gxrest.response.outbound.ErrorCode; /** * Error codes returned by the create method of the context resource. diff --git a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMDeleteContextCode.java b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMDeleteContextCode.java index 59364e7..6c3b5e8 100644 --- a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMDeleteContextCode.java +++ b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMDeleteContextCode.java @@ -1,6 +1,6 @@ package org.gcube.resourcemanagement.manager.io.rs; -import org.gcube.common.gxrest.response.error.ErrorCode; +import org.gcube.common.gxrest.response.outbound.ErrorCode; /** * Error codes returned by the delete method of the context resource. diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/CreateRequest.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/CreateRequest.java index 15fb3c8..1111f14 100644 --- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/CreateRequest.java +++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/CreateRequest.java @@ -2,7 +2,7 @@ package org.gcube.resourcemanagement.manager.webapp.context; import java.util.Objects; -import org.gcube.common.gxrest.response.error.LocalCodeException; +import org.gcube.common.gxrest.response.outbound.LocalCodeException; import org.gcube.informationsystem.model.entity.Context; import org.gcube.informationsystem.model.relation.IsParentOf; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/DeleteRequest.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/DeleteRequest.java index 41a6e9e..2721f7f 100644 --- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/DeleteRequest.java +++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/DeleteRequest.java @@ -3,8 +3,8 @@ package org.gcube.resourcemanagement.manager.webapp.context; import java.util.Objects; import java.util.UUID; +import org.gcube.common.gxrest.response.outbound.LocalCodeException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; -import org.gcube.common.gxrest.response.error.LocalCodeException; import org.gcube.resourcemanagement.manager.io.rs.RMDeleteContextCode; /** diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/RequestToResourceRegistry.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/RequestToResourceRegistry.java index f343e97..983fd7d 100644 --- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/RequestToResourceRegistry.java +++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/RequestToResourceRegistry.java @@ -2,10 +2,10 @@ package org.gcube.resourcemanagement.manager.webapp.context; import java.util.Objects; +import org.gcube.common.gxrest.response.outbound.LocalCodeException; import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClient; import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClientFactory; import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClientImpl; -import org.gcube.common.gxrest.response.error.LocalCodeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/ResponseFromResourceRegistry.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/ResponseFromResourceRegistry.java index be25aeb..43ed06b 100644 --- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/ResponseFromResourceRegistry.java +++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/context/ResponseFromResourceRegistry.java @@ -2,7 +2,7 @@ package org.gcube.resourcemanagement.manager.webapp.context; import java.util.Optional; -import org.gcube.common.gxrest.response.error.ErrorCode; +import org.gcube.common.gxrest.response.outbound.ErrorCode; /** diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContext.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContext.java index 28d4771..8eef963 100644 --- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContext.java +++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContext.java @@ -9,13 +9,10 @@ import javax.ws.rs.QueryParam; import javax.ws.rs.core.Response; import org.gcube.common.authorization.library.provider.CalledMethodProvider; -import org.gcube.common.gxrest.response.error.GXErrorOutboundResponse; -import org.gcube.common.gxrest.response.success.GXOutboundSuccessResponse; +import org.gcube.common.gxrest.response.outbound.GXOutboundErrorResponse; +import org.gcube.common.gxrest.response.outbound.GXOutboundSuccessResponse; import org.gcube.informationsystem.model.entity.Context; import static org.gcube.resourcemanagement.manager.io.rs.RMContextPath.*; - -import java.util.UUID; - import org.gcube.resourcemanagement.manager.webapp.ResourceInitializer; import org.gcube.resourcemanagement.manager.webapp.context.CreateRequest; import org.gcube.resourcemanagement.manager.webapp.context.DeleteRequest; @@ -23,6 +20,8 @@ import org.gcube.resourcemanagement.manager.webapp.context.ResponseFromResourceR import org.gcube.resourcemanagement.manager.webapp.context.ContextHolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.UUID; + /** * Resource methods for {@link Context}. @@ -49,11 +48,11 @@ public class RMContext { ResponseFromResourceRegistry returned = CreateRequest.fromHolder(holder).forceURL(rrURL).submit(); if (!returned.wasSuccessful()) { if (returned.getException().isPresent()) - GXErrorOutboundResponse.throwException(returned.getException().get()); + GXOutboundErrorResponse.throwException(returned.getException().get()); else if (returned.getErrorCode().isPresent()) - GXErrorOutboundResponse.throwErrorCode(returned.getErrorCode().get()); + GXOutboundErrorResponse.throwErrorCode(returned.getErrorCode().get()); else - GXErrorOutboundResponse.throwException(new Exception("Failed to create the context.")); + GXOutboundErrorResponse.throwException(new Exception("Failed to create the context.")); } return GXOutboundSuccessResponse.newCREATEResponse(null).withMessage("Context successfully created.") .ofType(ResourceInitializer.APPLICATION_JSON_CHARSET_UTF_8).build(); @@ -74,11 +73,11 @@ public class RMContext { ResponseFromResourceRegistry returned = DeleteRequest.fromUUID(UUID.fromString(uuid)).forceURL(rrURL).submit(); if (!returned.wasSuccessful()) { if (returned.getException().isPresent()) - GXErrorOutboundResponse.throwException(returned.getException().get()); + GXOutboundErrorResponse.throwException(returned.getException().get()); else if (returned.getErrorCode().isPresent()) - GXErrorOutboundResponse.throwErrorCode(returned.getErrorCode().get()); + GXOutboundErrorResponse.throwErrorCode(returned.getErrorCode().get()); else - GXErrorOutboundResponse.throwException(new Exception("Failed to delete the context.")); + GXOutboundErrorResponse.throwException(new Exception("Failed to delete the context.")); } return GXOutboundSuccessResponse.newOKResponse().withMessage("Context successfully deleted.") .ofType(ResourceInitializer.APPLICATION_JSON_CHARSET_UTF_8).build(); diff --git a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java index 5021b8b..e04e1d1 100644 --- a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java +++ b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/RMContextTest.java @@ -18,9 +18,9 @@ import org.gcube.common.authorization.client.Constants; import org.gcube.common.authorization.client.exceptions.ObjectNotFound; import org.gcube.common.authorization.library.AuthorizationEntry; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.gxrest.response.error.ErrorCode; -import org.gcube.common.gxrest.response.error.deserialization.ErrorEntityManager; -import org.gcube.common.gxrest.response.error.deserialization.SerializableErrorEntity; +import org.gcube.common.gxrest.response.outbound.ErrorCode; +import org.gcube.common.gxrest.response.outbound.deserialization.ErrorEntityManager; +import org.gcube.common.gxrest.response.outbound.deserialization.SerializableErrorEntity; import org.gcube.common.scope.api.ScopeProvider; import org.gcube.informationsystem.impl.entity.ContextImpl; import org.gcube.informationsystem.impl.utils.ISMapper; @@ -175,7 +175,7 @@ public class RMContextTest extends JerseyTest { } } else if (response.hasErrorCode()) { ErrorCode code = response.getErrorCode(); - RMCreateContextCode realCode = org.gcube.common.gxrest.response.error.CodeFinder.findAndConvert(code, RMCreateContextCode.values()); + RMCreateContextCode realCode = org.gcube.common.gxrest.response.outbound.CodeFinder.findAndConvert(code, RMCreateContextCode.values()); assertEquals(RMCreateContextCode.CONTEXT_ALREADY_EXISTS, realCode); } else { assertTrue("Invalid error response returned.", true);