attempt to add set to CredentialsServiceProvider

raw-labs · Feb 9, 2024 · e6396cc · e6396cc
1 parent f4039b7
commit e6396cc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/snapi-frontend/src/main/scala/raw/creds/api/CredentialsServiceProvider.scala b/snapi-frontend/src/main/scala/raw/creds/api/CredentialsServiceProvider.scala
@@ -40,7 +40,12 @@ object CredentialsServiceProvider {
   }
 
   def apply(classLoader: ClassLoader)(implicit settings: RawSettings): CredentialsService = {
-    build(Some(classLoader))
+    instanceLock.synchronized {
+      instance match {
+        case Some(service) => service
+        case None => build(Some(classLoader))
+      }
+    }
   }
 
   private def build(
@@ -65,7 +70,11 @@ object CredentialsServiceProvider {
 
   private[raw] def set(credsService: CredentialsService): Unit = {
     instanceLock.synchronized {
-      instance = Some(credsService)
+      if (credsService == null) {
+        instance = None
+      } else {
+        instance = Some(credsService)
+      }
     }
   }
 

diff --git a/snapi-frontend/src/test/scala/raw/creds/api/CredentialsTestContext.scala b/snapi-frontend/src/test/scala/raw/creds/api/CredentialsTestContext.scala
@@ -53,6 +53,7 @@ trait CredentialsTestContext extends BeforeAndAfterAll {
 
   def setCredentials(credentials: CredentialsService): Unit = {
     instance = credentials
+    CredentialsServiceProvider.set(credentials)
   }
 
   override def beforeAll(): Unit = {