diff --git a/gxHTTP/pom.xml b/gxHTTP/pom.xml index 5881016..d70581d 100644 --- a/gxHTTP/pom.xml +++ b/gxHTTP/pom.xml @@ -31,7 +31,6 @@ org.slf4j slf4j-api - provided junit @@ -40,6 +39,5 @@ test - diff --git a/gxJRS/pom.xml b/gxJRS/pom.xml index 12caa01..182a57c 100644 --- a/gxJRS/pom.xml +++ b/gxJRS/pom.xml @@ -54,11 +54,6 @@ org.gcube.common gxHTTP - - org.gcube.common - authorization-client - - org.gcube.common gcube-jackson-databind @@ -67,15 +62,10 @@ org.gcube.common gcube-jackson-core - - - - - - - - - + + org.slf4j + slf4j-api + @@ -104,19 +94,4 @@ - - - - org.apache.maven.plugins - maven-assembly-plugin - - - make-servicearchive - package - - - - - - diff --git a/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXHTTPStringRequestTest.java b/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXHTTPStringRequestTest.java index cdef15a..079047e 100644 --- a/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXHTTPStringRequestTest.java +++ b/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXHTTPStringRequestTest.java @@ -10,9 +10,6 @@ import java.util.Properties; import java.util.WeakHashMap; import org.gcube.com.fasterxml.jackson.databind.JsonMappingException; -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.gxrest.response.inbound.GXInboundResponse; import org.junit.AfterClass; import org.junit.Before; @@ -61,7 +58,7 @@ public class GXHTTPStringRequestTest { setContext(DEFAULT_TEST_SCOPE); } - public static void setContext(String token) throws ObjectNotFound, Exception { + public static void setContext(String token) throws Exception { if (DEFAULT_TEST_SCOPE.isEmpty()) { skipTest = true; return; @@ -69,12 +66,6 @@ public class GXHTTPStringRequestTest { //SecurityTokenProvider.instance.set(token); } - public static String getCurrentScope(String token) throws ObjectNotFound, Exception { - AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token); - String context = authorizationEntry.getContext(); - return context; - } - @AfterClass public static void afterClass() throws Exception { //SecurityTokenProvider.instance.reset(); diff --git a/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXWebTargetAdapterHTTPSRequestTest.java b/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXWebTargetAdapterHTTPSRequestTest.java index 573986a..4c4ad32 100644 --- a/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXWebTargetAdapterHTTPSRequestTest.java +++ b/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXWebTargetAdapterHTTPSRequestTest.java @@ -12,9 +12,6 @@ import java.util.WeakHashMap; import javax.ws.rs.client.Entity; import javax.ws.rs.core.MediaType; -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.gxrest.response.inbound.GXInboundResponse; import org.junit.AfterClass; import org.junit.Before; @@ -65,7 +62,7 @@ public class GXWebTargetAdapterHTTPSRequestTest { setContext(DEFAULT_TEST_SCOPE); } - public static void setContext(String token) throws ObjectNotFound, Exception { + public static void setContext(String token) throws Exception { if (skipTest || DEFAULT_TEST_SCOPE.isEmpty()) { skipTest = true; return; @@ -74,12 +71,6 @@ public class GXWebTargetAdapterHTTPSRequestTest { } } - public static String getCurrentScope(String token) throws ObjectNotFound, Exception { - AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token); - String context = authorizationEntry.getContext(); - return context; - } - @AfterClass public static void afterClass() throws Exception { //SecurityTokenProvider.instance.reset(); diff --git a/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXWebTargetAdapterRequestTest.java b/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXWebTargetAdapterRequestTest.java index bdc8d18..e2b2e93 100644 --- a/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXWebTargetAdapterRequestTest.java +++ b/gxJRS/src/test/java/org/gcube/common/gxrest/request/GXWebTargetAdapterRequestTest.java @@ -12,7 +12,6 @@ import java.util.WeakHashMap; import javax.ws.rs.client.Entity; import javax.ws.rs.core.MediaType; -import org.gcube.common.authorization.client.exceptions.ObjectNotFound; import org.gcube.common.gxrest.response.inbound.GXInboundResponse; import org.junit.AfterClass; import org.junit.Before; @@ -60,7 +59,7 @@ public class GXWebTargetAdapterRequestTest { setContext(DEFAULT_TEST_SCOPE); } - public static void setContext(String token) throws ObjectNotFound, Exception { + public static void setContext(String token) throws Exception { if (skipTest || DEFAULT_TEST_SCOPE.isEmpty()) { skipTest = true; return; diff --git a/pom.xml b/pom.xml index 0f4228b..ae81d8e 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ org.gcube.distribution gcube-bom - 2.0.1 + 3.0.0-SNAPSHOT pom import