mauro.mugnaini
/
gx-rest
forked from gCubeSystem/gx-rest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaning code from dependencies which must be removed

This commit is contained in:
Luca Frosini 2022-07-15 16:00:24 +02:00
parent 2be6f3b7fd
commit 1da0e27c42
6 changed files with 8 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gxHTTP/pom.xml
View File

@ -31,7 +31,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
@ -40,6 +39,5 @@
<scope>test</scope>
</dependency>
</dependencies>
</project>

33
gxJRS/pom.xml
View File

@ -54,11 +54,6 @@
<groupId>org.gcube.common</groupId>
<artifactId>gxHTTP</artifactId>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>authorization-client</artifactId>
</dependency>
<dependency>
<groupId>org.gcube.common</groupId>
<artifactId>gcube-jackson-databind</artifactId>
@ -67,15 +62,10 @@
<groupId>org.gcube.common</groupId>
<artifactId>gcube-jackson-core</artifactId>
</dependency>
<!-- <dependency> -->
<!-- <groupId>com.fasterxml.jackson.core</groupId> -->
<!-- <artifactId>jackson-core</artifactId> -->
<!-- </dependency> -->
<!-- <dependency> -->
<!-- <groupId>com.fasterxml.jackson.core</groupId> -->
<!-- <artifactId>jackson-databind</artifactId> -->
<!-- </dependency> -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- Test Dependency -->
@ -104,19 +94,4 @@
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>make-servicearchive</id>
<phase>package</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

11
gxJRS/src/test/java/org/gcube/common/gxrest/request/GXHTTPStringRequestTest.java
View File

@ -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();

11
gxJRS/src/test/java/org/gcube/common/gxrest/request/GXWebTargetAdapterHTTPSRequestTest.java
View File

@ -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();

3
gxJRS/src/test/java/org/gcube/common/gxrest/request/GXWebTargetAdapterRequestTest.java
View File

@ -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;

2
pom.xml
View File

@ -47,7 +47,7 @@
<dependency>
<groupId>org.gcube.distribution</groupId>
<artifactId>gcube-bom</artifactId>
<version>2.0.1</version>
<version>3.0.0-SNAPSHOT</version>
<type>pom</type>
<scope>import</scope>
</dependency>