diff --git a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMCode.java b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMCreateContextCode.java similarity index 90% rename from io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMCode.java rename to io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMCreateContextCode.java index bb2efe2..d83213e 100644 --- a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMCode.java +++ b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMCreateContextCode.java @@ -8,7 +8,7 @@ import org.gcube.resourcemanagement.manager.io.codeexceptions.ErrorCode; * @author Manuele Simi (ISTI CNR) * */ -public enum RMCode implements ErrorCode { +public enum RMCreateContextCode implements ErrorCode { INVALID_METHOD_REQUEST(0, "The request is invalid."), MISSING_PARAMETER(1,"Required query parameter is missing."), @@ -21,7 +21,7 @@ public enum RMCode implements ErrorCode { private int id; private String msg; - private RMCode(int id, String msg) { + private RMCreateContextCode(int id, String msg) { this.id = id; this.msg = msg; } diff --git a/io/src/test/java/org/gcube/resourcemanagement/manager/io/codeexceptions/LocalCodeExceptionTest.java b/io/src/test/java/org/gcube/resourcemanagement/manager/io/codeexceptions/LocalCodeExceptionTest.java index 4eec33d..ea7917c 100644 --- a/io/src/test/java/org/gcube/resourcemanagement/manager/io/codeexceptions/LocalCodeExceptionTest.java +++ b/io/src/test/java/org/gcube/resourcemanagement/manager/io/codeexceptions/LocalCodeExceptionTest.java @@ -6,7 +6,7 @@ package org.gcube.resourcemanagement.manager.io.codeexceptions; import static org.junit.Assert.*; import org.gcube.resourcemanagement.manager.io.codeexceptions.LocalCodeException; -import org.gcube.resourcemanagement.manager.io.rs.RMCode; +import org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode; import org.junit.Test; /** @@ -22,8 +22,8 @@ public class LocalCodeExceptionTest { */ @Test public void testCodeException() { - LocalCodeException exception = new LocalCodeException(RMCode.GENERIC_ERROR_FROM_RR); - assertTrue("Unexpected id", exception.getId() == RMCode.GENERIC_ERROR_FROM_RR.getId()); + LocalCodeException exception = new LocalCodeException(RMCreateContextCode.GENERIC_ERROR_FROM_RR); + assertTrue("Unexpected id", exception.getId() == RMCreateContextCode.GENERIC_ERROR_FROM_RR.getId()); } } diff --git a/io/src/test/java/org/gcube/resourcemanagement/manager/io/codeexceptions/WebCodeExceptionTest.java b/io/src/test/java/org/gcube/resourcemanagement/manager/io/codeexceptions/WebCodeExceptionTest.java index fe225d8..69ace35 100644 --- a/io/src/test/java/org/gcube/resourcemanagement/manager/io/codeexceptions/WebCodeExceptionTest.java +++ b/io/src/test/java/org/gcube/resourcemanagement/manager/io/codeexceptions/WebCodeExceptionTest.java @@ -5,7 +5,7 @@ import static org.junit.Assert.*; import java.util.Objects; import org.gcube.resourcemanagement.manager.io.codeexceptions.WebCodeException; -import org.gcube.resourcemanagement.manager.io.rs.RMCode; +import org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.BlockJUnit4ClassRunner; @@ -21,11 +21,11 @@ public class WebCodeExceptionTest { /** * Test method for - * {@link org.gcube.resourcemanagement.manager.io.codeexceptions.WebCodeException#CodeException(org.gcube.resourcemanagement.manager.io.rs.RMCode)}. + * {@link org.gcube.resourcemanagement.manager.io.codeexceptions.WebCodeException#CodeException(org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode)}. */ @Test public void testWebCodeException() { - WebCodeException exception = new WebCodeException(RMCode.CONTEXT_ALREADY_EXISTS); + WebCodeException exception = new WebCodeException(RMCreateContextCode.CONTEXT_ALREADY_EXISTS); // unfortunately, we cannot test the response readEntity method on an // outbound response assertTrue("Unexpected code", Objects.nonNull(exception.getResponse())); 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 3dce1e3..8e0573b 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 @@ -6,7 +6,7 @@ import org.gcube.informationsystem.model.entity.Context; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.context.ContextAlreadyPresentException; import org.gcube.resourcemanagement.manager.io.codeexceptions.WebCodeException; -import org.gcube.resourcemanagement.manager.io.rs.RMCode; +import org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode; /** * Create request for a new context. @@ -52,9 +52,9 @@ public final class CreateRequest extends RequestToResourceRegistry { return ResponseFromResourceRegistry.newFailureResponse("Invalid response from the RR (null?)"); } } catch (ContextAlreadyPresentException cape) { - return ResponseFromResourceRegistry.fromException(new WebCodeException(RMCode.CONTEXT_ALREADY_EXISTS)); + return ResponseFromResourceRegistry.fromException(new WebCodeException(RMCreateContextCode.CONTEXT_ALREADY_EXISTS)); } catch (ResourceRegistryException e) { - return ResponseFromResourceRegistry.fromException(new WebCodeException(RMCode.GENERIC_ERROR_FROM_RR)); + return ResponseFromResourceRegistry.fromException(new WebCodeException(RMCreateContextCode.GENERIC_ERROR_FROM_RR)); } return ResponseFromResourceRegistry.newSuccessResponseWithMessage("Context successfully created."); } 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 66e6ead..958721b 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 @@ -6,7 +6,7 @@ import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryCont import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClientFactory; import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClientImpl; import org.gcube.resourcemanagement.manager.io.codeexceptions.WebCodeException; -import org.gcube.resourcemanagement.manager.io.rs.RMCode; +import org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode; /** * Base request to an operation exposed by the Resource Registry. @@ -40,7 +40,7 @@ public abstract class RequestToResourceRegistry { this.validate(); } catch (Exception e) { ResponseFromResourceRegistry response = ResponseFromResourceRegistry. - fromException(new WebCodeException(RMCode.INVALID_REQUEST_FOR_RR)); + fromException(new WebCodeException(RMCreateContextCode.INVALID_REQUEST_FOR_RR)); return response; } if (Objects.isNull(this.resourceRegistryContextClient)) 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 34efaf6..d239272 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 @@ -21,7 +21,7 @@ import org.gcube.informationsystem.impl.utils.ISMapper; import org.gcube.informationsystem.model.entity.Context; import org.gcube.resourcemanagement.manager.io.codeexceptions.CodeFinder; import org.gcube.resourcemanagement.manager.io.codeexceptions.SerializableErrorCode; -import org.gcube.resourcemanagement.manager.io.rs.RMCode; +import org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode; import org.gcube.resourcemanagement.manager.io.rs.RMContextPath; import org.gcube.resourcemanagement.manager.webapp.rs.RMContext; import org.glassfish.jersey.server.ResourceConfig; @@ -124,8 +124,8 @@ public class RMContextTest extends JerseyTest { assertEquals("Unexpected returned code. Reason: " + create.getStatusInfo().getReasonPhrase(), Status.NOT_ACCEPTABLE.getStatusCode(), create.getStatus()); SerializableErrorCode code = create.readEntity(SerializableErrorCode.class); - RMCode realCode = CodeFinder.findAndConvert(code, RMCode.values()); - assertEquals(RMCode.CONTEXT_ALREADY_EXISTS, realCode); + RMCreateContextCode realCode = CodeFinder.findAndConvert(code, RMCreateContextCode.values()); + assertEquals(RMCreateContextCode.CONTEXT_ALREADY_EXISTS, realCode); } } catch (JsonProcessingException e) {