From 25d931a9a1abb6118f9ebb9ba4fb21101de3e9fb Mon Sep 17 00:00:00 2001 From: "lucio.lelii" Date: Mon, 2 May 2016 16:43:20 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/Common/authorization-common-client@128414 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/proxy/DefaultAuthorizationProxy.java | 10 ++++------ .../gcube/common/authorizationservice/cl/CallTest.java | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java b/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java index a245026..4262ac9 100644 --- a/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java +++ b/src/main/java/org/gcube/common/authorization/client/proxy/DefaultAuthorizationProxy.java @@ -11,9 +11,7 @@ import java.net.HttpURLConnection; import java.net.URL; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.gcube.common.authorization.client.Binder; import org.gcube.common.authorization.client.exceptions.ObjectNotFound; @@ -32,7 +30,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy { private static Logger log = LoggerFactory.getLogger(AuthorizationProxy.class); - private static Map cache = new HashMap(); + //private static Map cache = new HashMap(); private List endpoints; @@ -88,8 +86,8 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy { @Override public AuthorizationEntry get(String token) throws ObjectNotFound, Exception{ - if (cache.containsKey(token) && cache.get(token).isValid()) - return cache.get(token).getEntry(); + /*if (cache.containsKey(token) && cache.get(token).isValid()) + return cache.get(token).getEntry();*/ final String methodPath = "/retrieve/"; @@ -104,7 +102,7 @@ public class DefaultAuthorizationProxy implements AuthorizationProxy { try(InputStream stream = (InputStream)connection.getContent();){ AuthorizationEntry entry = (AuthorizationEntry)Binder.getContext().createUnmarshaller().unmarshal(stream); - cache.put(token, new AuthorizationEntryCache(entry)); + //cache.put(token, new AuthorizationEntryCache(entry)); return entry; } diff --git a/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java b/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java index 62e6d51..7ac21f9 100644 --- a/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java +++ b/src/test/java/org/gcube/common/authorizationservice/cl/CallTest.java @@ -18,8 +18,8 @@ public class CallTest { @Test public void call() throws Exception{ - try{ - System.out.println(authorizationService().get("82a84741-debe-4c90-a907-c429c8272071")); + try{ + System.out.println(authorizationService().get("3b34750e-d39b-4d3c-924d-efcf7cc907c1")); }catch(ObjectNotFound onf){ onf.printStackTrace(); } @@ -28,8 +28,8 @@ public class CallTest { @Test public void requestToken() throws Exception { //ScopeProvider.instance.set("/gcube/devsec"); - String token = authorizationService().generateToken(new UserInfo("luca.frosini", new ArrayList()), "/gcube"); - System.out.println("token is: "+token); + System.out.println( authorizationService().generateToken(new UserInfo("testckan", new ArrayList()), "/gcube")); + } @Test