From a64cef511390fcd03faffd7390916bb06c61dea9 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 28 Feb 2022 13:21:36 +0100 Subject: [PATCH] Refactoring code due to changes in authorization-utils --- .../java/org/gcube/gcat/client/ContextTest.java | 13 ++++++++----- src/test/java/org/gcube/gcat/client/ItemTest.java | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/test/java/org/gcube/gcat/client/ContextTest.java b/src/test/java/org/gcube/gcat/client/ContextTest.java index 95ac2e2..e09f62d 100644 --- a/src/test/java/org/gcube/gcat/client/ContextTest.java +++ b/src/test/java/org/gcube/gcat/client/ContextTest.java @@ -6,6 +6,7 @@ import java.net.MalformedURLException; import java.util.Properties; import org.gcube.common.authorization.utils.manager.SecretManager; +import org.gcube.common.authorization.utils.manager.SecretManagerProvider; import org.gcube.common.authorization.utils.secret.GCubeSecret; import org.gcube.common.authorization.utils.secret.Secret; import org.junit.AfterClass; @@ -68,10 +69,12 @@ public class ContextTest { } public static void set(Secret secret) throws Exception { - SecretManager.instance.get().reset(); - secret.set(); - String username = secret.getUsername(); - String context = secret.getContext(); + SecretManagerProvider.instance.reset(); + SecretManager secretManager = SecretManagerProvider.instance.get(); + secretManager.addSecret(secret); + secretManager.set(); + String username = secretManager.getUser().getUsername(); + String context = secretManager.getContext(); logger.debug("Set authorization for user {} in context {}", username, context); } @@ -102,7 +105,7 @@ public class ContextTest { @AfterClass public static void afterClass() throws Exception { - SecretManager.instance.get().reset(); + SecretManagerProvider.instance.reset(); } } diff --git a/src/test/java/org/gcube/gcat/client/ItemTest.java b/src/test/java/org/gcube/gcat/client/ItemTest.java index c254c13..6b37d2b 100644 --- a/src/test/java/org/gcube/gcat/client/ItemTest.java +++ b/src/test/java/org/gcube/gcat/client/ItemTest.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; import org.gcube.com.fasterxml.jackson.databind.JavaType; import org.gcube.com.fasterxml.jackson.databind.JsonNode; import org.gcube.com.fasterxml.jackson.databind.ObjectMapper; -import org.gcube.common.authorization.utils.manager.SecretManager; +import org.gcube.common.authorization.utils.manager.SecretManagerProvider; import org.gcube.gcat.api.GCatConstants; import org.junit.Assert; import org.junit.Ignore; @@ -54,7 +54,7 @@ public class ItemTest extends ContextTest { public void testCount() throws MalformedURLException { Item item = new Item(); int count = item.count(); - logger.debug("The items published in the organization corresponding to the VRE {} are {}", SecretManager.instance.get().getContext(), count); + logger.debug("The items published in the organization corresponding to the VRE {} are {}", SecretManagerProvider.instance.get().getContext(), count); } public String createItem(ObjectMapper mapper, String licenseID) throws Exception {