From eff8fce2f0788befaf1fa271a29953a992b523bb Mon Sep 17 00:00:00 2001
From: Nipuni Paaris <nipunib@wso2.com>
Date: Mon, 9 Dec 2024 16:16:50 +0530
Subject: [PATCH]  [Spring Cleanup] Remove Spring dependencies in authenticator
 management API (#688)

* Remove Spring dependencies in authenticator management API

* Resolve PR comments

* Refactor ServerAuthenticatorManagementServiceFactory class
---
 .../pom.xml                                   |  9 +--
 .../common/AuthenticatorsServiceHolder.java   | 79 ++++++++-----------
 .../ApplicationMgtOSGIServiceFactory.java     | 51 ------------
 .../factory/IdPMgtOSGIServiceFactory.java     | 51 ------------
 .../pom.xml                                   | 15 ++--
 .../authenticators/v1/AuthenticatorsApi.java  | 40 ++++++----
 .../AuthenticatorsApiServiceFactory.java      | 42 ++++++----
 .../ServerAuthenticatorManagementService.java | 53 +++++++------
 ...AuthenticatorManagementServiceFactory.java | 77 ++++++++++++++++++
 .../v1/impl/AuthenticatorsApiServiceImpl.java | 44 +++++++----
 .../cxf/authenticators-server-v1-cxf.xml      | 30 -------
 11 files changed, 222 insertions(+), 269 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/src/main/java/org/wso2/carbon/identity/api/server/authenticators/common/factory/ApplicationMgtOSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/src/main/java/org/wso2/carbon/identity/api/server/authenticators/common/factory/IdPMgtOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/factories/ServerAuthenticatorManagementServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/resources/META-INF/cxf/authenticators-server-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
index 17cc2d5484..2d7ebe926e 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2021-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
@@ -47,11 +47,6 @@
             <artifactId>org.wso2.carbon.identity.application.mgt</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
     
 </project>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/src/main/java/org/wso2/carbon/identity/api/server/authenticators/common/AuthenticatorsServiceHolder.java b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/src/main/java/org/wso2/carbon/identity/api/server/authenticators/common/AuthenticatorsServiceHolder.java
index 1f53f027f0..b4f22daeab 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/src/main/java/org/wso2/carbon/identity/api/server/authenticators/common/AuthenticatorsServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/src/main/java/org/wso2/carbon/identity/api/server/authenticators/common/AuthenticatorsServiceHolder.java
@@ -1,41 +1,46 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *                                                                         
- * Licensed under the Apache License, Version 2.0 (the "License");         
- * you may not use this file except in compliance with the License.        
- * You may obtain a copy of the License at                                 
- *                                                                         
- * http://www.apache.org/licenses/LICENSE-2.0                              
- *                                                                         
- * Unless required by applicable law or agreed to in writing, software     
- * distributed under the License is distributed on an "AS IS" BASIS,       
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and     
- * limitations under the License.
+ * Copyright (c) 2021-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.wso2.carbon.identity.api.server.authenticators.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
-import org.wso2.carbon.idp.mgt.IdentityProviderManager;
+import org.wso2.carbon.idp.mgt.IdpManager;
 
 /**
  * Service holder class for server configuration related services.
  */
 public class AuthenticatorsServiceHolder {
 
-    private static AuthenticatorsServiceHolder instance = new AuthenticatorsServiceHolder();
-
-    private ApplicationManagementService applicationManagementService;
-    private IdentityProviderManager identityProviderManager;
-
     private AuthenticatorsServiceHolder() {
 
     }
 
-    public static AuthenticatorsServiceHolder getInstance() {
+    private static class ApplicationManagementServiceHolder {
+        static final ApplicationManagementService SERVICE = (ApplicationManagementService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext()
+                .getOSGiService(ApplicationManagementService.class, null);
+    }
 
-        return instance;
+    private static class IdentityProviderManagerHolder {
+        static final IdpManager SERVICE = (IdpManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext()
+                .getOSGiService(IdpManager.class, null);
     }
 
     /**
@@ -43,38 +48,18 @@ public static AuthenticatorsServiceHolder getInstance() {
      *
      * @return ApplicationManagementService
      */
-    public ApplicationManagementService getApplicationManagementService() {
-
-        return AuthenticatorsServiceHolder.getInstance().applicationManagementService;
-    }
-
-    /**
-     * Set ApplicationManagementService osgi service.
-     *
-     * @param applicationManagementService ApplicationManagementService.
-     */
-    public void setApplicationManagementService(ApplicationManagementService applicationManagementService) {
-
-        AuthenticatorsServiceHolder.getInstance().applicationManagementService = applicationManagementService;
-    }
-
-    /**
-     * Get IdentityProviderManager osgi service.
-     *
-     * @return IdentityProviderManager
-     */
-    public IdentityProviderManager getIdentityProviderManager() {
+    public static ApplicationManagementService getApplicationManagementService() {
 
-        return AuthenticatorsServiceHolder.getInstance().identityProviderManager;
+        return ApplicationManagementServiceHolder.SERVICE;
     }
 
     /**
-     * Set IdentityProviderManager osgi service.
+     * Get IdpManager osgi service.
      *
-     * @param identityProviderManager IdentityProviderManager.
+     * @return IdpManager
      */
-    public void setIdentityProviderManager(IdentityProviderManager identityProviderManager) {
+    public static IdpManager getIdentityProviderManager() {
 
-        AuthenticatorsServiceHolder.getInstance().identityProviderManager = identityProviderManager;
+        return IdentityProviderManagerHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/src/main/java/org/wso2/carbon/identity/api/server/authenticators/common/factory/ApplicationMgtOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/src/main/java/org/wso2/carbon/identity/api/server/authenticators/common/factory/ApplicationMgtOSGIServiceFactory.java
deleted file mode 100644
index 44c24bb87f..0000000000
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/src/main/java/org/wso2/carbon/identity/api/server/authenticators/common/factory/ApplicationMgtOSGIServiceFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *                                                                         
- * Licensed under the Apache License, Version 2.0 (the "License");         
- * you may not use this file except in compliance with the License.        
- * You may obtain a copy of the License at                                 
- *                                                                         
- * http://www.apache.org/licenses/LICENSE-2.0                              
- *                                                                         
- * Unless required by applicable law or agreed to in writing, software     
- * distributed under the License is distributed on an "AS IS" BASIS,       
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and     
- * limitations under the License.
- */
-
-package org.wso2.carbon.identity.api.server.authenticators.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the ApplicationManagementService type of object inside the container.
- */
-public class ApplicationMgtOSGIServiceFactory extends AbstractFactoryBean<ApplicationManagementService> {
-
-    private ApplicationManagementService applicationManagementService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected ApplicationManagementService createInstance() throws Exception {
-
-        if (this.applicationManagementService == null) {
-            ApplicationManagementService taskOperationService = (ApplicationManagementService) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(ApplicationManagementService.class, null);
-            if (taskOperationService != null) {
-                this.applicationManagementService = taskOperationService;
-            } else {
-                throw new Exception("Unable to retrieve applicationManagementService service.");
-            }
-        }
-        return this.applicationManagementService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/src/main/java/org/wso2/carbon/identity/api/server/authenticators/common/factory/IdPMgtOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/src/main/java/org/wso2/carbon/identity/api/server/authenticators/common/factory/IdPMgtOSGIServiceFactory.java
deleted file mode 100644
index b79765d583..0000000000
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.common/src/main/java/org/wso2/carbon/identity/api/server/authenticators/common/factory/IdPMgtOSGIServiceFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *                                                                         
- * Licensed under the Apache License, Version 2.0 (the "License");         
- * you may not use this file except in compliance with the License.        
- * You may obtain a copy of the License at                                 
- *                                                                         
- * http://www.apache.org/licenses/LICENSE-2.0                              
- *                                                                         
- * Unless required by applicable law or agreed to in writing, software     
- * distributed under the License is distributed on an "AS IS" BASIS,       
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and     
- * limitations under the License.
- */
-
-package org.wso2.carbon.identity.api.server.authenticators.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.idp.mgt.IdpManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the IdentityProviderManager type of object inside the container.
- */
-public class IdPMgtOSGIServiceFactory extends AbstractFactoryBean<IdpManager> {
-
-    private IdpManager identityProviderManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected IdpManager createInstance() throws Exception {
-
-        if (this.identityProviderManager == null) {
-            IdpManager taskOperationService = (IdpManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(IdpManager.class, null);
-            if (taskOperationService != null) {
-                this.identityProviderManager = taskOperationService;
-            } else {
-                throw new Exception("Unable to retrieve identityProviderManager service.");
-            }
-        }
-        return this.identityProviderManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
index a6df6f7cfa..ff63c209d5 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2021-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
   ~ in compliance with the License.
   ~ You may obtain a copy of the License at
@@ -105,11 +105,6 @@
             <artifactId>cxf-rt-rs-service-description</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
@@ -169,6 +164,12 @@
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.authenticators.common</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/gen/java/org/wso2/carbon/identity/api/server/authenticators/v1/AuthenticatorsApi.java b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/gen/java/org/wso2/carbon/identity/api/server/authenticators/v1/AuthenticatorsApi.java
index 1d7fd0142f..d1b8000a37 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/gen/java/org/wso2/carbon/identity/api/server/authenticators/v1/AuthenticatorsApi.java
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/gen/java/org/wso2/carbon/identity/api/server/authenticators/v1/AuthenticatorsApi.java
@@ -1,27 +1,29 @@
 /*
-* Copyright (c) 2021, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (c) 2021-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.wso2.carbon.identity.api.server.authenticators.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import java.io.InputStream;
 import java.util.List;
 
+import org.wso2.carbon.identity.api.server.authenticators.v1.factories.AuthenticatorsApiServiceFactory;
 import org.wso2.carbon.identity.api.server.authenticators.v1.model.Authenticator;
 import org.wso2.carbon.identity.api.server.authenticators.v1.model.ConnectedApps;
 import org.wso2.carbon.identity.api.server.authenticators.v1.model.Error;
@@ -39,8 +41,12 @@
 
 public class AuthenticatorsApi  {
 
-    @Autowired
-    private AuthenticatorsApiService delegate;
+    private final AuthenticatorsApiService delegate;
+
+    public AuthenticatorsApi() {
+
+        this.delegate = AuthenticatorsApiServiceFactory.getAuthenticatorsApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/gen/java/org/wso2/carbon/identity/api/server/authenticators/v1/factories/AuthenticatorsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/gen/java/org/wso2/carbon/identity/api/server/authenticators/v1/factories/AuthenticatorsApiServiceFactory.java
index 6f567b85a5..c2e1a90689 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/gen/java/org/wso2/carbon/identity/api/server/authenticators/v1/factories/AuthenticatorsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/gen/java/org/wso2/carbon/identity/api/server/authenticators/v1/factories/AuthenticatorsApiServiceFactory.java
@@ -1,30 +1,40 @@
 /*
-* Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (c) 2021-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.wso2.carbon.identity.api.server.authenticators.v1.factories;
 
 import org.wso2.carbon.identity.api.server.authenticators.v1.AuthenticatorsApiService;
 import org.wso2.carbon.identity.api.server.authenticators.v1.impl.AuthenticatorsApiServiceImpl;
 
+/**
+ * This class is the factory class for AuthenticatorsApiService.
+ */
 public class AuthenticatorsApiServiceFactory {
 
-   private final static AuthenticatorsApiService service = new AuthenticatorsApiServiceImpl();
+   private final static AuthenticatorsApiService SERVICE = new AuthenticatorsApiServiceImpl();
 
+   /**
+    * Get AuthenticatorsApiService.
+    *
+    * @return AuthenticatorsApiService
+    */
    public static AuthenticatorsApiService getAuthenticatorsApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java
index a67a7bf481..ae8a0b3ff8 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/core/ServerAuthenticatorManagementService.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2021 WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2021-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
  * in compliance with the License.
  * You may obtain a copy of the License at
@@ -23,7 +23,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.identity.api.server.authenticators.common.AuthenticatorsServiceHolder;
 import org.wso2.carbon.identity.api.server.authenticators.common.Constants;
 import org.wso2.carbon.identity.api.server.authenticators.v1.model.Authenticator;
 import org.wso2.carbon.identity.api.server.authenticators.v1.model.ConnectedApp;
@@ -41,6 +40,7 @@
 import org.wso2.carbon.identity.application.common.model.IdentityProvider;
 import org.wso2.carbon.identity.application.common.model.LocalAuthenticatorConfig;
 import org.wso2.carbon.identity.application.common.model.RequestPathAuthenticatorConfig;
+import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
 import org.wso2.carbon.identity.base.IdentityException;
 import org.wso2.carbon.identity.core.model.ExpressionNode;
 import org.wso2.carbon.identity.core.model.FilterTreeBuilder;
@@ -50,6 +50,7 @@
 import org.wso2.carbon.idp.mgt.IdentityProviderManagementClientException;
 import org.wso2.carbon.idp.mgt.IdentityProviderManagementException;
 import org.wso2.carbon.idp.mgt.IdentityProviderManagementServerException;
+import org.wso2.carbon.idp.mgt.IdpManager;
 import org.wso2.carbon.idp.mgt.model.ConnectedAppsResult;
 import org.wso2.carbon.idp.mgt.model.IdpSearchResult;
 
@@ -72,8 +73,17 @@
  */
 public class ServerAuthenticatorManagementService {
 
+    private final ApplicationManagementService applicationManagementService;
+    private final IdpManager idpManager;
     private static final Log log = LogFactory.getLog(ServerAuthenticatorManagementService.class);
 
+    public ServerAuthenticatorManagementService(ApplicationManagementService applicationManagementService,
+                                                IdpManager idpManager) {
+
+        this.applicationManagementService = applicationManagementService;
+        this.idpManager = idpManager;
+    }
+
     /**
      * Retrieves the list of available authenticators.
      *
@@ -103,9 +113,8 @@ public List<Authenticator> getAuthenticators(String filter, Integer limit, Integ
                 }
             }
 
-            LocalAuthenticatorConfig[] localAuthenticatorConfigs = AuthenticatorsServiceHolder.getInstance()
-                    .getApplicationManagementService().getAllLocalAuthenticators(ContextLoader
-                            .getTenantDomainFromContext());
+            LocalAuthenticatorConfig[] localAuthenticatorConfigs = applicationManagementService
+                    .getAllLocalAuthenticators(ContextLoader.getTenantDomainFromContext());
 
             int localAuthenticatorsCount = localAuthenticatorConfigs.length;
             RequestPathAuthenticatorConfig[] requestPathAuthenticatorConfigs = new RequestPathAuthenticatorConfig[0];
@@ -115,9 +124,8 @@ public List<Authenticator> getAuthenticators(String filter, Integer limit, Integ
             count as the no. of items returned in the response will be capped at the maximum items per page count. */
             if (StringUtils.isNotBlank(filter) || (StringUtils.isBlank(filter) && localAuthenticatorsCount <
                     maximumItemPerPage)) {
-                requestPathAuthenticatorConfigs = AuthenticatorsServiceHolder.getInstance()
-                        .getApplicationManagementService().getAllRequestPathAuthenticators(ContextLoader
-                                .getTenantDomainFromContext());
+                requestPathAuthenticatorConfigs = applicationManagementService
+                        .getAllRequestPathAuthenticators(ContextLoader.getTenantDomainFromContext());
             }
 
             List<String> requestedAttributeList = new ArrayList<>();
@@ -132,9 +140,8 @@ public List<Authenticator> getAuthenticators(String filter, Integer limit, Integ
             less than the maximum items per page count as the no. of items returned in the response will be capped
             at the maximum items per page count. */
             if (idPCountToBeRetrieved > 0 && StringUtils.isBlank(filter)) {
-                IdpSearchResult idpSearchResult = AuthenticatorsServiceHolder.getInstance().getIdentityProviderManager()
-                        .getIdPs(idPCountToBeRetrieved, null, null, null, null,
-                                ContextLoader.getTenantDomainFromContext(), requestedAttributeList);
+                IdpSearchResult idpSearchResult = idpManager.getIdPs(idPCountToBeRetrieved, null, null,
+                        null, null, ContextLoader.getTenantDomainFromContext(), requestedAttributeList);
                 identityProviders = idpSearchResult.getIdPs();
             }
 
@@ -157,16 +164,13 @@ public List<Authenticator> getAuthenticators(String filter, Integer limit, Integ
     public List<String> getTags() {
 
         try {
-            LocalAuthenticatorConfig[] localAuthenticatorConfigs = AuthenticatorsServiceHolder.getInstance()
-                    .getApplicationManagementService().getAllLocalAuthenticators(ContextLoader
-                            .getTenantDomainFromContext());
+            LocalAuthenticatorConfig[] localAuthenticatorConfigs = applicationManagementService
+                    .getAllLocalAuthenticators(ContextLoader.getTenantDomainFromContext());
 
-            RequestPathAuthenticatorConfig[] requestPathAuthenticatorConfigs = AuthenticatorsServiceHolder.getInstance()
-                    .getApplicationManagementService().getAllRequestPathAuthenticators(ContextLoader
-                            .getTenantDomainFromContext());
+            RequestPathAuthenticatorConfig[] requestPathAuthenticatorConfigs = applicationManagementService
+                    .getAllRequestPathAuthenticators(ContextLoader.getTenantDomainFromContext());
 
-            FederatedAuthenticatorConfig[] federatedAuthenticatorConfigs = AuthenticatorsServiceHolder.getInstance()
-                    .getIdentityProviderManager().getAllFederatedAuthenticators();
+            FederatedAuthenticatorConfig[] federatedAuthenticatorConfigs = idpManager.getAllFederatedAuthenticators();
 
             return buildTagsListResponse(localAuthenticatorConfigs, requestPathAuthenticatorConfigs,
                     federatedAuthenticatorConfigs);
@@ -181,8 +185,7 @@ public List<String> getTags() {
     public ConnectedApps getConnectedAppsOfLocalAuthenticator(String authenticatorId, Integer limit, Integer offset) {
 
         try {
-            ConnectedAppsResult connectedAppsResult = AuthenticatorsServiceHolder.getInstance()
-                    .getApplicationManagementService()
+            ConnectedAppsResult connectedAppsResult = applicationManagementService
                     .getConnectedAppsForLocalAuthenticator(authenticatorId, ContextLoader.getTenantDomainFromContext(),
                             limit, offset);
             return createConnectedAppsResponse(authenticatorId, connectedAppsResult);
@@ -311,8 +314,7 @@ private List<Authenticator> buildAuthenticatorsListResponse(String filter, List<
             int idPCountToBeRetrieved = maximumItemsPerPage - authenticators.size();
             IdpSearchResult idpSearchResult;
             try {
-                idpSearchResult = AuthenticatorsServiceHolder.getInstance().getIdentityProviderManager()
-                        .getIdPs(idPCountToBeRetrieved, null, null, null,
+                idpSearchResult = idpManager.getIdPs(idPCountToBeRetrieved, null, null, null,
                                 ContextLoader.getTenantDomainFromContext(), requestedAttributeList,
                                 expressionNodesForIdp);
                 identityProviders = idpSearchResult.getIdPs();
@@ -758,8 +760,7 @@ private void getFilteredIdPs(int limit, int offSet, List<String> requestedAttrib
                                  List<IdentityProvider> identityProviders, List<ExpressionNode> expressionNodes) {
 
         try {
-            IdpSearchResult idpSearchResult = AuthenticatorsServiceHolder.getInstance().getIdentityProviderManager()
-                    .getIdPs(limit, (offSet + limit), null, null,
+            IdpSearchResult idpSearchResult = idpManager.getIdPs(limit, (offSet + limit), null, null,
                             ContextLoader.getTenantDomainFromContext(), requestedAttributeList, expressionNodes);
             identityProviders.addAll(idpSearchResult.getIdPs());
         } catch (IdentityProviderManagementException e) {
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/factories/ServerAuthenticatorManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/factories/ServerAuthenticatorManagementServiceFactory.java
new file mode 100644
index 0000000000..d205909cd5
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/factories/ServerAuthenticatorManagementServiceFactory.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.authenticators.v1.factories;
+
+import org.wso2.carbon.identity.api.server.authenticators.common.AuthenticatorsServiceHolder;
+import org.wso2.carbon.identity.api.server.authenticators.v1.core.ServerAuthenticatorManagementService;
+import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
+import org.wso2.carbon.idp.mgt.IdpManager;
+
+/**
+ * Factory class for ServerAuthenticatorManagementService.
+ */
+public class ServerAuthenticatorManagementServiceFactory {
+
+    private ServerAuthenticatorManagementServiceFactory() {
+
+    }
+
+    private static class ServerAuthenticatorManagementServiceHolder {
+
+        private static final ServerAuthenticatorManagementService SERVICE = createServiceInstance();
+    }
+
+    private static ServerAuthenticatorManagementService createServiceInstance() {
+
+        ApplicationManagementService applicationManagementService = getApplicationManagementService();
+        IdpManager idpManager = getIdpManager();
+
+        return new ServerAuthenticatorManagementService(applicationManagementService, idpManager);
+    }
+
+    /**
+     * Get ServerAuthenticatorManagementService.
+     *
+     * @return ServerAuthenticatorManagementService
+     */
+    public static ServerAuthenticatorManagementService getServerAuthenticatorManagementService() {
+
+        return ServerAuthenticatorManagementServiceHolder.SERVICE;
+    }
+
+    private static ApplicationManagementService getApplicationManagementService() {
+
+        ApplicationManagementService service = AuthenticatorsServiceHolder.getApplicationManagementService();
+        if (service == null) {
+            throw new IllegalStateException("ApplicationManagementService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static IdpManager getIdpManager() {
+
+        IdpManager service = AuthenticatorsServiceHolder.getIdentityProviderManager();
+        if (service == null) {
+            throw new IllegalStateException("IdpManager service is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/impl/AuthenticatorsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/impl/AuthenticatorsApiServiceImpl.java
index 1a1b6f6dd4..2442a98de3 100644
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/impl/AuthenticatorsApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/java/org/wso2/carbon/identity/api/server/authenticators/v1/impl/AuthenticatorsApiServiceImpl.java
@@ -1,24 +1,26 @@
 /*
-* Copyright (c) 2021, WSO2 LLC. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright (c) 2021-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 
 package org.wso2.carbon.identity.api.server.authenticators.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.authenticators.v1.AuthenticatorsApiService;
 import org.wso2.carbon.identity.api.server.authenticators.v1.core.ServerAuthenticatorManagementService;
+import org.wso2.carbon.identity.api.server.authenticators.v1.factories.ServerAuthenticatorManagementServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -27,8 +29,16 @@
  */
 public class AuthenticatorsApiServiceImpl implements AuthenticatorsApiService {
 
-    @Autowired
-    private ServerAuthenticatorManagementService authenticatorManagementService;
+    private final ServerAuthenticatorManagementService authenticatorManagementService;
+
+    public AuthenticatorsApiServiceImpl() {
+        try {
+            authenticatorManagementService = ServerAuthenticatorManagementServiceFactory
+                    .getServerAuthenticatorManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating the authenticator management services.", e);
+        }
+    }
 
     @Override
     public Response authenticatorsGet(String filter, Integer limit, Integer offset) {
diff --git a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/resources/META-INF/cxf/authenticators-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/resources/META-INF/cxf/authenticators-server-v1-cxf.xml
deleted file mode 100644
index 0f748ca030..0000000000
--- a/components/org.wso2.carbon.identity.api.server.authenticators/org.wso2.carbon.identity.api.server.authenticators.v1/src/main/resources/META-INF/cxf/authenticators-server-v1-cxf.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2021, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
-    <bean class="org.wso2.carbon.identity.api.server.authenticators.v1.core.ServerAuthenticatorManagementService"/>
-    <bean class="org.wso2.carbon.identity.api.server.authenticators.v1.impl.AuthenticatorsApiServiceImpl"/>
-    <bean id="ApplicationMgtServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.authenticators.common.factory.ApplicationMgtOSGIServiceFactory"/>
-    <bean id="IdPMgtServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.authenticators.common.factory.IdPMgtOSGIServiceFactory"/>
-    <bean id="AuthenticatorsServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.authenticators.common.AuthenticatorsServiceHolder">
-        <property name="applicationManagementService" ref="ApplicationMgtServiceFactoryBean"/>
-        <property name="identityProviderManager" ref="IdPMgtServiceFactoryBean"/>
-    </bean>
-</beans>