From db11acc925fa6724ac8086ce50389061ee1eb5d9 Mon Sep 17 00:00:00 2001 From: lucio Date: Thu, 22 Feb 2024 14:02:38 +0100 Subject: [PATCH] porting to changes in gcube-security --- .../resourcemanager/EServiceManager.java | 10 +++++----- .../resourcemanager/HostingNodeManager.java | 6 +++--- .../connector/resourceregistry/ContextTest.java | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java index 3a3b2ff..536ebb1 100644 --- a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/EServiceManager.java @@ -82,7 +82,7 @@ public class EServiceManager { } public void addEServiceToCurrentContext() throws ResourceNotFoundException, ContextNotFoundException, ResourceRegistryException { - Secret secret = SecretManagerProvider.instance.get(); + Secret secret = SecretManagerProvider.get(); String context = secret.getContext(); UUID contextUUID = ContextUtility.getContextUUID(context); @@ -93,7 +93,7 @@ public class EServiceManager { for (String c : contexts) { if(c.compareTo(context)!=0) { Secret s = authorizationProvider.getSecretForContext(c); - SecretManagerProvider.instance.set(s); + SecretManagerProvider.set(s); anotherContextSet = true; break; } @@ -114,7 +114,7 @@ public class EServiceManager { public void addHostingNodeToCurrentContext() throws ResourceNotFoundException, ContextNotFoundException, ResourceRegistryException { - Secret secret = SecretManagerProvider.instance.get(); + Secret secret = SecretManagerProvider.get(); String context = secret.getContext(); UUID contextUUID = ContextUtility.getContextUUID(context); @@ -125,7 +125,7 @@ public class EServiceManager { for (String c : contexts) { if(c.compareTo(context)!=0) { Secret s = authorizationProvider.getSecretForContext(c); - SecretManagerProvider.instance.set(s); + SecretManagerProvider.set(s); anotherContextSet = true; break; } @@ -157,7 +157,7 @@ public class EServiceManager { public void removeFromCurrentContext() throws ResourceNotFoundException, ContextNotFoundException, ResourceRegistryException { - Secret secret = SecretManagerProvider.instance.get(); + Secret secret = SecretManagerProvider.get(); String context = secret.getContext(); UUID uuid = UUID.fromString(applicationContext.container().id()); try { diff --git a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java index e418e5c..8f09a46 100644 --- a/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java +++ b/src/main/java/org/gcube/smartgears/connector/resourceregistry/resourcemanager/HostingNodeManager.java @@ -114,7 +114,7 @@ public class HostingNodeManager { } public void addToCurrentContext() throws ResourceNotFoundException, ContextNotFoundException, ResourceRegistryException { - Secret secret = SecretManagerProvider.instance.get(); + Secret secret = SecretManagerProvider.get(); String context = secret.getContext(); UUID contextUUID = ContextUtility.getContextUUID(context); @@ -125,7 +125,7 @@ public class HostingNodeManager { for (String c : contexts) { if(c.compareTo(context)!=0) { Secret s = authorizationProvider.getSecretForContext(c); - SecretManagerProvider.instance.set(s); + SecretManagerProvider.set(s); anotherContextSet = true; break; } @@ -157,7 +157,7 @@ public class HostingNodeManager { public void removeFromCurrentContext() throws ResourceNotFoundException, ContextNotFoundException, ResourceRegistryException { - Secret secret = SecretManagerProvider.instance.get(); + Secret secret = SecretManagerProvider.get(); String context = secret.getContext(); UUID uuid = UUID.fromString(containerContext.id()); try { diff --git a/src/test/java/org/gcube/smartgears/connector/resourceregistry/ContextTest.java b/src/test/java/org/gcube/smartgears/connector/resourceregistry/ContextTest.java index 104d498..8a3f02c 100644 --- a/src/test/java/org/gcube/smartgears/connector/resourceregistry/ContextTest.java +++ b/src/test/java/org/gcube/smartgears/connector/resourceregistry/ContextTest.java @@ -57,8 +57,8 @@ public class ContextTest { } public static void set(Secret secret) throws Exception { - SecretManagerProvider.instance.reset(); - SecretManagerProvider.instance.set(secret); + SecretManagerProvider.reset(); + SecretManagerProvider.set(secret); } public static void setContextByName(String fullContextName) throws Exception { @@ -79,7 +79,7 @@ public class ContextTest { @AfterClass public static void afterClass() throws Exception { - SecretManagerProvider.instance.reset(); + SecretManagerProvider.reset(); } }