diff --git a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMContextPath.java b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMContextsAccess.java similarity index 96% rename from io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMContextPath.java rename to io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMContextsAccess.java index 9113969..f36cb39 100644 --- a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMContextPath.java +++ b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/RMContextsAccess.java @@ -6,7 +6,7 @@ package org.gcube.resourcemanagement.manager.io.rs; * @author Manuele Simi (ISTI - CNR) * */ -public class RMContextPath { +public class RMContextsAccess { public static final String APPLICATION_PATH = "/resource-manager"; diff --git a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/ResourcesInContextPath.java b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/ResourcesInContextAccess.java similarity index 90% rename from io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/ResourcesInContextPath.java rename to io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/ResourcesInContextAccess.java index 33cdfbb..7749c61 100644 --- a/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/ResourcesInContextPath.java +++ b/io/src/main/java/org/gcube/resourcemanagement/manager/io/rs/ResourcesInContextAccess.java @@ -6,7 +6,7 @@ package org.gcube.resourcemanagement.manager.io.rs; * @author Manuele Simi (ISTI - CNR) * */ -public class ResourcesInContextPath { +public class ResourcesInContextAccess { public static final String ROOT = "resource"; public static final String CONTEXT_UUID_PARAM = "ContextUUID"; public static final String RESOURCE_UUID_PARAM = "ResourceUUID"; diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/ResourceInitializer.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/ResourceInitializer.java index 86ca515..4ab2729 100644 --- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/ResourceInitializer.java +++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/ResourceInitializer.java @@ -3,22 +3,22 @@ package org.gcube.resourcemanagement.manager.webapp; import javax.ws.rs.ApplicationPath; import javax.ws.rs.core.MediaType; -import org.gcube.resourcemanagement.manager.io.rs.RMContextPath; -import org.gcube.resourcemanagement.manager.webapp.rs.RMContext; +import org.gcube.resourcemanagement.manager.io.rs.RMContextsAccess; +import org.gcube.resourcemanagement.manager.webapp.rs.RMContexts; import org.gcube.resourcemanagement.manager.webapp.rs.RMTestForGXRest; import org.glassfish.jersey.server.ResourceConfig; /** * @author Manuele Simi (ISTI - CNR) */ -@ApplicationPath(RMContextPath.APPLICATION_PATH) +@ApplicationPath(RMContextsAccess.APPLICATION_PATH) public class ResourceInitializer extends ResourceConfig { public static final String APPLICATION_JSON_CHARSET_UTF_8 = MediaType.APPLICATION_JSON + ";charset=UTF-8"; public ResourceInitializer(){ //where jersey will find the operation's handler - packages(RMContext.class.getPackage().toString(),RMTestForGXRest.class.getPackage().toString()); + packages(RMContexts.class.getPackage().toString(),RMTestForGXRest.class.getPackage().toString()); } } \ No newline at end of file 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/RMContexts.java similarity index 98% rename from webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContext.java rename to webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMContexts.java index 8a7882d..ca46f28 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/RMContexts.java @@ -13,7 +13,7 @@ import org.gcube.common.authorization.library.provider.CalledMethodProvider; 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 static org.gcube.resourcemanagement.manager.io.rs.RMContextsAccess.*; import org.gcube.resourcemanagement.manager.webapp.ResourceInitializer; import org.gcube.resourcemanagement.manager.webapp.context.CreateRequest; import org.gcube.resourcemanagement.manager.webapp.context.DeleteRequest; @@ -31,9 +31,9 @@ import java.util.UUID; * */ @Path(CONTEXT_ROOT) -public class RMContext { +public class RMContexts { - private static Logger logger = LoggerFactory.getLogger(RMContext.class); + private static Logger logger = LoggerFactory.getLogger(RMContexts.class); /* * e.g. POST diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMTestForGXRest.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMTestForGXRest.java index ad9f8b1..9837d90 100644 --- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMTestForGXRest.java +++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/RMTestForGXRest.java @@ -1,6 +1,6 @@ package org.gcube.resourcemanagement.manager.webapp.rs; -import static org.gcube.resourcemanagement.manager.io.rs.RMContextPath.*; +import static org.gcube.resourcemanagement.manager.io.rs.RMContextsAccess.*; import java.io.IOException; import java.net.URI; diff --git a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/ResourcesInContext.java b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/ResourcesInContext.java index 203db39..23bfe33 100644 --- a/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/ResourcesInContext.java +++ b/webapp/src/main/java/org/gcube/resourcemanagement/manager/webapp/rs/ResourcesInContext.java @@ -7,8 +7,8 @@ import javax.ws.rs.core.Response; import org.gcube.common.gxrest.response.outbound.GXOutboundSuccessResponse; -import static org.gcube.resourcemanagement.manager.io.rs.RMContextPath.CONTEXT_UUID_PARAM; -import static org.gcube.resourcemanagement.manager.io.rs.ResourcesInContextPath.*; +import static org.gcube.resourcemanagement.manager.io.rs.RMContextsAccess.CONTEXT_UUID_PARAM; +import static org.gcube.resourcemanagement.manager.io.rs.ResourcesInContextAccess.*; /** diff --git a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java index 8bf5e5b..c289e54 100644 --- a/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java +++ b/webapp/src/test/java/org/gcube/resourcemanagement/manager/webapp/context/GXRestTest.java @@ -29,8 +29,8 @@ import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryCont import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClientImpl; import org.gcube.resourcemanagement.manager.io.rs.RMCreateContextCode; import org.gcube.resourcemanagement.manager.io.rs.RMContextDoesNotExistException; -import org.gcube.resourcemanagement.manager.io.rs.RMContextPath; -import org.gcube.resourcemanagement.manager.webapp.rs.RMContext; +import org.gcube.resourcemanagement.manager.io.rs.RMContextsAccess; +import org.gcube.resourcemanagement.manager.webapp.rs.RMContexts; import org.gcube.resourcemanagement.manager.webapp.rs.RMTestForGXRest; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.JerseyTest; @@ -123,7 +123,7 @@ public class GXRestTest extends JerseyTest { /** * Test method for - * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#delete(String, String)} + * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContexts#delete(String, String)} * * @throws Exception */ @@ -132,7 +132,7 @@ public class GXRestTest extends JerseyTest { if (skipTest) return; - Response delete = target(RMContextPath.GXREST_ROOT).path(context2UUID.toString()).request().delete(); + Response delete = target(RMContextsAccess.GXREST_ROOT).path(context2UUID.toString()).request().delete(); assertNotNull(delete); GXInboundResponse response = new GXInboundResponse(delete); if (response.hasOKCode()) { 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 e1acefa..8379ef3 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 @@ -27,8 +27,8 @@ import org.gcube.informationsystem.model.entity.Context; import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClient; import org.gcube.informationsystem.resourceregistry.context.ResourceRegistryContextClientImpl; 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.gcube.resourcemanagement.manager.io.rs.RMContextsAccess; +import org.gcube.resourcemanagement.manager.webapp.rs.RMContexts; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.JerseyTest; import org.junit.AfterClass; @@ -115,7 +115,7 @@ public class RMContextTest extends JerseyTest { @Override protected Application configure() { - return new ResourceConfig(RMContext.class); + return new ResourceConfig(RMContexts.class); } /** @@ -139,7 +139,7 @@ public class RMContextTest extends JerseyTest { /** * Test method for - * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#create(String)}. + * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContexts#create(String)}. * * @throws Exception */ @@ -150,7 +150,7 @@ public class RMContextTest extends JerseyTest { Context newContext = new ContextImpl(context1, context1UUID); try { System.out.print(ISMapper.marshal(newContext)); - Response create = target("context").queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request() + Response create = target("context").queryParam(RMContextsAccess.FORCE_RRURL_PARAM, RR).request() .post(Entity.entity(ISMapper.marshal(newContext), MediaType.APPLICATION_JSON + ";charset=UTF-8")); assertNotNull(create); GXInboundResponse response = new GXInboundResponse(create); @@ -184,7 +184,7 @@ public class RMContextTest extends JerseyTest { /** * Test method for - * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#create(java.lang.String)} + * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContexts#create(java.lang.String)} * when the parent does not exist. */ @Test @@ -194,7 +194,7 @@ public class RMContextTest extends JerseyTest { Context newContext = new ContextImpl(context2, context2UUID); newContext.setParent(new ContextImpl("DoNotExist")); try { - Response create = target(RMContextPath.CONTEXT_ROOT).queryParam(RMContextPath.FORCE_RRURL_PARAM, RR) + Response create = target(RMContextsAccess.CONTEXT_ROOT).queryParam(RMContextsAccess.FORCE_RRURL_PARAM, RR) .request() .post(Entity.entity(ISMapper.marshal(newContext), MediaType.APPLICATION_JSON + ";charset=UTF-8")); GXInboundResponse response = new GXInboundResponse(create); @@ -213,7 +213,7 @@ public class RMContextTest extends JerseyTest { /** * Test method for - * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#create(java.lang.String)} + * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContexts#create(java.lang.String)} * when the parent does not exist. */ @Test @@ -225,7 +225,7 @@ public class RMContextTest extends JerseyTest { Queries queries = new Queries(); newContext.setParent(context1UUID); try { - Response create = target(RMContextPath.CONTEXT_ROOT).queryParam(RMContextPath.FORCE_RRURL_PARAM, RR) + Response create = target(RMContextsAccess.CONTEXT_ROOT).queryParam(RMContextsAccess.FORCE_RRURL_PARAM, RR) .request() .post(Entity.entity(ISMapper.marshal(newContext), MediaType.APPLICATION_JSON + ";charset=UTF-8")); assertNotNull(create); @@ -243,7 +243,7 @@ public class RMContextTest extends JerseyTest { /** * Test method for - * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#delete(String, String)} + * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContexts#delete(String, String)} * * @throws Exception */ @@ -252,8 +252,8 @@ public class RMContextTest extends JerseyTest { if (skipTest) return; - Response delete = target(RMContextPath.CONTEXT_ROOT).path(context2UUID.toString()) - .queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request().delete(); + Response delete = target(RMContextsAccess.CONTEXT_ROOT).path(context2UUID.toString()) + .queryParam(RMContextsAccess.FORCE_RRURL_PARAM, RR).request().delete(); assertNotNull(delete); GXInboundResponse response = new GXInboundResponse(delete); if (response.hasOKCode()) { @@ -275,15 +275,15 @@ public class RMContextTest extends JerseyTest { /** * Test method for - * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContext#delete(String, String)} + * {@link org.gcube.resourcemanagement.manager.webapp.rs.RMContexts#delete(String, String)} */ @Test public void step5_DeleteParent() { if (skipTest) return; try { - Response delete = target(RMContextPath.CONTEXT_ROOT).path(context1UUID.toString()) - .queryParam(RMContextPath.FORCE_RRURL_PARAM, RR).request().delete(); + Response delete = target(RMContextsAccess.CONTEXT_ROOT).path(context1UUID.toString()) + .queryParam(RMContextsAccess.FORCE_RRURL_PARAM, RR).request().delete(); assertNotNull(delete); GXInboundResponse response = new GXInboundResponse(delete); int status = response.getHTTPCode();