diff --git a/pom.xml b/pom.xml
index 2cb36e9..1f8283b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,16 @@
org.slf4j
slf4j-api
+
+ org.gcube.data-catalogue
+ gcat-api
+ [2.0.0, 3.0.0-SNAPSHOT)
+
+
+ org.gcube.common
+ authorization-utils
+ [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
+
org.gcube.information-system
information-system-model
diff --git a/src/main/java/org/gcube/gcat/moderation/thread/FakeModerationThread.java b/src/main/java/org/gcube/gcat/moderation/thread/FakeModerationThread.java
index 04a7eee..8449b8d 100644
--- a/src/main/java/org/gcube/gcat/moderation/thread/FakeModerationThread.java
+++ b/src/main/java/org/gcube/gcat/moderation/thread/FakeModerationThread.java
@@ -1,7 +1,7 @@
package org.gcube.gcat.moderation.thread;
+import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.gcat.api.CMItemStatus;
-import org.gcube.gcat.utils.ContextUtility;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -21,7 +21,8 @@ public class FakeModerationThread extends ModerationThread {
@Override
public void postUserMessage(CMItemStatus cmItemStatus, String userMessage) throws Exception {
logger.info("{} is sending a message to the {} for item '{}' (id={}). ItemStatus={}, Message=\"{}\"",
- ContextUtility.getUsername(), ModerationThread.class.getSimpleName(), itemName, itemID, cmItemStatus, userMessage);
+ SecretManager.instance.get().getUsername(),
+ ModerationThread.class.getSimpleName(), itemName, itemID, cmItemStatus, userMessage);
}
@Override
diff --git a/src/main/java/org/gcube/gcat/moderation/thread/zulip/ZulipStream.java b/src/main/java/org/gcube/gcat/moderation/thread/zulip/ZulipStream.java
index 0cc6278..9c0fd8c 100644
--- a/src/main/java/org/gcube/gcat/moderation/thread/zulip/ZulipStream.java
+++ b/src/main/java/org/gcube/gcat/moderation/thread/zulip/ZulipStream.java
@@ -7,13 +7,13 @@ import javax.ws.rs.InternalServerErrorException;
import org.gcube.com.fasterxml.jackson.databind.JsonNode;
import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
+import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.gcat.api.CMItemStatus;
import org.gcube.gcat.api.GCatConstants;
import org.gcube.gcat.moderation.thread.ModerationThread;
import org.gcube.gcat.moderation.thread.zulip.ZulipResponse.Result;
import org.gcube.gcat.social.SocialUsers;
import org.gcube.gcat.utils.Constants;
-import org.gcube.gcat.utils.ContextUtility;
import org.gcube.storagehub.ApplicationMode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,7 +47,7 @@ public class ZulipStream extends ModerationThread {
}
protected ZulipRestExecutor getZulipRestExecutor() {
- ZulipAuth zulipAuth = new ZulipAuth(ContextUtility.getUsername());
+ ZulipAuth zulipAuth = new ZulipAuth(SecretManager.instance.get().getUsername());
return new ZulipRestExecutor(zulipAuth.getEmail(), zulipAuth.getAPIKey(), zulipAuth.getSite());
}
diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANInstance.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANInstance.java
index afb047e..018096b 100644
--- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANInstance.java
+++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANInstance.java
@@ -13,13 +13,13 @@ import java.util.Set;
import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.WebApplicationException;
+import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.encryption.encrypter.StringEncrypter;
import org.gcube.common.resources.gcore.GenericResource;
import org.gcube.common.resources.gcore.ServiceEndpoint;
import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;
import org.gcube.common.resources.gcore.ServiceEndpoint.Property;
import org.gcube.common.scope.impl.ScopeBean;
-import org.gcube.gcat.utils.ContextUtility;
import org.gcube.resources.discovery.client.api.DiscoveryClient;
import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
import org.gcube.resources.discovery.icclient.ICFactory;
@@ -69,18 +69,19 @@ public class CKANInstance {
}
public static CKANInstance getInstance() {
- CKANInstance ckanInstance = ckanInstancePerScope.get(ContextUtility.getCurrentContext());
+ String context = SecretManager.instance.get().getContext();
+ CKANInstance ckanInstance = ckanInstancePerScope.get(context);
if(ckanInstance == null) {
ckanInstance = new CKANInstance();
ckanInstance.getConfigurationFromIS();
- ckanInstancePerScope.put(ContextUtility.getCurrentContext(), ckanInstance);
+ ckanInstancePerScope.put(context, ckanInstance);
}
return ckanInstance;
}
private CKANInstance() {
- currentContext = ContextUtility.getCurrentContext();
+ currentContext = SecretManager.instance.get().getContext();
currentScopeBean = new ScopeBean(currentContext);
currentOrganizationName = CKANPackage.getOrganizationName(currentScopeBean);
supportedOrganizations = getSupportedOrganizationsFromIS();
diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANOrganization.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANOrganization.java
index d206d39..30063a6 100644
--- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANOrganization.java
+++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANOrganization.java
@@ -2,8 +2,8 @@ package org.gcube.gcat.persistence.ckan;
import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
+import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.scope.impl.ScopeBean;
-import org.gcube.gcat.utils.ContextUtility;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +68,7 @@ public class CKANOrganization extends CKAN {
}
public static String getCKANOrganizationName() {
- String context = ContextUtility.getCurrentContext();
+ String context = SecretManager.instance.get().getContext();
return getCKANOrganizationName(context);
}
diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANResource.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANResource.java
index 1fe8b2c..380b254 100644
--- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANResource.java
+++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANResource.java
@@ -18,17 +18,16 @@ import javax.ws.rs.WebApplicationException;
import org.apache.commons.io.FilenameUtils;
import org.apache.tika.mime.MimeType;
import org.apache.tika.mime.MimeTypes;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
+import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
import org.gcube.gcat.utils.Constants;
-import org.gcube.gcat.utils.ContextUtility;
import org.gcube.gcat.utils.HTTPCall;
import org.gcube.gcat.workspace.CatalogueStorageHubManagement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.gcube.com.fasterxml.jackson.databind.JsonNode;
-import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
@@ -70,7 +69,7 @@ public class CKANResource extends CKAN {
public static final String URI_RESOLVER_STORAGE_HUB_PATH = "/shub/";
static {
- String context = ContextUtility.getCurrentContext();
+ String context = SecretManager.instance.get().getContext();
if(context.startsWith("/gcube")) {
URI_RESOLVER_STORAGE_HUB_HOST = URI_RESOLVER_STORAGE_HUB_HOST_DEV;
} else if(context.startsWith("/pred4s")){
diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java
index ed5edda..0a113a0 100644
--- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java
+++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java
@@ -6,15 +6,14 @@ import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response.Status;
+import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
+import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.gcat.api.Role;
import org.gcube.gcat.social.PortalUser;
-import org.gcube.gcat.utils.ContextUtility;
import org.gcube.gcat.utils.RandomString;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
@@ -193,7 +192,8 @@ public class CKANUser extends CKAN {
}
public static String getCKANUsername() {
- return getCKANUsername(ContextUtility.getUsername());
+ String username = SecretManager.instance.get().getUsername();
+ return getCKANUsername(username);
}
public String read() {
diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUserCache.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUserCache.java
index b85cc2a..c813b17 100644
--- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUserCache.java
+++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUserCache.java
@@ -12,7 +12,7 @@ import javax.cache.expiry.CreatedExpiryPolicy;
import javax.cache.expiry.Duration;
import javax.cache.spi.CachingProvider;
-import org.gcube.gcat.utils.ContextUtility;
+import org.gcube.common.authorization.utils.manager.SecretManager;
public abstract class CKANUserCache {
@@ -37,14 +37,14 @@ public abstract class CKANUserCache {
}
public static CKANUser getCurrrentCKANUser() {
- String context = ContextUtility.getCurrentContext();
+ String context = SecretManager.instance.get().getContext();
Cache userCache = userCachePerContext.get(context);
if(userCache == null) {
userCache = cacheManager.createCache(context, userCacheConfiguration);
userCachePerContext.put(context, userCache);
}
- String gcubeUsername = ContextUtility.getUsername();
+ String gcubeUsername = SecretManager.instance.get().getUsername();
CKANUser ckanUser = userCache.get(gcubeUsername);
if(ckanUser == null) {
ckanUser = new CKANUser();
diff --git a/src/main/java/org/gcube/gcat/social/SocialPost.java b/src/main/java/org/gcube/gcat/social/SocialPost.java
index 2f0bd87..de33e90 100644
--- a/src/main/java/org/gcube/gcat/social/SocialPost.java
+++ b/src/main/java/org/gcube/gcat/social/SocialPost.java
@@ -8,19 +8,18 @@ import java.util.List;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
-import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
-import org.gcube.gcat.persistence.ckan.CKANInstance;
-import org.gcube.gcat.persistence.ckan.CKANUserCache;
-import org.gcube.gcat.utils.Constants;
-import org.gcube.gcat.utils.ContextUtility;
-import org.gcube.gcat.utils.HTTPUtility;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.gcube.com.fasterxml.jackson.databind.JsonNode;
import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
+import org.gcube.common.authorization.utils.manager.SecretManager;
+import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
+import org.gcube.gcat.persistence.ckan.CKANInstance;
+import org.gcube.gcat.persistence.ckan.CKANUserCache;
+import org.gcube.gcat.utils.Constants;
+import org.gcube.gcat.utils.HTTPUtility;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author Luca Frosini (ISTI - CNR)
@@ -120,7 +119,7 @@ public class SocialPost extends Thread {
CKANInstance instance = CKANInstance.getInstance();
if(!instance.isSocialPostEnabled()) {
- logger.info("Social Post are disabled in the context {}", ContextUtility.getCurrentContext());
+ logger.info("Social Post are disabled in the context {}", SecretManager.instance.get().getContext());
return;
}
logger.info("Going to send Social Post about the Item {} available at {}", itemID, itemURL);
diff --git a/src/main/java/org/gcube/gcat/social/SocialService.java b/src/main/java/org/gcube/gcat/social/SocialService.java
index 383ec00..ca00c1e 100644
--- a/src/main/java/org/gcube/gcat/social/SocialService.java
+++ b/src/main/java/org/gcube/gcat/social/SocialService.java
@@ -7,8 +7,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.resources.gcore.GCoreEndpoint;
-import org.gcube.gcat.utils.ContextUtility;
import org.gcube.resources.discovery.client.api.DiscoveryClient;
import org.gcube.resources.discovery.client.queries.api.SimpleQuery;
import org.slf4j.Logger;
@@ -35,7 +35,7 @@ public class SocialService {
}
public static SocialService getSocialService() throws Exception {
- String contex = ContextUtility.getCurrentContext();
+ String contex = SecretManager.instance.get().getContext();
SocialService socialService = socialServicePerContext.get(contex);
if(socialService == null) {
socialService = new SocialService();
@@ -66,20 +66,20 @@ public class SocialService {
List endpoints = client.submit(query);
if(endpoints == null || endpoints.isEmpty()) {
throw new Exception("Cannot retrieve the GCoreEndpoint SERVICE_NAME: " + SERVICE_NAME
- + ", SERVICE_CLASSE: " + SERVICE_CLASSE + ", in scope: " + ContextUtility.getCurrentContext());
+ + ", SERVICE_CLASSE: " + SERVICE_CLASSE + ", in scope: " + SecretManager.instance.get().getContext());
}
this.serviceBasePath = endpoints.get(0);
if(serviceBasePath == null)
throw new Exception("Endpoint:" + RESOURCE + ", is null for SERVICE_NAME: " + SERVICE_NAME
- + ", SERVICE_CLASSE: " + SERVICE_CLASSE + ", in scope: " + ContextUtility.getCurrentContext());
+ + ", SERVICE_CLASSE: " + SERVICE_CLASSE + ", in scope: " + SecretManager.instance.get().getContext());
serviceBasePath = serviceBasePath.endsWith("/") ? serviceBasePath : serviceBasePath + "/";
} catch(Exception e) {
String error = "An error occurred during GCoreEndpoint discovery, SERVICE_NAME: " + SERVICE_NAME
- + ", SERVICE_CLASSE: " + SERVICE_CLASSE + ", in scope: " + ContextUtility.getCurrentContext() + ".";
+ + ", SERVICE_CLASSE: " + SERVICE_CLASSE + ", in scope: " + SecretManager.instance.get().getContext() + ".";
logger.error(error, e);
throw new Exception(error);
}
diff --git a/src/main/java/org/gcube/gcat/utils/Constants.java b/src/main/java/org/gcube/gcat/utils/Constants.java
index 3ca8588..80a81c1 100644
--- a/src/main/java/org/gcube/gcat/utils/Constants.java
+++ b/src/main/java/org/gcube/gcat/utils/Constants.java
@@ -9,6 +9,7 @@ import java.util.Properties;
import javax.ws.rs.InternalServerErrorException;
import javax.ws.rs.WebApplicationException;
+import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.keycloak.KeycloakClientFactory;
import org.gcube.common.keycloak.model.TokenResponse;
@@ -46,11 +47,12 @@ public class Constants {
@Deprecated
public static String getCatalogueApplicationToken() {
+ String context = SecretManager.instance.get().getContext();
try {
- return applicationTokens.get(ContextUtility.getCurrentContext());
+ return applicationTokens.get(context);
} catch(Exception e) {
throw new InternalServerErrorException(
- "Unable to retrieve Application Token for context " + ContextUtility.getCurrentContext(), e);
+ "Unable to retrieve Application Token for context " + context, e);
}
}
@@ -70,12 +72,12 @@ public class Constants {
return clientSecret;
} catch(Exception e) {
throw new InternalServerErrorException(
- "Unable to retrieve Application Token for context " + ContextUtility.getCurrentContext(), e);
+ "Unable to retrieve Application Token for context " + SecretManager.instance.get().getContext(), e);
}
}
public static String getJWTAccessToken() throws Exception {
- String contextToAuthorise = ContextUtility.getCurrentContext();
+ String contextToAuthorise = SecretManager.instance.get().getContext();
TokenResponse tr = KeycloakClientFactory.newInstance().queryUMAToken(CLIENT_ID, getClientSecret(contextToAuthorise), contextToAuthorise, null);
return tr.getAccessToken();
}
diff --git a/src/main/java/org/gcube/gcat/utils/ContextUtility.java b/src/main/java/org/gcube/gcat/utils/ContextUtility.java
deleted file mode 100644
index 1d0b627..0000000
--- a/src/main/java/org/gcube/gcat/utils/ContextUtility.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.gcube.gcat.utils;
-
-import javax.ws.rs.InternalServerErrorException;
-
-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.ClientType;
-import org.gcube.common.authorization.library.provider.AuthorizationProvider;
-import org.gcube.common.authorization.library.provider.ClientInfo;
-import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
-import org.gcube.common.authorization.library.utils.Caller;
-import org.gcube.common.scope.api.ScopeProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- */
-public class ContextUtility {
-
- private static Logger logger = LoggerFactory.getLogger(ContextUtility.class);
-
- public static void setContext(String token) throws ObjectNotFound, Exception {
- SecurityTokenProvider.instance.set(token);
- AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
- ClientInfo clientInfo = authorizationEntry.getClientInfo();
- logger.debug("User : {} - Type : {}", clientInfo.getId(), clientInfo.getType().name());
- String qualifier = authorizationEntry.getQualifier();
- Caller caller = new Caller(clientInfo, qualifier);
- AuthorizationProvider.instance.set(caller);
- ScopeProvider.instance.set(getCurrentContext());
- }
-
- public static String getCurrentContext() {
- try {
- String token = SecurityTokenProvider.instance.get();
- return Constants.authorizationService().get(token).getContext();
- } catch(Exception e) {
- String context = ScopeProvider.instance.get();
- if(context != null) {
- return context;
- }
- throw new InternalServerErrorException(e);
- }
- }
-
- public static ClientInfo getClientInfo() {
- try {
- Caller caller = AuthorizationProvider.instance.get();
- if(caller != null) {
- return caller.getClient();
- } else {
- String token = SecurityTokenProvider.instance.get();
- AuthorizationEntry authorizationEntry = Constants.authorizationService().get(token);
- return authorizationEntry.getClientInfo();
- }
- } catch(Exception e) {
- throw new InternalServerErrorException(e);
- }
- }
-
- private static final String GET_USERNAME_ERROR = "Unable to retrieve user";
-
- public static String getUsername() {
- try {
- return getClientInfo().getId();
- } catch(Exception e) {
- logger.error(GET_USERNAME_ERROR);
- throw new InternalServerErrorException(GET_USERNAME_ERROR, e);
- }
- }
-
- public static boolean isApplication() {
- try {
- ClientInfo clientInfo = getClientInfo();
- return clientInfo.getType() == ClientType.EXTERNALSERVICE;
- } catch(Exception e) {
- throw new InternalServerErrorException(e);
- }
- }
-
-}
diff --git a/src/main/java/org/gcube/gcat/utils/URIResolver.java b/src/main/java/org/gcube/gcat/utils/URIResolver.java
index f6c4168..4c998e7 100644
--- a/src/main/java/org/gcube/gcat/utils/URIResolver.java
+++ b/src/main/java/org/gcube/gcat/utils/URIResolver.java
@@ -11,6 +11,7 @@ import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
+import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.gxhttp.request.GXHTTPStringRequest;
import org.gcube.gcat.persistence.ckan.CKANInstance;
@@ -47,7 +48,8 @@ public class URIResolver {
String uriResolverURL = CKANInstance.getInstance().getUriResolverURL();
ObjectNode requestContent = mapper.createObjectNode();
- requestContent.put(CATALOGUE_CONTEXT, ContextUtility.getCurrentContext());
+ String context = SecretManager.instance.get().getContext();
+ requestContent.put(CATALOGUE_CONTEXT, context);
requestContent.put(ENTITY_TYPE, DATASET);
requestContent.put(ENTITY_NAME, name);
diff --git a/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java b/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java
index 4f1387e..52ce38b 100644
--- a/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java
+++ b/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java
@@ -18,15 +18,19 @@ import javax.ws.rs.core.PathSegment;
import javax.ws.rs.core.UriBuilder;
import javax.ws.rs.core.UriInfo;
+import org.gcube.com.fasterxml.jackson.databind.JsonNode;
+import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
+import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
+import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
import org.gcube.common.authorization.client.exceptions.ObjectNotFound;
import org.gcube.common.authorization.library.provider.UserInfo;
+import org.gcube.common.authorization.utils.manager.SecretManager;
import org.gcube.common.resources.gcore.GenericResource;
import org.gcube.common.resources.gcore.Resources;
import org.gcube.common.scope.impl.ScopeBean;
import org.gcube.gcat.ContextTest;
import org.gcube.gcat.api.CMItemStatus;
import org.gcube.gcat.api.GCatConstants;
-import org.gcube.gcat.utils.ContextUtility;
import org.gcube.informationsystem.publisher.RegistryPublisher;
import org.gcube.informationsystem.publisher.RegistryPublisherFactory;
import org.junit.Assert;
@@ -34,11 +38,6 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.gcube.com.fasterxml.jackson.databind.JsonNode;
-import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
-import org.gcube.com.fasterxml.jackson.databind.node.ArrayNode;
-import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode;
-
/**
* @author Luca Frosini (ISTI - CNR)
*/
@@ -70,25 +69,21 @@ public class CKANPackageTest extends ContextTest {
@Override
public URI resolve(URI uri) {
- // TODO Auto-generated method stub
return null;
}
@Override
public URI relativize(URI uri) {
- // TODO Auto-generated method stub
return null;
}
@Override
public UriBuilder getRequestUriBuilder() {
- // TODO Auto-generated method stub
return null;
}
@Override
public URI getRequestUri() {
- // TODO Auto-generated method stub
return null;
}
@@ -106,79 +101,66 @@ public class CKANPackageTest extends ContextTest {
@Override
public List getPathSegments(boolean decode) {
- // TODO Auto-generated method stub
return null;
}
@Override
public List getPathSegments() {
- // TODO Auto-generated method stub
return null;
}
@Override
public MultivaluedMap getPathParameters(boolean decode) {
- // TODO Auto-generated method stub
return null;
}
@Override
public MultivaluedMap getPathParameters() {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getPath(boolean decode) {
- // TODO Auto-generated method stub
return null;
}
@Override
public String getPath() {
- // TODO Auto-generated method stub
return null;
}
@Override
public List getMatchedURIs(boolean decode) {
- // TODO Auto-generated method stub
return null;
}
@Override
public List getMatchedURIs() {
- // TODO Auto-generated method stub
return null;
}
@Override
public List