From 7a788e153eb84135ba2975f606c58d62dd971873 Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Fri, 10 Jan 2025 17:06:38 +0530
Subject: [PATCH 01/15] Remove Spring dependency from api.user.application

---
 .../pom.xml                                   |  9 +--
 .../common/ApplicationServiceHolder.java      | 46 +++++++--------
 .../common/factory/OSGIServiceFactory.java    | 54 -----------------
 ...anizationManagementOSGIServiceFactory.java | 55 -----------------
 .../pom.xml                                   |  9 +--
 .../rest/api/user/application/v1/MeApi.java   | 41 +++++++------
 .../v1/factories/MeApiServiceFactory.java     | 42 ++++++++-----
 .../v1/core/ApplicationService.java           | 29 +++++----
 .../factories/ApplicationServiceFactory.java  | 59 +++++++++++++++++++
 .../application/v1/impl/MeApiServiceImpl.java | 31 ++++++----
 .../META-INF/cxf/application-user-v1-cxf.xml  | 33 -----------
 11 files changed, 171 insertions(+), 237 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OrganizationManagementOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/ApplicationServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/resources/META-INF/cxf/application-user-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/pom.xml b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/pom.xml
index 72447002b..15a0222e2 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-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
@@ -28,11 +28,6 @@
     <artifactId>org.wso2.carbon.identity.api.user.application.common</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.application.mgt</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/ApplicationServiceHolder.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/ApplicationServiceHolder.java
index 421900634..e19a22595 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/ApplicationServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/ApplicationServiceHolder.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-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
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.user.application.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.application.mgt.DiscoverableApplicationManager;
 import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
 
@@ -26,28 +27,30 @@
  */
 public class ApplicationServiceHolder {
 
-    private static OrgApplicationManager orgApplicationManager;
-    private static DiscoverableApplicationManager discoverableApplicationManager;
+    private ApplicationServiceHolder () {}
 
-    /**
-     * Get application management service.
-     *
-     * @return ApplicationManagementService
-     */
-    public static DiscoverableApplicationManager getDiscoverableApplicationManager() {
+    private static class OrgApplicationManagerServiceHolder {
+
+        static final OrgApplicationManager SERVICE = (OrgApplicationManager)
+                PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(OrgApplicationManager.class, null);
+    }
+
+    private static class DiscoverableApplicationManagerServiceHolder {
 
-        return discoverableApplicationManager;
+        static final DiscoverableApplicationManager SERVICE = (DiscoverableApplicationManager)
+                PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(DiscoverableApplicationManager.class, null);
     }
 
     /**
-     * Set application management service.
+     * Get application management service.
      *
-     * @param discoverableApplicationManager
+     * @return ApplicationManagementService
      */
-    public static void setDiscoverableApplicationManager(DiscoverableApplicationManager
-                                                                 discoverableApplicationManager) {
+    public static DiscoverableApplicationManager getDiscoverableApplicationManager() {
 
-        ApplicationServiceHolder.discoverableApplicationManager = discoverableApplicationManager;
+        return DiscoverableApplicationManagerServiceHolder.SERVICE;
     }
 
     /**
@@ -57,16 +60,7 @@ public static void setDiscoverableApplicationManager(DiscoverableApplicationMana
      */
     public static OrgApplicationManager getOrgApplicationManager() {
 
-        return orgApplicationManager;
+        return OrgApplicationManagerServiceHolder.SERVICE;
     }
 
-    /**
-     * Set organization application management service.
-     *
-     * @param orgApplicationManager
-     */
-    public static void setOrgApplicationManager(OrgApplicationManager orgApplicationManager) {
-
-        ApplicationServiceHolder.orgApplicationManager = orgApplicationManager;
-    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OSGIServiceFactory.java
deleted file mode 100644
index 128814e71..000000000
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OSGIServiceFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. 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.user.application.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.application.mgt.DiscoverableApplicationManager;
-
-/**
- * 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 OSGIServiceFactory extends AbstractFactoryBean<DiscoverableApplicationManager> {
-
-    private DiscoverableApplicationManager discoverableApplicationManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return null;
-    }
-
-    @Override
-    protected DiscoverableApplicationManager createInstance() throws Exception {
-
-        if (this.discoverableApplicationManager == null) {
-            DiscoverableApplicationManager applicationManagementService = (DiscoverableApplicationManager)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(DiscoverableApplicationManager.class, null);
-            if (applicationManagementService != null) {
-                this.discoverableApplicationManager = applicationManagementService;
-            } else {
-                throw new Exception("Unable to retrieve DiscoverableApplicationManager service.");
-            }
-        }
-        return this.discoverableApplicationManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OrganizationManagementOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OrganizationManagementOSGIServiceFactory.java
deleted file mode 100644
index 8129c35ab..000000000
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OrganizationManagementOSGIServiceFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2024, WSO2 LLC. (https://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.user.application.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the OrganizationManagementOSGIServiceFactory class and used to get OrganizationManagementOSGIService OSGI
- * service.
- */
-public class OrganizationManagementOSGIServiceFactory extends AbstractFactoryBean<OrgApplicationManager> {
-
-    private OrgApplicationManager orgApplicationManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return null;
-    }
-
-    @Override
-    protected OrgApplicationManager createInstance() throws Exception {
-
-        if (this.orgApplicationManager == null) {
-            OrgApplicationManager applicationManagementService = (OrgApplicationManager)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(OrgApplicationManager.class, null);
-            if (applicationManagementService != null) {
-                this.orgApplicationManager = applicationManagementService;
-            } else {
-                throw new Exception("Unable to retrieve OrgApplicationManager service.");
-            }
-        }
-        return this.orgApplicationManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/pom.xml
index c4894d8cc..81a35fa36 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-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
@@ -110,11 +110,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>
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/MeApi.java
index ea51bbaab..ea7324399 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/MeApi.java
@@ -1,26 +1,27 @@
 /*
-* Copyright (c) 2019, 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) 2019-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.rest.api.user.application.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import org.wso2.carbon.identity.rest.api.user.application.v1.factories.MeApiServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.application.v1.model.ApplicationListResponse;
 import org.wso2.carbon.identity.rest.api.user.application.v1.model.ApplicationResponse;
 import org.wso2.carbon.identity.rest.api.user.application.v1.model.Error;
-import org.wso2.carbon.identity.rest.api.user.application.v1.MeApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -34,8 +35,12 @@
 
 public class MeApi  {
 
-    @Autowired
-    private MeApiService delegate;
+    private final MeApiService delegate;
+
+    public MeApi(){
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/MeApiServiceFactory.java
index 97447af34..1cc877b45 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/MeApiServiceFactory.java
@@ -1,30 +1,40 @@
 /*
-* Copyright (c) 2019, 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) 2019-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.rest.api.user.application.v1.factories;
 
 import org.wso2.carbon.identity.rest.api.user.application.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.application.v1.impl.MeApiServiceImpl;
 
+/**
+ * Factory class for MeApiService.
+ */
 public class MeApiServiceFactory {
 
-   private final static MeApiService service = new MeApiServiceImpl();
+   private final static MeApiService SERVICE = new MeApiServiceImpl();
 
+   /**
+    * Get MeApiService
+    *
+    * @return MeApiService
+    */
    public static MeApiService getMeApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/core/ApplicationService.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/core/ApplicationService.java
index 9ac7b0231..d204fd8fe 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/core/ApplicationService.java
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/core/ApplicationService.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-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,17 +23,18 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.api.user.application.common.ApplicationServiceConstants;
-import org.wso2.carbon.identity.api.user.application.common.ApplicationServiceHolder;
 import org.wso2.carbon.identity.api.user.common.ContextLoader;
 import org.wso2.carbon.identity.api.user.common.error.APIError;
 import org.wso2.carbon.identity.api.user.common.error.ErrorResponse;
 import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException;
 import org.wso2.carbon.identity.application.common.model.ApplicationBasicInfo;
+import org.wso2.carbon.identity.application.mgt.DiscoverableApplicationManager;
 import org.wso2.carbon.identity.base.IdentityException;
 import org.wso2.carbon.identity.core.model.ExpressionNode;
 import org.wso2.carbon.identity.core.model.FilterTreeBuilder;
 import org.wso2.carbon.identity.core.model.Node;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
+import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
 import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException;
 import org.wso2.carbon.identity.organization.management.service.util.OrganizationManagementUtil;
 import org.wso2.carbon.identity.rest.api.user.application.v1.core.function.ApplicationBasicInfoToApiModel;
@@ -59,11 +60,21 @@
  */
 public class ApplicationService {
 
+    private final OrgApplicationManager orgApplicationManager;
+    private final DiscoverableApplicationManager discoverableApplicationManager;
+
     private static final String APPLICATIONS_PAGINATION_LINK_FORMAT = "/v1/me/applications?offset=%d&limit=%d";
     private static final Log LOG = LogFactory.getLog(ApplicationService.class);
     private static final String PAGE_LINK_REL_NEXT = "next";
     private static final String PAGE_LINK_REL_PREVIOUS = "previous";
 
+    public ApplicationService (OrgApplicationManager orgApplicationManager, DiscoverableApplicationManager
+            discoverableApplicationManager) {
+
+        this.orgApplicationManager = orgApplicationManager;
+        this.discoverableApplicationManager = discoverableApplicationManager;
+    }
+
     /**
      * Get application from application ID.
      *
@@ -75,7 +86,7 @@ public ApplicationResponse getApplication(String applicationId) {
         try {
 
             String tenantDomain = IdentityTenantUtil.resolveTenantDomain();
-            ApplicationBasicInfo applicationBasicInfo = ApplicationServiceHolder.getDiscoverableApplicationManager()
+            ApplicationBasicInfo applicationBasicInfo = discoverableApplicationManager
                     .getDiscoverableApplicationBasicInfoByResourceId(applicationId, tenantDomain);
             if (applicationBasicInfo == null) {
                 throw handleNotFoundError(applicationId, ApplicationServiceConstants.ErrorMessage
@@ -130,10 +141,10 @@ private List<ApplicationBasicInfo> getDiscoverableApplicationBasicInfo(int limit
 
         try {
             if (OrganizationManagementUtil.isOrganization(tenantDomain)) {
-                return ApplicationServiceHolder.getOrgApplicationManager().getDiscoverableSharedApplicationBasicInfo(
+                return orgApplicationManager.getDiscoverableSharedApplicationBasicInfo(
                         limit, offset, filter, sortOrder, sortBy, tenantDomain);
             }
-            return ApplicationServiceHolder.getDiscoverableApplicationManager().getDiscoverableApplicationBasicInfo(
+            return discoverableApplicationManager.getDiscoverableApplicationBasicInfo(
                     limit, offset, filter, sortOrder, sortBy, tenantDomain);
         } catch (OrganizationManagementException e) {
             throw new IdentityApplicationManagementException(e.getMessage(), e);
@@ -145,11 +156,9 @@ private int getCountOfDiscoverableApplications(String filter, String tenantDomai
 
         try {
             if (OrganizationManagementUtil.isOrganization(tenantDomain)) {
-                return ApplicationServiceHolder.getOrgApplicationManager()
-                        .getCountOfDiscoverableSharedApplications(filter, tenantDomain);
+                return orgApplicationManager.getCountOfDiscoverableSharedApplications(filter, tenantDomain);
             }
-            return ApplicationServiceHolder.getDiscoverableApplicationManager()
-                    .getCountOfDiscoverableApplications(filter, tenantDomain);
+            return discoverableApplicationManager.getCountOfDiscoverableApplications(filter, tenantDomain);
         } catch (OrganizationManagementException e) {
             throw new IdentityApplicationManagementException(e.getMessage(), e);
         }
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/ApplicationServiceFactory.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/ApplicationServiceFactory.java
new file mode 100644
index 000000000..c39207bf0
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/ApplicationServiceFactory.java
@@ -0,0 +1,59 @@
+/*
+ * 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.rest.api.user.application.v1.factories;
+
+import org.wso2.carbon.identity.api.user.application.common.ApplicationServiceHolder;
+import org.wso2.carbon.identity.application.mgt.DiscoverableApplicationManager;
+import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
+import org.wso2.carbon.identity.rest.api.user.application.v1.core.ApplicationService;
+
+/**
+ * Factory to return ApplicationService.
+ */
+public class ApplicationServiceFactory {
+
+    private static final ApplicationService SERVICE;
+
+    static {
+        OrgApplicationManager orgApplicationManager = ApplicationServiceHolder
+                .getOrgApplicationManager();
+        DiscoverableApplicationManager discoverableApplicationManager = ApplicationServiceHolder
+                .getDiscoverableApplicationManager();
+
+        if (orgApplicationManager == null) {
+            throw new IllegalStateException("OrgApplicationManager not available in the OSGi context.");
+        } else if (discoverableApplicationManager == null) {
+            throw new IllegalStateException("DiscoverableApplicationManager not available in the OSGi context.");
+        }
+
+        SERVICE = new ApplicationService(orgApplicationManager, discoverableApplicationManager);
+
+    }
+
+    /**
+     * Get ApplicationService instance.
+     *
+     * @return ApplicationService instance.
+     */
+    public static ApplicationService getApplicationService() {
+
+        return SERVICE;
+    }
+
+}
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/impl/MeApiServiceImpl.java
index 82380488d..211eecb0c 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/impl/MeApiServiceImpl.java
@@ -1,24 +1,26 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.application.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.application.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.application.v1.core.ApplicationService;
+import org.wso2.carbon.identity.rest.api.user.application.v1.factories.ApplicationServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -27,8 +29,15 @@
  */
 public class MeApiServiceImpl implements MeApiService {
 
-    @Autowired
-    private ApplicationService applicationService;
+    private final ApplicationService applicationService;
+
+    public MeApiServiceImpl () {
+        try {
+            this.applicationService = ApplicationServiceFactory.getApplicationService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initializing ApplicationService.", e);
+        }
+    }
 
     @Override
     public Response getApplication(String applicationId) {
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/resources/META-INF/cxf/application-user-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/resources/META-INF/cxf/application-user-v1-cxf.xml
deleted file mode 100644
index 675278ed0..000000000
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/resources/META-INF/cxf/application-user-v1-cxf.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. 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.
-  -->
-
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-    <bean class="org.wso2.carbon.identity.rest.api.user.application.v1.impl.MeApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.application.v1.core.ApplicationService"/>
-    <bean id="applicationHolderBean"
-          class="org.wso2.carbon.identity.api.user.application.common.ApplicationServiceHolder">
-        <property name="discoverableApplicationManager" ref="identityApplicationServiceFactoryBean"/>
-        <property name="orgApplicationManager" ref="organizationManagementServiceFactoryBean"/>
-    </bean>
-    <bean id="identityApplicationServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.application.common.factory.OSGIServiceFactory"/>
-    <bean id="organizationManagementServiceFactoryBean"
-            class="org.wso2.carbon.identity.api.user.application.common.factory.OrganizationManagementOSGIServiceFactory"/>
-</beans>

From 9030284a9882c3c8a6add91561a80b2ac88986f9 Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Fri, 10 Jan 2025 17:09:17 +0530
Subject: [PATCH 02/15] Remove Spring dependency from api.user.organization

---
 .../pom.xml                                   |  7 +-
 .../common/UserOrganizationServiceHolder.java | 65 ++++++++-----------
 ...plicationManagementOSGIServiceFactory.java | 54 ---------------
 ...anizationManagementOSGIServiceFactory.java | 53 ---------------
 ...serResidentResolverOSGIServiceFactory.java | 56 ----------------
 .../pom.xml                                   |  7 +-
 .../rest/api/user/organization/v1/MeApi.java  | 13 ++--
 .../api/user/organization/v1/RootApi.java     | 13 ++--
 .../v1/factories/MeApiServiceFactory.java     |  6 +-
 .../v1/factories/RootApiServiceFactory.java   |  6 +-
 .../v1/core/UserOrganizationService.java      | 22 +++++--
 .../UserOrganizationServiceFactory.java       | 64 ++++++++++++++++++
 .../v1/impl/MeApiServiceImpl.java             | 15 +++--
 .../v1/impl/RootApiServiceImpl.java           | 15 +++--
 .../META-INF/cxf/user-organization-v1-cxf.xml | 38 -----------
 15 files changed, 153 insertions(+), 281 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/factory/ApplicationManagementOSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/factory/OrganizationManagementOSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/factory/OrganizationUserResidentResolverOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/factories/UserOrganizationServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/resources/META-INF/cxf/user-organization-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/pom.xml b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/pom.xml
index 74107750e..9489c2008 100644
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023-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
@@ -29,11 +29,6 @@
     <artifactId>org.wso2.carbon.identity.api.user.organization.common</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.core</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/UserOrganizationServiceHolder.java b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/UserOrganizationServiceHolder.java
index 22ccd4dbe..78ab8ab64 100644
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/UserOrganizationServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/UserOrganizationServiceHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.user.organization.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
 import org.wso2.carbon.identity.organization.management.service.OrganizationManager;
 import org.wso2.carbon.identity.organization.management.service.OrganizationUserResidentResolverService;
@@ -27,51 +28,47 @@
  */
 public class UserOrganizationServiceHolder {
 
-    private static OrganizationUserResidentResolverService organizationUserResidentResolverService;
+    private UserOrganizationServiceHolder () {}
 
-    private static OrganizationManager organizationManagementService;
-    private static ApplicationManagementService applicationManagementService;
+    private static class OrganizationUserResidentResolverServiceHolder {
 
-    /**
-     * Method to get the organization user resident resolver OSGi service.
-     *
-     * @return OrganizationUserResidentResolverService.
-     */
-    public static OrganizationUserResidentResolverService getOrganizationUserResidentResolverService() {
+        static final OrganizationUserResidentResolverService SERVICE = (OrganizationUserResidentResolverService)
+                PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(OrganizationUserResidentResolverService.class, null);
+    }
 
-        return organizationUserResidentResolverService;
+    private static class OrganizationManagementServiceHolder {
+
+        static final OrganizationManager SERVICE = (OrganizationManager)
+                PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(OrganizationManager.class, null);
     }
 
-    /**
-     * Set OrganizationUserResidentResolverService OSGi service.
-     *
-     * @param organizationUserResidentResolverService OrganizationUserResidentResolverService.
-     */
-    public static void setOrganizationUserResidentResolverService(
-            OrganizationUserResidentResolverService organizationUserResidentResolverService) {
+    private static class ApplicationManagementServiceHolder {
 
-        UserOrganizationServiceHolder.organizationUserResidentResolverService = organizationUserResidentResolverService;
+        static final ApplicationManagementService SERVICE = (ApplicationManagementService)
+                PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(ApplicationManagementService.class, null);
     }
 
     /**
-     * Get organization management service.
+     * Method to get the organization user resident resolver OSGi service.
      *
-     * @return Organization management service.
+     * @return OrganizationUserResidentResolverService.
      */
-    public static OrganizationManager getOrganizationManagementService() {
+    public static OrganizationUserResidentResolverService getOrganizationUserResidentResolverService() {
 
-        return organizationManagementService;
+        return OrganizationUserResidentResolverServiceHolder.SERVICE;
     }
 
     /**
-     * Set Organization management OSGi service.
+     * Get organization management service.
      *
-     * @param organizationManagementService Organization management service.
+     * @return Organization management service.
      */
-    public static void setOrganizationManagementService(
-            OrganizationManager organizationManagementService) {
+    public static OrganizationManager getOrganizationManagementService() {
 
-        UserOrganizationServiceHolder.organizationManagementService = organizationManagementService;
+        return OrganizationManagementServiceHolder.SERVICE;
     }
 
     /**
@@ -81,17 +78,7 @@ public static void setOrganizationManagementService(
      */
     public static ApplicationManagementService getApplicationManagementService() {
 
-        return applicationManagementService;
+        return ApplicationManagementServiceHolder.SERVICE;
     }
 
-    /**
-     * Set application management OSGi service.
-     *
-     * @param applicationManagementService Application management service.
-     */
-    public static void setApplicationManagementService(
-            ApplicationManagementService applicationManagementService) {
-
-        UserOrganizationServiceHolder.applicationManagementService = applicationManagementService;
-    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/factory/ApplicationManagementOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/factory/ApplicationManagementOSGIServiceFactory.java
deleted file mode 100644
index c82eb229d..000000000
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/factory/ApplicationManagementOSGIServiceFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.user.organization.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 ApplicationManagementOSGIServiceFactory extends AbstractFactoryBean<ApplicationManagementService> {
-
-    private ApplicationManagementService applicationManagementService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected ApplicationManagementService createInstance() throws Exception {
-
-        if (this.applicationManagementService == null) {
-            ApplicationManagementService service = (ApplicationManagementService) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(ApplicationManagementService.class, null);
-            if (service != null) {
-                this.applicationManagementService = service;
-            } else {
-                throw new Exception("Unable to retrieve Application Management service.");
-            }
-        }
-        return this.applicationManagementService;
-    }
-
-}
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/factory/OrganizationManagementOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/factory/OrganizationManagementOSGIServiceFactory.java
deleted file mode 100644
index 90e939013..000000000
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/factory/OrganizationManagementOSGIServiceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2023, 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.user.organization.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.organization.management.service.OrganizationManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the OrganizationManager type of object inside the container.
- */
-public class OrganizationManagementOSGIServiceFactory extends AbstractFactoryBean<OrganizationManager> {
-
-    private OrganizationManager organizationManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected OrganizationManager createInstance() throws Exception {
-
-        if (this.organizationManager == null) {
-            OrganizationManager service = (OrganizationManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(OrganizationManager.class, null);
-            if (service != null) {
-                this.organizationManager = service;
-            } else {
-                throw new Exception("Unable to retrieve OrganizationManager service.");
-            }
-        }
-        return this.organizationManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/factory/OrganizationUserResidentResolverOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/factory/OrganizationUserResidentResolverOSGIServiceFactory.java
deleted file mode 100644
index 2e444fe8f..000000000
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.api.user.organization.common/src/main/java/org/wso2/carbon/identity/api/user/organization/common/factory/OrganizationUserResidentResolverOSGIServiceFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2023, 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.user.organization.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.organization.management.service.OrganizationUserResidentResolverService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the OrganizationUserResidentResolverService type of object inside the container.
- */
-public class OrganizationUserResidentResolverOSGIServiceFactory extends
-        AbstractFactoryBean<OrganizationUserResidentResolverService> {
-
-    private OrganizationUserResidentResolverService organizationUserResidentResolverService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected OrganizationUserResidentResolverService createInstance() throws Exception {
-
-        if (this.organizationUserResidentResolverService == null) {
-            OrganizationUserResidentResolverService service =
-                    (OrganizationUserResidentResolverService) PrivilegedCarbonContext.
-                            getThreadLocalCarbonContext()
-                            .getOSGiService(OrganizationUserResidentResolverService.class, null);
-            if (service != null) {
-                this.organizationUserResidentResolverService = service;
-            } else {
-                throw new Exception("Unable to retrieve OrganizationUserResidentResolverService service.");
-            }
-        }
-        return this.organizationUserResidentResolverService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/pom.xml
index 81cfe7199..592f0c7c1 100644
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023-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
@@ -41,11 +41,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>
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/MeApi.java
index 68c0ea2d0..60ab76b1e 100644
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/MeApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,15 +18,14 @@
 
 package org.wso2.carbon.identity.rest.api.user.organization.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.rest.api.user.organization.v1.factories.MeApiServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.organization.v1.model.Error;
 import org.wso2.carbon.identity.rest.api.user.organization.v1.model.OrganizationsResponse;
-import org.wso2.carbon.identity.rest.api.user.organization.v1.MeApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -40,8 +39,12 @@
 
 public class MeApi  {
 
-    @Autowired
-    private MeApiService delegate;
+    private final MeApiService delegate;
+
+    public MeApi () {
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/RootApi.java b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/RootApi.java
index 951485ca5..64d36e129 100644
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/RootApi.java
+++ b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/RootApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,16 +18,15 @@
 
 package org.wso2.carbon.identity.rest.api.user.organization.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.rest.api.user.organization.v1.factories.RootApiServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.organization.v1.model.BasicOrganizationObject;
 import org.wso2.carbon.identity.rest.api.user.organization.v1.model.Error;
 import org.wso2.carbon.identity.rest.api.user.organization.v1.model.RootOrganizationResponse;
-import org.wso2.carbon.identity.rest.api.user.organization.v1.RootApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -41,8 +40,12 @@
 
 public class RootApi  {
 
-    @Autowired
-    private RootApiService delegate;
+    private final RootApiService delegate;
+
+    public RootApi() {
+
+        this.delegate = RootApiServiceFactory.getRootApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/factories/MeApiServiceFactory.java
index 3e05dc330..da6ed3cae 100644
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/factories/MeApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -23,10 +23,10 @@
 
 public class MeApiServiceFactory {
 
-   private final static MeApiService service = new MeApiServiceImpl();
+   private final static MeApiService SERVICE = new MeApiServiceImpl();
 
    public static MeApiService getMeApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/factories/RootApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/factories/RootApiServiceFactory.java
index eb2e7ddad..2553323da 100644
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/factories/RootApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/organization/v1/factories/RootApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -23,10 +23,10 @@
 
 public class RootApiServiceFactory {
 
-   private final static RootApiService service = new RootApiServiceImpl();
+   private final static RootApiService SERVICE = new RootApiServiceImpl();
 
    public static RootApiService getRootApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/core/UserOrganizationService.java b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/core/UserOrganizationService.java
index 6a4ac0b66..517ba4d22 100644
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/core/UserOrganizationService.java
+++ b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/core/UserOrganizationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -23,7 +23,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.api.user.organization.common.UserOrganizationServiceHolder;
 import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException;
 import org.wso2.carbon.identity.application.common.model.ApplicationBasicInfo;
 import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
@@ -73,8 +72,21 @@
  */
 public class UserOrganizationService {
 
+    private final OrganizationUserResidentResolverService organizationUserResidentResolverService;
+    private final OrganizationManager organizationManagementService;
+    private final ApplicationManagementService applicationManagementService;
+
     private static final Log LOG = LogFactory.getLog(UserOrganizationService.class);
 
+    public UserOrganizationService (OrganizationUserResidentResolverService organizationUserResidentResolverService,
+                                    OrganizationManager organizationManagementService,
+                                    ApplicationManagementService applicationManagementService) {
+
+        this.organizationUserResidentResolverService = organizationUserResidentResolverService;
+        this.organizationManagementService = organizationManagementService;
+        this.applicationManagementService = applicationManagementService;
+    }
+
     /**
      * Retrieves the root organization visible to the user in the organization hierarchy.
      *
@@ -165,17 +177,17 @@ private RootOrganizationResponse buildRootOrganizationResponse(String rootOrgId)
 
     private OrganizationUserResidentResolverService getOrganizationUserResidentResolverService() {
 
-        return UserOrganizationServiceHolder.getOrganizationUserResidentResolverService();
+        return organizationUserResidentResolverService;
     }
 
     private OrganizationManager getOrganizationManagementService() {
 
-        return UserOrganizationServiceHolder.getOrganizationManagementService();
+        return organizationManagementService;
     }
 
     private ApplicationManagementService getApplicationManagementService() {
 
-        return UserOrganizationServiceHolder.getApplicationManagementService();
+        return applicationManagementService;
     }
 
     private int validateLimit(Integer limit) {
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/factories/UserOrganizationServiceFactory.java b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/factories/UserOrganizationServiceFactory.java
new file mode 100644
index 000000000..a623ea9c5
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/factories/UserOrganizationServiceFactory.java
@@ -0,0 +1,64 @@
+/*
+ * 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.rest.api.user.organization.v1.factories;
+
+import org.wso2.carbon.identity.api.user.organization.common.UserOrganizationServiceHolder;
+import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
+import org.wso2.carbon.identity.organization.management.service.OrganizationManager;
+import org.wso2.carbon.identity.organization.management.service.OrganizationUserResidentResolverService;
+import org.wso2.carbon.identity.rest.api.user.organization.v1.core.UserOrganizationService;
+
+/**
+ * Factory class for UserOrganizationService.
+ */
+public class UserOrganizationServiceFactory {
+
+    private static final UserOrganizationService SERVICE;
+
+    static {
+        OrganizationUserResidentResolverService organizationUserResidentResolverService =
+                UserOrganizationServiceHolder.getOrganizationUserResidentResolverService();
+        OrganizationManager organizationManagementService =
+                UserOrganizationServiceHolder.getOrganizationManagementService();
+        ApplicationManagementService applicationManagementService =
+                UserOrganizationServiceHolder.getApplicationManagementService();
+
+        if (organizationUserResidentResolverService == null) {
+            throw new IllegalStateException(
+                    "OrganizationUserResidentResolverService is not available from OSGi context.");
+        } else if (organizationManagementService == null) {
+            throw new IllegalStateException("OrganizationManagementService is not available from OSGi context.");
+        } else if (applicationManagementService == null) {
+            throw new IllegalStateException("ApplicationManagementService is not available from OSGi context.");
+        }
+
+        SERVICE = new UserOrganizationService(organizationUserResidentResolverService, organizationManagementService,
+                applicationManagementService);
+    }
+
+    /**
+     * Get UserOrganizationService
+     *
+     * @return UserOrganizationService
+     */
+    public static UserOrganizationService getUserOrganizationService() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/impl/MeApiServiceImpl.java
index f7a44e8f1..60254a886 100644
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/impl/MeApiServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,9 +18,9 @@
 
 package org.wso2.carbon.identity.rest.api.user.organization.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.organization.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.organization.v1.core.UserOrganizationService;
+import org.wso2.carbon.identity.rest.api.user.organization.v1.factories.UserOrganizationServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -29,8 +29,15 @@
  */
 public class MeApiServiceImpl implements MeApiService {
 
-    @Autowired
-    UserOrganizationService userOrganizationService;
+    private final UserOrganizationService userOrganizationService;
+
+    public MeApiServiceImpl() {
+        try {
+            this.userOrganizationService = UserOrganizationServiceFactory.getUserOrganizationService();
+        } catch (Exception e) {
+            throw new RuntimeException("Error occurred while initiating UserOrganizationService.", e);
+        }
+    }
 
     @Override
     public Response rootGet(String filter, Integer limit, String after, String before, Boolean recursive,
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/impl/RootApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/impl/RootApiServiceImpl.java
index 48789ee70..1fc3573c7 100644
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/impl/RootApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/organization/v1/impl/RootApiServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,9 +18,9 @@
 
 package org.wso2.carbon.identity.rest.api.user.organization.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.organization.v1.RootApiService;
 import org.wso2.carbon.identity.rest.api.user.organization.v1.core.UserOrganizationService;
+import org.wso2.carbon.identity.rest.api.user.organization.v1.factories.UserOrganizationServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -29,8 +29,15 @@
  */
 public class RootApiServiceImpl implements RootApiService {
 
-    @Autowired
-    UserOrganizationService userOrganizationService;
+    private final UserOrganizationService userOrganizationService;
+
+    public RootApiServiceImpl() {
+        try {
+            this.userOrganizationService = UserOrganizationServiceFactory.getUserOrganizationService();
+        } catch (Exception e) {
+            throw new RuntimeException("Error occurred while initiating UserOrganizationService.", e);
+        }
+    }
 
     @Override
     public Response rootGet() {
diff --git a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/resources/META-INF/cxf/user-organization-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/resources/META-INF/cxf/user-organization-v1-cxf.xml
deleted file mode 100644
index 1e3b0ab89..000000000
--- a/components/org.wso2.carbon.identity.api.user.organization/org.wso2.carbon.identity.rest.api.user.organization.v1/src/main/resources/META-INF/cxf/user-organization-v1-cxf.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2023, 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.
-  -->
-
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-    <bean class="org.wso2.carbon.identity.rest.api.user.organization.v1.impl.RootApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.organization.v1.impl.MeApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.organization.v1.core.UserOrganizationService"/>
-
-    <bean id="OrganizationUserResidentResolverServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.organization.common.factory.OrganizationUserResidentResolverOSGIServiceFactory"/>
-    <bean id="OrganizationMgtServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.organization.common.factory.OrganizationManagementOSGIServiceFactory"/>
-    <bean id="ApplicationManagementServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.organization.common.factory.ApplicationManagementOSGIServiceFactory"/>
-    <bean id="UserOrganizationManagementServiceHolderBean"
-          class="org.wso2.carbon.identity.api.user.organization.common.UserOrganizationServiceHolder">
-        <property name="organizationUserResidentResolverService" ref="OrganizationUserResidentResolverServiceFactoryBean"/>
-        <property name="organizationManagementService" ref="OrganizationMgtServiceFactoryBean"/>
-        <property name="applicationManagementService" ref="ApplicationManagementServiceFactoryBean"/>
-    </bean>
-</beans>

From cbf55aab38c27fd28890e29de867a79f17776e25 Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Fri, 10 Jan 2025 17:12:37 +0530
Subject: [PATCH 03/15] Remove Spring dependency from api.user.session

---
 .../pom.xml                                   |  9 +--
 .../common/factory/OSGIServiceFactory.java    | 52 -----------------
 .../RealmServiceOSGIServiceFactory.java       | 52 -----------------
 .../util/SessionManagementServiceHolder.java  | 37 +++++++-----
 .../pom.xml                                   |  9 +--
 .../rest/api/user/session/v1/MeApi.java       | 28 ++++++----
 .../rest/api/user/session/v1/SessionsApi.java | 28 ++++++----
 .../rest/api/user/session/v1/UserIdApi.java   | 28 ++++++----
 .../v1/factories/MeApiServiceFactory.java     |  8 +--
 .../factories/SessionsApiServiceFactory.java  | 22 ++++----
 .../v1/factories/UserIdApiServiceFactory.java |  8 +--
 .../v1/core/SessionManagementService.java     | 30 ++++++----
 .../SessionManagementServiceFactory.java      | 56 +++++++++++++++++++
 .../session/v1/impl/MeApiServiceImpl.java     | 18 ++++--
 .../v1/impl/SessionsApiServiceImpl.java       | 32 +++++++----
 .../session/v1/impl/UserIdApiServiceImpl.java | 18 ++++--
 .../META-INF/cxf/session-user-v1-cxf.xml      | 34 -----------
 17 files changed, 219 insertions(+), 250 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/OSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/RealmServiceOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionManagementServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/resources/META-INF/cxf/session-user-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/pom.xml b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/pom.xml
index 8fce4cf8d..cdf3fb60c 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-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
@@ -32,10 +32,5 @@
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
         </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.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/OSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/OSGIServiceFactory.java
deleted file mode 100644
index a435444d6..000000000
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/OSGIServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2019, 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.user.session.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.application.authentication.framework.UserSessionManagementService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the UserSessionManagementService type of object inside the container.
- */
-public class OSGIServiceFactory extends AbstractFactoryBean<UserSessionManagementService> {
-
-    private UserSessionManagementService userSessionManagementService;
-
-    @Override
-    public Class<?> getObjectType() {
-        return Object.class;
-    }
-
-    @Override
-    protected UserSessionManagementService createInstance() throws Exception {
-
-        if (this.userSessionManagementService == null) {
-            UserSessionManagementService userSessionManagementService = (UserSessionManagementService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(UserSessionManagementService.class, null);
-            if (userSessionManagementService != null) {
-                this.userSessionManagementService = userSessionManagementService;
-            } else {
-                throw new Exception("Unable to retrieve UserSessionManagementService service.");
-            }
-        }
-        return this.userSessionManagementService;
-    }
-
-}
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/RealmServiceOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/RealmServiceOSGIServiceFactory.java
deleted file mode 100644
index 8b94ab88b..000000000
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/RealmServiceOSGIServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2019, 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.user.session.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.user.core.service.RealmService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the RealmService type of object inside the container.
- */
-public class RealmServiceOSGIServiceFactory extends AbstractFactoryBean<RealmService> {
-
-    private RealmService realmService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected RealmService createInstance() throws Exception {
-
-        if (this.realmService == null) {
-            RealmService realmService
-                    = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                    .getOSGiService(RealmService.class, null);
-            if (realmService != null) {
-                this.realmService = realmService;
-            } else {
-                throw new Exception("Unable to retrieve RealmService.");
-            }
-        }
-        return this.realmService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/util/SessionManagementServiceHolder.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/util/SessionManagementServiceHolder.java
index 2d2f0ea38..7d740dee5 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/util/SessionManagementServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/util/SessionManagementServiceHolder.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-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
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.user.session.common.util;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.application.authentication.framework.UserSessionManagementService;
 import org.wso2.carbon.user.core.service.RealmService;
 
@@ -26,9 +27,19 @@
  */
 public class SessionManagementServiceHolder {
 
-    private static UserSessionManagementService userSessionManagementService;
+    private SessionManagementServiceHolder () {}
 
-    private static RealmService realmService;
+    private static class UserSessionManagementServiceHolder {
+
+        static final UserSessionManagementService SERVICE = (UserSessionManagementService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(UserSessionManagementService.class, null);
+    }
+
+    private static class RealmServiceHolder {
+
+        static final RealmService SERVICE = (RealmService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(RealmService.class, null);
+    }
 
     /**
      * Method to get the session management osgi service.
@@ -36,20 +47,16 @@ public class SessionManagementServiceHolder {
      * @return UserSessionManagementService
      */
     public static UserSessionManagementService getUserSessionManagementService() {
-        return userSessionManagementService;
-    }
-
-    public static void setUserSessionManagementService(UserSessionManagementService userSessionManagementService) {
-        SessionManagementServiceHolder.userSessionManagementService = userSessionManagementService;
+        return UserSessionManagementServiceHolder.SERVICE;
     }
 
+    /**
+     * Method to get the realm service osgi service.
+     *
+     * @return RealmService
+     */
     public static RealmService getRealmService() {
 
-        return realmService;
-    }
-
-    public static void setRealmService(RealmService realmService) {
-
-        SessionManagementServiceHolder.realmService = realmService;
+        return RealmServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/pom.xml
index e18ca5f8d..21a8e8aa5 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-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
@@ -84,11 +84,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>
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/MeApi.java
index bf453c435..f030764d3 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/MeApi.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.session.v1;
@@ -21,8 +23,8 @@
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionsDTO;
+import org.wso2.carbon.identity.rest.api.user.session.v1.factories.MeApiServiceFactory;
 
 import javax.validation.Valid;
 import javax.ws.rs.DELETE;
@@ -37,8 +39,12 @@
 @Api(value = "/me", description = "the me API")
 public class MeApi {
 
-    @Autowired
-    private MeApiService delegate;
+    private final MeApiService delegate;
+
+    public MeApi () {
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/SessionsApi.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/SessionsApi.java
index 551a36358..6d04cd7b8 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/SessionsApi.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/SessionsApi.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.session.v1;
@@ -21,8 +23,8 @@
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SearchResponseDTO;
+import org.wso2.carbon.identity.rest.api.user.session.v1.factories.SessionsApiServiceFactory;
 
 import javax.validation.Valid;
 import javax.ws.rs.GET;
@@ -35,8 +37,12 @@
 @Api(value = "/sessions", description = "the sessions API")
 public class SessionsApi {
 
-    @Autowired
-    private SessionsApiService delegate;
+    private final SessionsApiService delegate;
+
+    public SessionsApi () {
+
+        this.delegate = SessionsApiServiceFactory.getSessionsApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/UserIdApi.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/UserIdApi.java
index 71e81b025..1105ef92b 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/UserIdApi.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/UserIdApi.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.session.v1;
@@ -21,9 +23,9 @@
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionDTO;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionsDTO;
+import org.wso2.carbon.identity.rest.api.user.session.v1.factories.UserIdApiServiceFactory;
 
 import javax.validation.Valid;
 import javax.ws.rs.DELETE;
@@ -38,8 +40,12 @@
 @Api(value = "/{user-id}", description = "the {user-id} API")
 public class UserIdApi {
 
-    @Autowired
-    private UserIdApiService delegate;
+    private final UserIdApiService delegate;
+
+    public UserIdApi () {
+
+        this.delegate = UserIdApiServiceFactory.getUserIdApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/MeApiServiceFactory.java
index b7a62b395..b88f2b55f 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/MeApiServiceFactory.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-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,9 +23,9 @@
 
 public class MeApiServiceFactory {
 
-    private static final MeApiService service = new MeApiServiceImpl();
+    private static final MeApiService SERVICE = new MeApiServiceImpl();
 
     public static MeApiService getMeApi() {
-        return service;
+        return SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionsApiServiceFactory.java
index 50ca7251b..86b44a7c6 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionsApiServiceFactory.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.session.v1.factories;
@@ -21,9 +23,9 @@
 
 public class SessionsApiServiceFactory {
 
-    private static final SessionsApiService service = new SessionsApiServiceImpl();
+    private static final SessionsApiService SERVICE = new SessionsApiServiceImpl();
 
     public static SessionsApiService getSessionsApi() {
-        return service;
+        return SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/UserIdApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/UserIdApiServiceFactory.java
index be26909a3..e420ff33d 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/UserIdApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/UserIdApiServiceFactory.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-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,9 +23,9 @@
 
 public class UserIdApiServiceFactory {
 
-    private static final UserIdApiService service = new UserIdApiServiceImpl();
+    private static final UserIdApiService SERVICE = new UserIdApiServiceImpl();
 
     public static UserIdApiService getUserIdApi() {
-        return service;
+        return SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/core/SessionManagementService.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/core/SessionManagementService.java
index f236620f2..c6d4fafb2 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/core/SessionManagementService.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/core/SessionManagementService.java
@@ -26,7 +26,7 @@
 import org.wso2.carbon.identity.api.user.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.user.common.function.UserToUniqueId;
 import org.wso2.carbon.identity.api.user.session.common.constant.SessionManagementConstants;
-import org.wso2.carbon.identity.api.user.session.common.util.SessionManagementServiceHolder;
+import org.wso2.carbon.identity.application.authentication.framework.UserSessionManagementService;
 import org.wso2.carbon.identity.application.authentication.framework.exception.UserSessionException;
 import org.wso2.carbon.identity.application.authentication.framework.exception.session.mgt.SessionManagementClientException;
 import org.wso2.carbon.identity.application.authentication.framework.exception.session.mgt.SessionManagementException;
@@ -45,6 +45,7 @@
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SearchResponseDTO;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionDTO;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionsDTO;
+import org.wso2.carbon.user.core.service.RealmService;
 
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -74,6 +75,9 @@
  */
 public class SessionManagementService {
 
+    private final UserSessionManagementService userSessionManagementService;
+    private final RealmService realmService;
+
     private static final String FEDERATED_USER_DOMAIN = "FEDERATED";
     private static final String IS_FEDERATED_USER = "isFederatedUser";
     private static final String IDP_NAME = "idpName";
@@ -81,6 +85,13 @@ public class SessionManagementService {
     private static final String SESSIONS_SEARCH_ENDPOINT = "/v1/sessions";
     private static final Integer SESSIONS_SEARCH_DEFAULT_LIMIT = 20;
 
+    public SessionManagementService(UserSessionManagementService userSessionManagementService,
+                                    RealmService realmService) {
+
+        this.userSessionManagementService = userSessionManagementService;
+        this.realmService = realmService;
+    }
+
     /**
      * Get all the active sessions of a given user.
      *
@@ -154,8 +165,7 @@ public SessionsDTO getSessionsByUserId(String userId, Integer limit, Integer off
         try {
             if (!StringUtils.isBlank(userId)) {
                 sessions = new SessionsDTO();
-                sessionsForUser = SessionManagementServiceHolder.getUserSessionManagementService()
-                        .getSessionsByUserId(userId);
+                sessionsForUser = userSessionManagementService.getSessionsByUserId(userId);
                 sessions.setUserId(userId);
                 sessions.setSessions(buildSessionDTOs(sessionsForUser));
             }
@@ -184,8 +194,7 @@ public Optional<SessionDTO> getSessionBySessionId(String userId, String sessionI
                 String message = "Session ID is not provided to perform session management tasks.";
                 throw new SessionManagementClientException(ERROR_CODE_INVALID_SESSION, message);
             }
-            return SessionManagementServiceHolder.getUserSessionManagementService()
-                    .getSessionBySessionId(userId, sessionId)
+            return userSessionManagementService.getSessionBySessionId(userId, sessionId)
                     .map(new UserSessionToExternal());
         } catch (SessionManagementException e) {
             throw handleSessionManagementException(e);
@@ -212,8 +221,8 @@ public SearchResponseDTO getSessions(String tenantDomain, String filter, Integer
             String sortOrder = since != null ? SessionMgtConstants.ASC : SessionMgtConstants.DESC;
             SearchResponseDTO response = new SearchResponseDTO();
 
-            List<UserSession> results = SessionManagementServiceHolder.getUserSessionManagementService()
-                    .getSessions(tenantDomain, filterNodes, limit + 1, sortOrder);
+            List<UserSession> results =
+                    userSessionManagementService.getSessions(tenantDomain, filterNodes, limit + 1, sortOrder);
 
             if (!results.isEmpty()) {
                 boolean hasMoreItems = results.size() > limit;
@@ -260,8 +269,7 @@ public void terminateSessionBySessionId(String userId, String sessionId) {
 
         try {
             if (userId != null && sessionId != null) {
-                SessionManagementServiceHolder.getUserSessionManagementService().terminateSessionBySessionId(userId,
-                        sessionId);
+                userSessionManagementService.terminateSessionBySessionId(userId, sessionId);
             } else {
                 throw handleForbiddenAction();
             }
@@ -283,7 +291,7 @@ public void terminateSessionsByUserId(String userId) {
 
         try {
             if (userId != null) {
-                SessionManagementServiceHolder.getUserSessionManagementService().terminateSessionsByUserId(userId);
+                userSessionManagementService.terminateSessionsByUserId(userId);
             }
         } catch (SessionManagementException e) {
             throw handleSessionManagementException(e);
@@ -365,7 +373,7 @@ private APIError handleForbiddenAction() {
 
     private String getUserIdFromUser(User user) {
 
-        return new UserToUniqueId().apply(SessionManagementServiceHolder.getRealmService(), user);
+        return new UserToUniqueId().apply(realmService, user);
     }
 
     private String getFederatedUserIdFromUser(User user) {
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionManagementServiceFactory.java
new file mode 100644
index 000000000..f2a81d31b
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionManagementServiceFactory.java
@@ -0,0 +1,56 @@
+/*
+ * 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.rest.api.user.session.v1.factories;
+
+import org.wso2.carbon.identity.api.user.session.common.util.SessionManagementServiceHolder;
+import org.wso2.carbon.identity.application.authentication.framework.UserSessionManagementService;
+import org.wso2.carbon.identity.rest.api.user.session.v1.core.SessionManagementService;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * Factory class for SessionManagementService.
+ */
+public class SessionManagementServiceFactory {
+
+    private static final SessionManagementService SERVICE;
+
+    static {
+        UserSessionManagementService userSessionManagementService =
+                SessionManagementServiceHolder.getUserSessionManagementService();
+        RealmService realmService = SessionManagementServiceHolder.getRealmService();
+
+        if (userSessionManagementService == null) {
+            throw new IllegalStateException("UserSessionManagementService is not available in the OSGi context.");
+        } else if (realmService == null) {
+            throw new IllegalStateException("RealmService is not available in the OSGi context.");
+        }
+
+        SERVICE = new SessionManagementService(userSessionManagementService, realmService);
+    }
+
+    /**
+     * Method to get the session management service.
+     *
+     * @return SessionManagementService
+     */
+    public static SessionManagementService getSessionManagementService() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/MeApiServiceImpl.java
index 4ba397987..a830c7416 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/MeApiServiceImpl.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-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
@@ -18,10 +18,10 @@
 
 package org.wso2.carbon.identity.rest.api.user.session.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.session.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.core.SessionManagementService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionsDTO;
+import org.wso2.carbon.identity.rest.api.user.session.v1.factories.SessionManagementServiceFactory;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -33,8 +33,16 @@
  */
 public class MeApiServiceImpl extends MeApiService {
 
-    @Autowired
-    private SessionManagementService sessionManagementService;
+    private final SessionManagementService sessionManagementService;
+
+    public MeApiServiceImpl() {
+
+        try {
+            sessionManagementService = SessionManagementServiceFactory.getSessionManagementService();
+        } catch (Exception e) {
+            throw new RuntimeException("Error occurred while initiating SessionManagementService", e);
+        }
+    }
 
     @Override
     public Response getSessionsOfLoggedInUser(Integer limit, Integer offset, String filter, String sort) {
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/SessionsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/SessionsApiServiceImpl.java
index 2d59ca517..aa5758879 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/SessionsApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/SessionsApiServiceImpl.java
@@ -1,26 +1,28 @@
 /*
- * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.session.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.session.v1.SessionsApiService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.core.SessionManagementService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SearchResponseDTO;
+import org.wso2.carbon.identity.rest.api.user.session.v1.factories.SessionManagementServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -29,8 +31,16 @@
  */
 public class SessionsApiServiceImpl extends SessionsApiService {
 
-    @Autowired
-    private SessionManagementService sessionManagementService;
+    private final SessionManagementService sessionManagementService;
+
+    public SessionsApiServiceImpl() {
+
+        try {
+            sessionManagementService = SessionManagementServiceFactory.getSessionManagementService();
+        } catch (Exception e) {
+            throw new RuntimeException("Error occurred while initiating SessionManagementService.", e);
+        }
+    }
 
     @Override
     public Response getSessions(String filter, Integer limit, Long since, Long until) {
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/UserIdApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/UserIdApiServiceImpl.java
index 082804f11..3b794adcb 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/UserIdApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/UserIdApiServiceImpl.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-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
@@ -21,7 +21,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.identity.api.user.common.Util;
 import org.wso2.carbon.identity.api.user.session.common.util.SessionManagementServiceHolder;
@@ -30,6 +29,7 @@
 import org.wso2.carbon.identity.rest.api.user.session.v1.core.SessionManagementService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionDTO;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionsDTO;
+import org.wso2.carbon.identity.rest.api.user.session.v1.factories.SessionManagementServiceFactory;
 import org.wso2.carbon.user.api.UserRealm;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.core.common.AbstractUserStoreManager;
@@ -45,8 +45,16 @@ public class UserIdApiServiceImpl extends UserIdApiService {
 
     private static final Log log = LogFactory.getLog(UserIdApiServiceImpl.class);
 
-    @Autowired
-    private SessionManagementService sessionManagementService;
+    private final SessionManagementService sessionManagementService;
+
+    public UserIdApiServiceImpl() {
+
+        try {
+            sessionManagementService = SessionManagementServiceFactory.getSessionManagementService();
+        } catch (Exception e) {
+            throw new RuntimeException("Error occurred while initiating SessionManagementService.", e);
+        }
+    }
 
     @Override
     public Response getSessionBySessionId(String userId, String sessionId) {
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/resources/META-INF/cxf/session-user-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/resources/META-INF/cxf/session-user-v1-cxf.xml
deleted file mode 100644
index b2c6414be..000000000
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/resources/META-INF/cxf/session-user-v1-cxf.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. 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.
-  -->
-
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-    <bean class="org.wso2.carbon.identity.rest.api.user.session.v1.core.SessionManagementService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.session.v1.impl.UserIdApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.session.v1.impl.MeApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.session.v1.impl.SessionsApiServiceImpl"/>
-    <bean id="UserSessionServiceHolderBean" class="org.wso2.carbon.identity.api.user.session.common.util.SessionManagementServiceHolder">
-        <property name="userSessionManagementService" ref="userSessionManagementServiceFactoryBean"/>
-        <property name="realmService" ref="RealmServiceOSGIServiceFactoryBean"/>
-    </bean>
-    <bean id="userSessionManagementServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.session.common.factory.OSGIServiceFactory"/>
-    <bean id="RealmServiceOSGIServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.session.common.factory.RealmServiceOSGIServiceFactory"/>
-</beans>

From cd4cb88e6cae01fae51fc40f4265eea36cdd000a Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Fri, 10 Jan 2025 17:13:17 +0530
Subject: [PATCH 04/15] Remove Spring dependency from api.user.association

---
 .../pom.xml                                   | 23 +++--
 .../rest/api/user/association/v1/MeApi.java   | 36 ++++----
 .../api/user/association/v1/UserIdApi.java    | 39 ++++----
 .../v1/factories/MeApiServiceFactory.java     | 28 +++---
 .../v1/factories/UserIdApiServiceFactory.java | 28 +++---
 ...dAssociationManagerOSGIServiceFactory.java | 52 -----------
 .../RealmServiceOSGIServiceFactory.java       | 52 -----------
 ...serAccountConnectorOSGIServiceFactory.java | 51 -----------
 .../v1/core/UserAssociationService.java       | 66 ++++++++------
 .../UserAssociationServiceFactory.java        | 89 +++++++++++++++++++
 .../association/v1/impl/MeApiServiceImpl.java | 34 ++++++-
 .../v1/impl/UserIdApiServiceImpl.java         | 32 ++++++-
 .../v1/util/UserAssociationServiceHolder.java | 68 +++++++++-----
 .../META-INF/cxf/user-association-v1-cxf.xml  | 35 --------
 14 files changed, 315 insertions(+), 318 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/factory/FederatedAssociationManagerOSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/factory/RealmServiceOSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/factory/UserAccountConnectorOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/factories/UserAssociationServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/resources/META-INF/cxf/user-association-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/pom.xml
index 799398f5d..7bb65d1be 100644
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/pom.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+  ~ Copyright (c) 2019-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.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
@@ -66,11 +82,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>
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/MeApi.java
index 7ff8a7fb2..81176b942 100644
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/MeApi.java
@@ -1,39 +1,31 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.association.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.wso2.carbon.identity.rest.api.user.association.v1.dto.*;
-import org.wso2.carbon.identity.rest.api.user.association.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.association.v1.factories.MeApiServiceFactory;
 
 import io.swagger.annotations.ApiParam;
 
-import org.wso2.carbon.identity.rest.api.user.association.v1.dto.ErrorDTO;
 import org.wso2.carbon.identity.rest.api.user.association.v1.dto.UserDTO;
 import org.wso2.carbon.identity.rest.api.user.association.v1.dto.AssociationUserRequestDTO;
 import org.wso2.carbon.identity.rest.api.user.association.v1.dto.FederatedAssociationDTO;
 
-import java.util.List;
-
-import java.io.InputStream;
-import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.apache.cxf.jaxrs.ext.multipart.Multipart;
-
 import javax.validation.Valid;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.*;
@@ -44,8 +36,12 @@
 @io.swagger.annotations.Api(value = "/me", description = "the me API")
 public class MeApi  {
 
-    @Autowired
-    private MeApiService delegate;
+    private final MeApiService delegate;
+
+    public MeApi() {
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @Valid
     @DELETE
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/UserIdApi.java b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/UserIdApi.java
index c4f203819..df33a7b0d 100644
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/UserIdApi.java
+++ b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/UserIdApi.java
@@ -1,37 +1,28 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.association.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.wso2.carbon.identity.rest.api.user.association.v1.dto.*;
-import org.wso2.carbon.identity.rest.api.user.association.v1.UserIdApiService;
-import org.wso2.carbon.identity.rest.api.user.association.v1.factories.UserIdApiServiceFactory;
-
 import io.swagger.annotations.ApiParam;
 
-import org.wso2.carbon.identity.rest.api.user.association.v1.dto.ErrorDTO;
 import org.wso2.carbon.identity.rest.api.user.association.v1.dto.UserDTO;
 import org.wso2.carbon.identity.rest.api.user.association.v1.dto.FederatedAssociationDTO;
-
-import java.util.List;
-
-import java.io.InputStream;
-import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.apache.cxf.jaxrs.ext.multipart.Multipart;
+import org.wso2.carbon.identity.rest.api.user.association.v1.factories.UserIdApiServiceFactory;
 
 import javax.validation.Valid;
 import javax.ws.rs.core.Response;
@@ -43,8 +34,12 @@
 @io.swagger.annotations.Api(value = "/{user-id}", description = "the {user-id} API")
 public class UserIdApi  {
 
-    @Autowired
-    private UserIdApiService delegate;
+    private final UserIdApiService delegate;
+
+    public UserIdApi() {
+
+        this.delegate = UserIdApiServiceFactory.getUserIdApi();
+    }
 
     @Valid
     @DELETE
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/factories/MeApiServiceFactory.java
index cb1fe918e..6709d63c5 100644
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/factories/MeApiServiceFactory.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.association.v1.factories;
@@ -21,10 +23,10 @@
 
 public class MeApiServiceFactory {
 
-   private final static MeApiService service = new MeApiServiceImpl();
+    private final static MeApiService SERVICE = new MeApiServiceImpl();
 
-   public static MeApiService getMeApi()
-   {
-      return service;
-   }
+    public static MeApiService getMeApi() {
+
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/factories/UserIdApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/factories/UserIdApiServiceFactory.java
index cc79f22a6..c32955016 100644
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/factories/UserIdApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/association/v1/factories/UserIdApiServiceFactory.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.association.v1.factories;
@@ -21,10 +23,10 @@
 
 public class UserIdApiServiceFactory {
 
-   private final static UserIdApiService service = new UserIdApiServiceImpl();
+    private final static UserIdApiService SERVICE = new UserIdApiServiceImpl();
 
-   public static UserIdApiService getUserIdApi()
-   {
-      return service;
-   }
+    public static UserIdApiService getUserIdApi() {
+
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/factory/FederatedAssociationManagerOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/factory/FederatedAssociationManagerOSGIServiceFactory.java
deleted file mode 100644
index 38aca9392..000000000
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/factory/FederatedAssociationManagerOSGIServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2019, 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.rest.api.user.association.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.user.profile.mgt.association.federation.FederatedAssociationManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the FederatedAssociationManager type of object inside the container.
- */
-public class FederatedAssociationManagerOSGIServiceFactory extends AbstractFactoryBean<FederatedAssociationManager> {
-
-    private FederatedAssociationManager federatedAssociationManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected FederatedAssociationManager createInstance() throws Exception {
-
-        if (this.federatedAssociationManager == null) {
-            FederatedAssociationManager federatedAssociationManager
-                    = (FederatedAssociationManager) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                    .getOSGiService(FederatedAssociationManager.class, null);
-            if (federatedAssociationManager != null) {
-                this.federatedAssociationManager = federatedAssociationManager;
-            } else {
-                throw new Exception("Unable to retrieve FederatedAssociationManager service.");
-            }
-        }
-        return this.federatedAssociationManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/factory/RealmServiceOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/factory/RealmServiceOSGIServiceFactory.java
deleted file mode 100644
index 7085974b9..000000000
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/factory/RealmServiceOSGIServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2019, 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.rest.api.user.association.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.user.core.service.RealmService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the RealmService type of object inside the container.
- */
-public class RealmServiceOSGIServiceFactory extends AbstractFactoryBean<RealmService> {
-
-    private RealmService realmService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected RealmService createInstance() throws Exception {
-
-        if (this.realmService == null) {
-            RealmService realmService
-                    = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                    .getOSGiService(RealmService.class, null);
-            if (realmService != null) {
-                this.realmService = realmService;
-            } else {
-                throw new Exception("Unable to retrieve RealmService.");
-            }
-        }
-        return this.realmService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/factory/UserAccountConnectorOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/factory/UserAccountConnectorOSGIServiceFactory.java
deleted file mode 100644
index 3aa3fde31..000000000
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/factory/UserAccountConnectorOSGIServiceFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2019, 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.rest.api.user.association.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.user.account.association.UserAccountConnector;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the UserAccountConnector type of object inside the container.
- */
-public class UserAccountConnectorOSGIServiceFactory extends AbstractFactoryBean<UserAccountConnector> {
-
-    private UserAccountConnector userAccountConnector;
-
-    @Override
-    public Class<?> getObjectType() {
-        return Object.class;
-    }
-
-    @Override
-    protected UserAccountConnector createInstance() throws Exception {
-
-        if (this.userAccountConnector == null) {
-            UserAccountConnector userAccountConnector = (UserAccountConnector) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(UserAccountConnector.class, null);
-            if (userAccountConnector != null) {
-                this.userAccountConnector = userAccountConnector;
-            } else {
-                throw new Exception("Unable to retrieve UserAccountConnector service.");
-            }
-        }
-        return this.userAccountConnector;
-    }
-
-}
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/core/UserAssociationService.java b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/core/UserAssociationService.java
index c3c10f2b8..dc86700db 100644
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/core/UserAssociationService.java
+++ b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/core/UserAssociationService.java
@@ -1,18 +1,21 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.association.v1.core;
 
 import org.apache.commons.lang.StringUtils;
@@ -26,18 +29,21 @@
 import org.wso2.carbon.identity.rest.api.user.association.v1.dto.FederatedAssociationDTO;
 import org.wso2.carbon.identity.rest.api.user.association.v1.dto.IdpDTO;
 import org.wso2.carbon.identity.rest.api.user.association.v1.dto.UserDTO;
-import org.wso2.carbon.identity.rest.api.user.association.v1.util.UserAssociationServiceHolder;
+import org.wso2.carbon.identity.user.account.association.UserAccountConnector;
 import org.wso2.carbon.identity.user.account.association.dto.UserAccountAssociationDTO;
 import org.wso2.carbon.identity.user.account.association.exception.UserAccountAssociationClientException;
 import org.wso2.carbon.identity.user.account.association.exception.UserAccountAssociationException;
+import org.wso2.carbon.identity.user.profile.mgt.association.federation.FederatedAssociationManager;
 import org.wso2.carbon.identity.user.profile.mgt.association.federation.exception.FederatedAssociationManagerClientException;
 import org.wso2.carbon.identity.user.profile.mgt.association.federation.exception.FederatedAssociationManagerException;
 import org.wso2.carbon.identity.user.profile.mgt.association.federation.model.FederatedAssociation;
+import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.user.core.util.UserCoreUtil;
 import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+
 import javax.ws.rs.core.Response;
 
 import static org.wso2.carbon.identity.api.user.common.Constants.ERROR_CODE_DELIMITER;
@@ -52,11 +58,24 @@ public class UserAssociationService {
 
     private static final Log log = LogFactory.getLog(UserAssociationService.class);
 
+    private final UserAccountConnector userAccountConnector;
+    private final FederatedAssociationManager federatedAssociationManager;
+    private final RealmService realmService;
+
+    public UserAssociationService(UserAccountConnector userAccountConnector, FederatedAssociationManager
+            federatedAssociationManager, RealmService realmService) {
+
+        this.userAccountConnector = userAccountConnector;
+        this.federatedAssociationManager = federatedAssociationManager;
+        this.realmService = realmService;
+    }
+
     public List<UserDTO> getAssociationsOfUser(String userId) {
 
         try {
-            UserAccountAssociationDTO[] accountAssociationsOfUser = UserAssociationServiceHolder
-                    .getUserAccountConnector().getAccountAssociationsOfUser(userId);
+            UserAccountAssociationDTO[] accountAssociationsOfUser = userAccountConnector
+                    .getAccountAssociationsOfUser(userId);
+
             return getUserAssociationsDTOs(accountAssociationsOfUser);
         } catch (UserAccountAssociationException e) {
             throw handleUserAccountAssociationException(e, "Error while getting associations of user: " + userId);
@@ -66,8 +85,8 @@ public List<UserDTO> getAssociationsOfUser(String userId) {
     public List<FederatedAssociationDTO> getFederatedAssociationsOfUser(String userId) {
 
         try {
-            FederatedAssociation[] federatedAccountAssociationsOfUser = UserAssociationServiceHolder
-                    .getFederatedAssociationManager().getFederatedAssociationsOfUser(getUser(userId));
+            FederatedAssociation[] federatedAccountAssociationsOfUser = federatedAssociationManager
+                    .getFederatedAssociationsOfUser(getUser(userId));
             return getFederatedAssociationDTOs(federatedAccountAssociationsOfUser);
         } catch (FederatedAssociationManagerException e) {
             throw handleFederatedAssociationManagerException(e, "Error while getting associations of user: " + userId);
@@ -81,19 +100,18 @@ public void createUserAccountAssociation(AssociationUserRequestDTO associationUs
                 throw new UserAccountAssociationClientException(ERROR_CODE_PW_MANDATORY.getCode(),
                         ERROR_CODE_PW_MANDATORY.getDescription());
             }
-            UserAssociationServiceHolder.getUserAccountConnector()
-                    .createUserAccountAssociation(associationUserRequestDTO.getUserId(),
-                            associationUserRequestDTO.getPassword().toCharArray());
+            userAccountConnector.createUserAccountAssociation(associationUserRequestDTO.getUserId(),
+                    associationUserRequestDTO.getPassword().toCharArray());
         } catch (UserAccountAssociationException e) {
             throw handleUserAccountAssociationException(e,
                     "Error while adding associations of user: " + associationUserRequestDTO.getUserId());
         }
     }
 
-    public boolean switchLoggedInUser(String userName)  {
+    public boolean switchLoggedInUser(String userName) {
 
         try {
-            return UserAssociationServiceHolder.getUserAccountConnector().switchLoggedInUser(userName);
+            return userAccountConnector.switchLoggedInUser(userName);
         } catch (UserAccountAssociationException e) {
             throw handleUserAccountAssociationException(e, "Error while switching user: " + userName);
         }
@@ -102,7 +120,7 @@ public boolean switchLoggedInUser(String userName)  {
     public void deleteUserAccountAssociation(String userId) {
 
         try {
-            UserAssociationServiceHolder.getUserAccountConnector().deleteUserAccountAssociation(userId);
+            userAccountConnector.deleteUserAccountAssociation(userId);
         } catch (UserAccountAssociationException e) {
             throw handleUserAccountAssociationException(e, "Error while deleting user association: " + userId);
         }
@@ -111,8 +129,7 @@ public void deleteUserAccountAssociation(String userId) {
     public void deleteAssociatedUserAccount(String ownerUserId, String associatedUserId) {
 
         try {
-            UserAssociationServiceHolder.getUserAccountConnector().deleteAssociatedUserAccount(ownerUserId,
-                    associatedUserId);
+            userAccountConnector.deleteAssociatedUserAccount(ownerUserId, associatedUserId);
         } catch (UserAccountAssociationException e) {
             throw handleUserAccountAssociationException(e, "Error while deleting user association of the user: "
                     + ownerUserId + ", with the user: " + associatedUserId);
@@ -122,8 +139,7 @@ public void deleteAssociatedUserAccount(String ownerUserId, String associatedUse
     public void deleteFederatedUserAccountAssociation(String userId, String federatedAssociationId) {
 
         try {
-            UserAssociationServiceHolder.getFederatedAssociationManager()
-                    .deleteFederatedAssociation(getUser(userId), federatedAssociationId);
+            federatedAssociationManager.deleteFederatedAssociation(getUser(userId), federatedAssociationId);
         } catch (FederatedAssociationManagerException e) {
             throw handleFederatedAssociationManagerException(e, "Error while deleting federated user association: "
                     + userId);
@@ -133,7 +149,7 @@ public void deleteFederatedUserAccountAssociation(String userId, String federate
     public void deleteFederatedUserAccountAssociation(String userId) {
 
         try {
-            UserAssociationServiceHolder.getFederatedAssociationManager().deleteFederatedAssociation(getUser(userId));
+            federatedAssociationManager.deleteFederatedAssociation(getUser(userId));
         } catch (FederatedAssociationManagerException e) {
             throw handleFederatedAssociationManagerException(e, "Error while deleting federated user association: "
                     + userId);
@@ -281,7 +297,7 @@ private String getUniqueUserId(UserAccountAssociationDTO userAccountAssociationD
         user.setUserName(userAccountAssociationDTO.getUsername());
         user.setUserStoreDomain(userAccountAssociationDTO.getDomain());
         user.setTenantDomain(userAccountAssociationDTO.getTenantDomain());
-        return new UserToUniqueId().apply(UserAssociationServiceHolder.getRealmService(), user);
+        return new UserToUniqueId().apply(realmService, user);
     }
 
     private User getUser(String userId) {
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/factories/UserAssociationServiceFactory.java b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/factories/UserAssociationServiceFactory.java
new file mode 100644
index 000000000..9ac975a00
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/factories/UserAssociationServiceFactory.java
@@ -0,0 +1,89 @@
+/*
+ * 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.rest.api.user.association.v1.factories;
+
+import org.wso2.carbon.identity.rest.api.user.association.v1.core.UserAssociationService;
+import org.wso2.carbon.identity.rest.api.user.association.v1.util.UserAssociationServiceHolder;
+import org.wso2.carbon.identity.user.account.association.UserAccountConnector;
+import org.wso2.carbon.identity.user.profile.mgt.association.federation.FederatedAssociationManager;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * Factory class for User Association Service.
+ */
+public class UserAssociationServiceFactory {
+
+    private UserAssociationServiceFactory() {
+
+    }
+
+    private static class UserAssociationServiceManagerHolder {
+
+        private static final UserAssociationService SERVICE = createServiceInstance();
+    }
+
+    private static UserAssociationService createServiceInstance() {
+
+        UserAccountConnector userAccountConnector = getUserAccountConnector();
+        FederatedAssociationManager federatedAssociationManager = getFederatedAssociationManager();
+        RealmService realmService = getRealmService();
+
+        return new UserAssociationService(userAccountConnector, federatedAssociationManager, realmService);
+    }
+
+    /**
+     * Get UserAssociationService instance.
+     *
+     * @return UserAssociationService instance.
+     */
+    public static UserAssociationService getUserAssociationService() {
+
+        return UserAssociationServiceManagerHolder.SERVICE;
+    }
+
+    private static UserAccountConnector getUserAccountConnector() {
+
+        UserAccountConnector service = UserAssociationServiceHolder.getUserAccountConnector();
+        if (service == null) {
+            throw new IllegalStateException("UserAccountConnector is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static FederatedAssociationManager getFederatedAssociationManager() {
+
+        FederatedAssociationManager service = UserAssociationServiceHolder.getFederatedAssociationManager();
+        if (service == null) {
+            throw new IllegalStateException("FederatedAssociationManager is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static RealmService getRealmService() {
+
+        RealmService service = UserAssociationServiceHolder.getRealmService();
+        if (service == null) {
+            throw new IllegalStateException("RealmService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/impl/MeApiServiceImpl.java
index 3c9aae993..c7efa5407 100644
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/impl/MeApiServiceImpl.java
@@ -1,6 +1,23 @@
+/*
+ * Copyright (c) 2019-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.rest.api.user.association.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.user.common.function.UniqueIdToUser;
 import org.wso2.carbon.identity.application.common.model.User;
@@ -8,10 +25,12 @@
 import org.wso2.carbon.identity.rest.api.user.association.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.association.v1.core.UserAssociationService;
 import org.wso2.carbon.identity.rest.api.user.association.v1.dto.AssociationUserRequestDTO;
+import org.wso2.carbon.identity.rest.api.user.association.v1.factories.UserAssociationServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.association.v1.util.UserAssociationServiceHolder;
 import org.wso2.carbon.user.core.util.UserCoreUtil;
 
 import java.net.URI;
+
 import javax.ws.rs.core.Response;
 
 import static org.wso2.carbon.identity.api.user.common.ContextLoader.buildURIForHeader;
@@ -24,8 +43,16 @@
  */
 public class MeApiServiceImpl extends MeApiService {
 
-    @Autowired
-    private UserAssociationService userAssociationService;
+    private final UserAssociationService userAssociationService;
+
+    public MeApiServiceImpl() {
+
+        try {
+            this.userAssociationService = UserAssociationServiceFactory.getUserAssociationService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating UserAssociationService.", e);
+        }
+    }
 
     @Override
     public Response meAssociationsDelete() {
@@ -44,6 +71,7 @@ public Response meAssociationsAssociatedUserIdDelete(String associatedUserId) {
 
     @Override
     public Response meAssociationsGet() {
+
         return Response.ok().entity(userAssociationService.getAssociationsOfUser(
                 getFullyQualifiedUsernameFromContext())).build();
     }
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/impl/UserIdApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/impl/UserIdApiServiceImpl.java
index e24bcb400..146bedd48 100644
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/impl/UserIdApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/impl/UserIdApiServiceImpl.java
@@ -1,11 +1,29 @@
+/*
+ * Copyright (c) 2019-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.rest.api.user.association.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.user.common.function.UniqueIdToUser;
 import org.wso2.carbon.identity.application.common.model.User;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.association.v1.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.association.v1.core.UserAssociationService;
+import org.wso2.carbon.identity.rest.api.user.association.v1.factories.UserAssociationServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.association.v1.util.UserAssociationServiceHolder;
 
 import javax.ws.rs.core.Response;
@@ -15,8 +33,16 @@
  */
 public class UserIdApiServiceImpl extends UserIdApiService {
 
-    @Autowired
-    private UserAssociationService userAssociationService;
+    private final UserAssociationService userAssociationService;
+
+    public UserIdApiServiceImpl() {
+
+        try {
+            this.userAssociationService = UserAssociationServiceFactory.getUserAssociationService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating UserAssociationService.", e);
+        }
+    }
 
     @Override
     public Response userIdAssociationsDelete(String userId) {
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/util/UserAssociationServiceHolder.java b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/util/UserAssociationServiceHolder.java
index 726b5d00b..f6857b917 100644
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/util/UserAssociationServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/association/v1/util/UserAssociationServiceHolder.java
@@ -1,20 +1,24 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.association.v1.util;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.user.account.association.UserAccountConnector;
 import org.wso2.carbon.identity.user.profile.mgt.association.federation.FederatedAssociationManager;
 import org.wso2.carbon.user.core.service.RealmService;
@@ -24,37 +28,55 @@
  */
 public class UserAssociationServiceHolder {
 
-    private static UserAccountConnector userAccountConnector;
-    private static FederatedAssociationManager federatedAssociationManager;
-    private static RealmService realmService;
+    private UserAssociationServiceHolder() {
 
-    public static FederatedAssociationManager getFederatedAssociationManager() {
+    }
 
-        return federatedAssociationManager;
+    private static class FederatedAssociationManagerServiceHolder {
+
+        static final FederatedAssociationManager SERVICE = (FederatedAssociationManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(FederatedAssociationManager.class, null);
     }
 
-    public static void setFederatedAssociationManager(FederatedAssociationManager federatedAssociationManager) {
+    private static class UserAccountConnectorServiceHolder {
 
-        UserAssociationServiceHolder.federatedAssociationManager = federatedAssociationManager;
+        static final UserAccountConnector SERVICE = (UserAccountConnector) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(UserAccountConnector.class, null);
     }
 
-    public static UserAccountConnector getUserAccountConnector() {
+    private static class RealmServiceHolder {
 
-        return userAccountConnector;
+        static final RealmService SERVICE = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                .getOSGiService(RealmService.class, null);
     }
 
-    public static void setUserAccountConnector(UserAccountConnector userAccountConnector) {
+    /**
+     * Get FederatedAssociationManager OSGi service.
+     *
+     * @return FederatedAssociationManager
+     */
+    public static FederatedAssociationManager getFederatedAssociationManager() {
 
-        UserAssociationServiceHolder.userAccountConnector = userAccountConnector;
+        return FederatedAssociationManagerServiceHolder.SERVICE;
     }
 
-    public static RealmService getRealmService() {
+    /**
+     * Get UserAccountConnector OSGi service.
+     *
+     * @return UserAccountConnector
+     */
+    public static UserAccountConnector getUserAccountConnector() {
 
-        return realmService;
+        return UserAccountConnectorServiceHolder.SERVICE;
     }
 
-    public static void setRealmService(RealmService realmService) {
+    /**
+     * Get RealmService OSGi service.
+     *
+     * @return RealmService
+     */
+    public static RealmService getRealmService() {
 
-        UserAssociationServiceHolder.realmService = realmService;
+        return RealmServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/resources/META-INF/cxf/user-association-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/resources/META-INF/cxf/user-association-v1-cxf.xml
deleted file mode 100644
index c58fdb5cc..000000000
--- a/components/org.wso2.carbon.identity.api.user.association/org.wso2.carbon.identity.api.user.association.v1/src/main/resources/META-INF/cxf/user-association-v1-cxf.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2019, 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"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-    <bean class="org.wso2.carbon.identity.rest.api.user.association.v1.core.UserAssociationService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.association.v1.impl.UserIdApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.association.v1.impl.MeApiServiceImpl"/>
-    <bean id="userAccountConnectorServiceFactoryBean"
-          class="org.wso2.carbon.identity.rest.api.user.association.factory.UserAccountConnectorOSGIServiceFactory"/>
-    <bean id="FederatedAssociationManagerFactoryBean"
-          class="org.wso2.carbon.identity.rest.api.user.association.factory.FederatedAssociationManagerOSGIServiceFactory"/>
-    <bean id="RealmServiceOSGIServiceFactoryBean"
-          class="org.wso2.carbon.identity.rest.api.user.association.factory.RealmServiceOSGIServiceFactory"/>
-    <bean id="UserAssociationServiceHolderBean"
-          class="org.wso2.carbon.identity.rest.api.user.association.v1.util.UserAssociationServiceHolder">
-        <property name="userAccountConnector" ref="userAccountConnectorServiceFactoryBean"/>
-        <property name="federatedAssociationManager" ref="FederatedAssociationManagerFactoryBean"/>
-        <property name="realmService" ref="RealmServiceOSGIServiceFactoryBean"/>
-    </bean>
-</beans>

From b8cc967590ef850a582979dcbf5dfc05c97758fa Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Fri, 10 Jan 2025 17:14:31 +0530
Subject: [PATCH 05/15] Remove Spring dependency from api.user.authorized.apps

---
 .../pom.xml                                   |  23 ++--
 .../api/user/authorized/apps/v1/MeApi.java    |  27 +++--
 .../user/authorized/apps/v1/UserIdApi.java    |  27 +++--
 .../v1/factories/MeApiServiceFactory.java     |  28 ++---
 .../v1/factories/UserIdApiServiceFactory.java |  28 ++---
 .../apps/v1/core/AuthorizedAppsService.java   |  32 +++---
 .../AuthorizedAppsServiceFactory.java         |  65 +++++++++++
 .../apps/v1/impl/MeApiServiceImpl.java        |  32 ++++--
 .../apps/v1/impl/UserIdApiServiceImpl.java    |  39 ++++---
 .../utils/AuthorizedAppsServicesHolder.java   |  73 ++++++++++++
 .../cxf/authorized-apps-user-v1-cxf.xml       |  22 ----
 .../pom.xml                                   |  23 ++--
 .../authorized/apps/v2/AuthorizedAppsApi.java |  15 ++-
 .../api/user/authorized/apps/v2/MeApi.java    |  29 +++--
 .../user/authorized/apps/v2/UserIdApi.java    |  29 +++--
 .../AuthorizedAppsApiServiceFactory.java      |  17 ++-
 .../v2/factories/MeApiServiceFactory.java     |  36 +++---
 .../v2/factories/UserIdApiServiceFactory.java |  28 ++---
 .../apps/v2/core/AuthorizedAppsService.java   |  33 +++---
 .../AuthorizedAppsServiceFactory.java         |  92 +++++++++++++++
 .../v2/impl/AuthorizedAppsApiServiceImpl.java |  14 ++-
 .../apps/v2/impl/MeApiServiceImpl.java        |  33 ++++--
 .../apps/v2/impl/UserIdApiServiceImpl.java    |  39 ++++---
 .../utils/AuthorizedAppsServicesHolder.java   | 107 ++++++++++++++++++
 .../cxf/authorized-apps-user-v2-cxf.xml       |  23 ----
 25 files changed, 641 insertions(+), 273 deletions(-)
 create mode 100644 components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/factories/AuthorizedAppsServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/utils/AuthorizedAppsServicesHolder.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/resources/META-INF/cxf/authorized-apps-user-v1-cxf.xml
 create mode 100644 components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/AuthorizedAppsServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/utils/AuthorizedAppsServicesHolder.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/resources/META-INF/cxf/authorized-apps-user-v2-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/pom.xml
index 9ec2d77f9..496b61985 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/pom.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the 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
   ~
   ~ 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.
+  ~ 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.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -79,11 +81,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>
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/MeApi.java
index 7301d7b4c..a7f263610 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/MeApi.java
@@ -1,22 +1,23 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.dto.*;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.factories.MeApiServiceFactory;
@@ -41,8 +42,12 @@
 @io.swagger.annotations.Api(value = "/me", description = "the me API")
 public class MeApi  {
 
-   @Autowired
-   private MeApiService delegate;
+   private final MeApiService delegate;
+
+   public MeApi() {
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+   }
 
     @DELETE
     @Path("/authorized-apps/{application-id}")
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/UserIdApi.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/UserIdApi.java
index 8f197ac61..8dfbfbdf4 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/UserIdApi.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/UserIdApi.java
@@ -1,22 +1,23 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.dto.*;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.factories.UserIdApiServiceFactory;
@@ -41,8 +42,12 @@
 @io.swagger.annotations.Api(value = "/{user-id}", description = "the {user-id} API")
 public class UserIdApi  {
 
-   @Autowired
-   private UserIdApiService delegate;
+   private final UserIdApiService delegate;
+
+   public UserIdApi() {
+
+      this.delegate = UserIdApiServiceFactory.getUserIdApi();
+   }
 
     @DELETE
     @Path("/authorized-apps")
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/factories/MeApiServiceFactory.java
index d4f54a53b..10435ff80 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/factories/MeApiServiceFactory.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v1.factories;
@@ -21,10 +23,10 @@
 
 public class MeApiServiceFactory {
 
-   private final static MeApiService service = new MeApiServiceImpl();
+    private final static MeApiService SERVICE = new MeApiServiceImpl();
 
-   public static MeApiService getMeApi()
-   {
-      return service;
-   }
+    public static MeApiService getMeApi() {
+
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/factories/UserIdApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/factories/UserIdApiServiceFactory.java
index bd12a7800..e79b13dfe 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/factories/UserIdApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/factories/UserIdApiServiceFactory.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v1.factories;
@@ -21,10 +23,10 @@
 
 public class UserIdApiServiceFactory {
 
-   private final static UserIdApiService service = new UserIdApiServiceImpl();
+    private final static UserIdApiService SERVICE = new UserIdApiServiceImpl();
 
-   public static UserIdApiService getUserIdApi()
-   {
-      return service;
-   }
+    public static UserIdApiService getUserIdApi() {
+
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/core/AuthorizedAppsService.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/core/AuthorizedAppsService.java
index 475aafbc2..79838dc97 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/core/AuthorizedAppsService.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/core/AuthorizedAppsService.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v1.core;
@@ -30,7 +32,6 @@
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.core.functions.OAuthConsumerAppToExternal;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.dto.AuthorizedAppDTO;
 import org.wso2.carbon.user.core.UserCoreConstants;
-import org.wso2.carbon.user.core.service.RealmService;
 
 import java.util.Arrays;
 import java.util.List;
@@ -47,14 +48,11 @@
 public class AuthorizedAppsService {
 
     private static final Log log = LogFactory.getLog(AuthorizedAppsService.class);
-    private static OAuthAdminServiceImpl oAuthAdminService = null;
-    private static RealmService realmService = null;
-
-    static {
-        oAuthAdminService = (OAuthAdminServiceImpl) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                .getOSGiService(OAuthAdminServiceImpl.class, null);
-        realmService = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                .getOSGiService(RealmService.class, null);
+    private final OAuthAdminServiceImpl oAuthAdminService;
+
+    public AuthorizedAppsService(OAuthAdminServiceImpl oAuthAdminService) {
+
+        this.oAuthAdminService = oAuthAdminService;
     }
 
     public void deleteUserAuthorizedApps(User user) {
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/factories/AuthorizedAppsServiceFactory.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/factories/AuthorizedAppsServiceFactory.java
new file mode 100644
index 000000000..554c98b67
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/factories/AuthorizedAppsServiceFactory.java
@@ -0,0 +1,65 @@
+/*
+ * 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.rest.api.user.authorized.apps.v1.factories;
+
+import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.core.AuthorizedAppsService;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.utils.AuthorizedAppsServicesHolder;
+
+/**
+ * This class is responsible for initializing AuthorizedAppsService.
+ */
+public class AuthorizedAppsServiceFactory {
+
+    private AuthorizedAppsServiceFactory() {
+
+    }
+
+    private static class AuthorizedAppsServiceHolder {
+
+        private static final AuthorizedAppsService SERVICE = createServiceInstance();
+    }
+
+    private static AuthorizedAppsService createServiceInstance() {
+
+        OAuthAdminServiceImpl oAuthAdminServiceImpl = getOAuthAdminService();
+
+        return new AuthorizedAppsService(oAuthAdminServiceImpl);
+    }
+
+    /**
+     * Get AuthorizedAppsService
+     *
+     * @return AuthorizedAppsService
+     */
+    public static AuthorizedAppsService getAuthorizedAppsService() {
+
+        return AuthorizedAppsServiceHolder.SERVICE;
+    }
+
+    private static OAuthAdminServiceImpl getOAuthAdminService() {
+
+        OAuthAdminServiceImpl service = AuthorizedAppsServicesHolder.getOAuthAdminService();
+        if (service == null) {
+            throw new IllegalStateException("OAuthAdminServiceImpl is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/impl/MeApiServiceImpl.java
index 7f29cfef7..568796c80 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/impl/MeApiServiceImpl.java
@@ -1,25 +1,27 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.core.AuthorizedAppsService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.dto.AuthorizedAppDTO;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.factories.AuthorizedAppsServiceFactory;
 
 import java.util.List;
 import javax.ws.rs.core.Response;
@@ -31,8 +33,16 @@
  */
 public class MeApiServiceImpl extends MeApiService {
 
-    @Autowired
-    private AuthorizedAppsService authorizedAppsService;
+    private final AuthorizedAppsService authorizedAppsService;
+
+    public MeApiServiceImpl() {
+
+        try {
+            this.authorizedAppsService = AuthorizedAppsServiceFactory.getAuthorizedAppsService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating AuthorizedAppsService.", e);
+        }
+    }
 
     @Override
     public Response deleteLoggedInUserAuthorizedAppByAppId(String applicationId) {
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/impl/UserIdApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/impl/UserIdApiServiceImpl.java
index 17a1230a7..ebd412c53 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/impl/UserIdApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/impl/UserIdApiServiceImpl.java
@@ -1,32 +1,35 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.user.common.function.UniqueIdToUser;
 import org.wso2.carbon.identity.application.common.model.User;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.core.AuthorizedAppsService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.dto.AuthorizedAppDTO;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.factories.AuthorizedAppsServiceFactory;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.utils.AuthorizedAppsServicesHolder;
 import org.wso2.carbon.user.core.service.RealmService;
 
 import java.util.List;
+
 import javax.ws.rs.core.Response;
 
 /**
@@ -34,13 +37,17 @@
  */
 public class UserIdApiServiceImpl extends UserIdApiService {
 
-    @Autowired
-    private AuthorizedAppsService authorizedAppsService;
-    private static RealmService realmService = null;
+    private final AuthorizedAppsService authorizedAppsService;
+    private final RealmService realmService;
+
+    public UserIdApiServiceImpl() {
 
-    static {
-        realmService = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                .getOSGiService(RealmService.class, null);
+        try {
+            this.authorizedAppsService = AuthorizedAppsServiceFactory.getAuthorizedAppsService();
+            this.realmService = AuthorizedAppsServicesHolder.getRealmService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating the authorized app services.", e);
+        }
     }
 
     @Override
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/utils/AuthorizedAppsServicesHolder.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/utils/AuthorizedAppsServicesHolder.java
new file mode 100644
index 000000000..f4c10f2a0
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/utils/AuthorizedAppsServicesHolder.java
@@ -0,0 +1,73 @@
+/*
+ * 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.rest.api.user.authorized.apps.v1.utils;
+
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * This class holds the service instances required for authorized apps management.
+ */
+public class AuthorizedAppsServicesHolder {
+
+    private AuthorizedAppsServicesHolder() {
+
+    }
+
+    private static class OAuthAdminServiceImplServiceHolder {
+
+        static final OAuthAdminServiceImpl SERVICE = (OAuthAdminServiceImpl) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(OAuthAdminServiceImpl.class, null);
+    }
+
+    /**
+     * Get OAuthAdminService
+     *
+     * @return OAuthAdminServiceImpl
+     */
+    public static OAuthAdminServiceImpl getOAuthAdminService() {
+
+        return OAuthAdminServiceImplServiceHolder.SERVICE;
+    }
+
+    private static class RealmServiceHolder {
+
+        static final RealmService SERVICE;
+
+        static {
+            SERVICE = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                    .getOSGiService(RealmService.class, null);
+
+            if (SERVICE == null) {
+                throw new IllegalStateException("RealmService is not available from OSGi context.");
+            }
+        }
+    }
+
+    /**
+     * Get RealmService
+     *
+     * @return RealmService
+     */
+    public static RealmService getRealmService() {
+
+        return RealmServiceHolder.SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/resources/META-INF/cxf/authorized-apps-user-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/resources/META-INF/cxf/authorized-apps-user-v1-cxf.xml
deleted file mode 100644
index 290abefe5..000000000
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v1/src/main/resources/META-INF/cxf/authorized-apps-user-v1-cxf.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2019, 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.rest.api.user.authorized.apps.v1.core.AuthorizedAppsService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.impl.UserIdApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.impl.MeApiServiceImpl"/>
-</beans>
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/pom.xml b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/pom.xml
index 1d99ae84c..360bcf29a 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/pom.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the 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
   ~
   ~ 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.
+  ~ 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.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
@@ -103,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>
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/AuthorizedAppsApi.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/AuthorizedAppsApi.java
index f0c6207c7..0d0539370 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/AuthorizedAppsApi.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/AuthorizedAppsApi.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+ * 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
@@ -18,19 +18,18 @@
 
 package org.wso2.carbon.identity.rest.api.user.authorized.apps.v2;
 
-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.rest.api.user.authorized.apps.v2.dto.ErrorDTO;
-import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.AuthorizedAppsApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import io.swagger.annotations.*;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.factories.AuthorizedAppsApiServiceFactory;
 
 import javax.validation.constraints.*;
 
@@ -39,8 +38,12 @@
 
 public class AuthorizedAppsApi  {
 
-    @Autowired
-    private AuthorizedAppsApiService delegate;
+    private final AuthorizedAppsApiService delegate;
+
+    protected AuthorizedAppsApi() {
+
+        this.delegate = AuthorizedAppsApiServiceFactory.getAuthorizedAppsApi();
+    }
 
     @Valid
     @DELETE
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/MeApi.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/MeApi.java
index 6e0cf2da1..c855dcd9e 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/MeApi.java
@@ -1,22 +1,23 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v2;
 
-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;
@@ -24,12 +25,12 @@
 
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.dto.AuthorizedAppDTO;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.dto.ErrorDTO;
-import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.MeApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import io.swagger.annotations.*;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.factories.MeApiServiceFactory;
 
 import javax.validation.constraints.*;
 
@@ -38,8 +39,12 @@
 
 public class MeApi  {
 
-    @Autowired
-    private MeApiService delegate;
+    private final MeApiService delegate;
+
+    public MeApi() {
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @Valid
     @DELETE
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/UserIdApi.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/UserIdApi.java
index 6aad89a1e..37b69d630 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/UserIdApi.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/UserIdApi.java
@@ -1,23 +1,23 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v2;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.dto.AuthorizedAppDTO;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.dto.ErrorDTO;
 
@@ -25,14 +25,19 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import io.swagger.annotations.*;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.factories.UserIdApiServiceFactory;
 
 @Path("/{user-id}")
 @Api(description = "The {user-id} API")
 
 public class UserIdApi {
 
-    @Autowired
-    private UserIdApiService delegate;
+    private final UserIdApiService delegate;
+
+    public UserIdApi() {
+
+        this.delegate = UserIdApiServiceFactory.getUserIdApi();
+    }
 
     @Valid
     @DELETE
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/AuthorizedAppsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/AuthorizedAppsApiServiceFactory.java
index 30a50e5c9..514b662b8 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/AuthorizedAppsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/AuthorizedAppsApiServiceFactory.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+ * 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
@@ -21,11 +21,20 @@
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.AuthorizedAppsApiService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.impl.AuthorizedAppsApiServiceImpl;
 
+/**
+ * Factory class for AuthorizedAppsApiService.
+ */
 public class AuthorizedAppsApiServiceFactory {
 
-   private final static AuthorizedAppsApiService service = new AuthorizedAppsApiServiceImpl();
+   private final static AuthorizedAppsApiService SERVICE = new AuthorizedAppsApiServiceImpl();
 
+   /**
+    * Get AuthorizedAppsApiService
+    *
+    * @return AuthorizedAppsApiService
+    */
    public static AuthorizedAppsApiService getAuthorizedAppsApi() {
-      return service;
+
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/MeApiServiceFactory.java
index eab6b72c6..2a5de047d 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/MeApiServiceFactory.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v2.factories;
@@ -19,12 +21,20 @@
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.impl.MeApiServiceImpl;
 
+/**
+ * Factory class for MeApiService.
+ */
 public class MeApiServiceFactory {
 
-   private final static MeApiService service = new MeApiServiceImpl();
+    private final static MeApiService SERVICE = new MeApiServiceImpl();
+
+    /**
+     * Get MeApiService
+     *
+     * @return MeApiService
+     */
+    public static MeApiService getMeApi() {
 
-   public static MeApiService getMeApi()
-   {
-      return service;
-   }
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/UserIdApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/UserIdApiServiceFactory.java
index b388cb5a4..e247c691f 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/UserIdApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/UserIdApiServiceFactory.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v2.factories;
@@ -21,10 +23,10 @@
 
 public class UserIdApiServiceFactory {
 
-   private final static UserIdApiService service = new UserIdApiServiceImpl();
+    private final static UserIdApiService SERVICE = new UserIdApiServiceImpl();
 
-   public static UserIdApiService getUserIdApi()
-   {
-      return service;
-   }
+    public static UserIdApiService getUserIdApi() {
+
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/core/AuthorizedAppsService.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/core/AuthorizedAppsService.java
index 8f30a855b..1062e73fc 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/core/AuthorizedAppsService.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/core/AuthorizedAppsService.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-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
@@ -67,21 +67,20 @@ public class AuthorizedAppsService {
 
     private static final Log log = LogFactory.getLog(AuthorizedAppsService.class);
     private static final String OAUTH2 = "oauth2";
-    private static final ApplicationManagementService applicationManagementService;
-    private static final OAuthAdminServiceImpl oAuthAdminService;
-    private static final OAuth2ScopeService oAuth2ScopeService;
-    private static final RealmService realmService;
-
-
-    static {
-        applicationManagementService = (ApplicationManagementService) PrivilegedCarbonContext.
-                getThreadLocalCarbonContext().getOSGiService(ApplicationManagementService.class, null);
-        oAuthAdminService = (OAuthAdminServiceImpl) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                .getOSGiService(OAuthAdminServiceImpl.class, null);
-        oAuth2ScopeService = (OAuth2ScopeService) PrivilegedCarbonContext.
-                getThreadLocalCarbonContext().getOSGiService(OAuth2ScopeService.class, null);
-        realmService = (RealmService) PrivilegedCarbonContext.
-                getThreadLocalCarbonContext().getOSGiService(RealmService.class, null);
+    private final ApplicationManagementService applicationManagementService;
+    private final OAuthAdminServiceImpl oAuthAdminService;
+    private final OAuth2ScopeService oAuth2ScopeService;
+    private final RealmService realmService;
+
+    public AuthorizedAppsService(ApplicationManagementService applicationManagementService,
+                                 OAuthAdminServiceImpl oAuthAdminService,
+                                 OAuth2ScopeService oAuth2ScopeService,
+                                 RealmService realmService) {
+
+        this.applicationManagementService = applicationManagementService;
+        this.oAuthAdminService = oAuthAdminService;
+        this.oAuth2ScopeService = oAuth2ScopeService;
+        this.realmService = realmService;
     }
 
     /**
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/AuthorizedAppsServiceFactory.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/AuthorizedAppsServiceFactory.java
new file mode 100644
index 000000000..3665b4679
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/factories/AuthorizedAppsServiceFactory.java
@@ -0,0 +1,92 @@
+/*
+ * 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.rest.api.user.authorized.apps.v2.factories;
+
+import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
+import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
+import org.wso2.carbon.identity.oauth2.OAuth2ScopeService;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.core.AuthorizedAppsService;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.utils.AuthorizedAppsServicesHolder;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * This class is responsible for initializing AuthorizedAppsService.
+ */
+public class AuthorizedAppsServiceFactory {
+
+    private AuthorizedAppsServiceFactory() {
+
+    }
+
+    private static class AuthorizedAppsServiceHolder {
+
+        private static final AuthorizedAppsService SERVICE = createServiceInstance();
+    }
+
+    private static AuthorizedAppsService createServiceInstance() {
+
+        ApplicationManagementService applicationManagementService = getApplicationManagementService();
+        OAuthAdminServiceImpl oAuthAdminServiceImpl = getOAuthAdminService();
+        OAuth2ScopeService oAuth2ScopeService = getOAuth2ScopeService();
+        RealmService realmService = AuthorizedAppsServicesHolder.getRealmService();
+
+        return new AuthorizedAppsService(applicationManagementService, oAuthAdminServiceImpl,
+                oAuth2ScopeService, realmService);
+    }
+
+    /**
+     * Get AuthorizedAppsService
+     *
+     * @return AuthorizedAppsService
+     */
+    public static AuthorizedAppsService getAuthorizedAppsService() {
+
+        return AuthorizedAppsServiceHolder.SERVICE;
+    }
+
+    private static ApplicationManagementService getApplicationManagementService() {
+
+        ApplicationManagementService service = AuthorizedAppsServicesHolder.getApplicationManagementService();
+        if (service == null) {
+            throw new IllegalStateException("ApplicationManagementService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static OAuthAdminServiceImpl getOAuthAdminService() {
+
+        OAuthAdminServiceImpl service = AuthorizedAppsServicesHolder.getOAuthAdminService();
+        if (service == null) {
+            throw new IllegalStateException("OAuthAdminServiceImpl is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static OAuth2ScopeService getOAuth2ScopeService() {
+
+        OAuth2ScopeService service = AuthorizedAppsServicesHolder.getOAuth2ScopeService();
+        if (service == null) {
+            throw new IllegalStateException("OAuth2ScopeService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/AuthorizedAppsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/AuthorizedAppsApiServiceImpl.java
index 4f2eb0fa9..44e373cdb 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/AuthorizedAppsApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/AuthorizedAppsApiServiceImpl.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2021, WSO2 Inc. (http://www.wso2.com).
+ * 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
@@ -18,9 +18,9 @@
 
 package org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.AuthorizedAppsApiService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.core.AuthorizedAppsService;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.factories.AuthorizedAppsServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -29,8 +29,12 @@
  */
 public class AuthorizedAppsApiServiceImpl implements AuthorizedAppsApiService {
 
-    @Autowired
-    private AuthorizedAppsService authorizedAppsService;
+    private final AuthorizedAppsService authorizedAppsService;
+
+    public AuthorizedAppsApiServiceImpl() {
+
+        this.authorizedAppsService = AuthorizedAppsServiceFactory.getAuthorizedAppsService();
+    }
 
     @Override
     public Response deleteIssuedTokensByAppId(String applicationId) {
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/MeApiServiceImpl.java
index 201f512fc..e78d2d319 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/MeApiServiceImpl.java
@@ -1,26 +1,27 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v2.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.core.AuthorizedAppsService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.dto.AuthorizedAppDTO;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.factories.AuthorizedAppsServiceFactory;
 
 import java.util.List;
 
@@ -33,8 +34,16 @@
 */
 public class MeApiServiceImpl implements MeApiService {
 
-    @Autowired
-    private AuthorizedAppsService authorizedAppsService;
+    private final AuthorizedAppsService authorizedAppsService;
+
+    public MeApiServiceImpl() {
+
+        try {
+            this.authorizedAppsService = AuthorizedAppsServiceFactory.getAuthorizedAppsService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating AuthorizedAppsService.", e);
+        }
+    }
 
     @Override
     public Response deleteLoggedInUserAuthorizedAppByAppId(String applicationId) {
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/UserIdApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/UserIdApiServiceImpl.java
index 23974d1da..8ab865862 100644
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/UserIdApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/UserIdApiServiceImpl.java
@@ -1,29 +1,31 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.authorized.apps.v2.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.user.common.function.UniqueIdToUser;
 import org.wso2.carbon.identity.application.common.model.User;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.core.AuthorizedAppsService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.dto.AuthorizedAppDTO;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.factories.AuthorizedAppsServiceFactory;
+import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.utils.AuthorizedAppsServicesHolder;
 import org.wso2.carbon.user.core.service.RealmService;
 
 import java.util.List;
@@ -35,13 +37,18 @@
  */
 public class UserIdApiServiceImpl implements UserIdApiService {
 
-    @Autowired
-    private AuthorizedAppsService authorizedAppsService;
-    private static RealmService realmService = null;
+    private final AuthorizedAppsService authorizedAppsService;
+    private final RealmService realmService;
 
-    static {
-        realmService = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                .getOSGiService(RealmService.class, null);
+    public UserIdApiServiceImpl() {
+
+        try {
+            this.authorizedAppsService = AuthorizedAppsServiceFactory.getAuthorizedAppsService();
+            this.realmService = AuthorizedAppsServicesHolder.getRealmService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating required services " +
+                    "for UserIdApiServiceImpl.", e);
+        }
     }
 
     @Override
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/utils/AuthorizedAppsServicesHolder.java b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/utils/AuthorizedAppsServicesHolder.java
new file mode 100644
index 000000000..de8fca014
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/utils/AuthorizedAppsServicesHolder.java
@@ -0,0 +1,107 @@
+/*
+ * 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.rest.api.user.authorized.apps.v2.utils;
+
+import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.identity.application.mgt.ApplicationManagementService;
+import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
+import org.wso2.carbon.identity.oauth2.OAuth2ScopeService;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * This class holds the service instances required for authorized apps management.
+ */
+public class AuthorizedAppsServicesHolder {
+
+    private AuthorizedAppsServicesHolder() {
+
+    }
+
+    private static class ApplicationManagementServiceHolder {
+
+        static final ApplicationManagementService SERVICE = (ApplicationManagementService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(ApplicationManagementService.class, null);
+    }
+
+    private static class OAuthAdminServiceImplServiceHolder {
+
+        static final OAuthAdminServiceImpl SERVICE = (OAuthAdminServiceImpl) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(OAuthAdminServiceImpl.class, null);
+    }
+
+    private static class OAuth2ScopeServiceHolder {
+
+        static final OAuth2ScopeService SERVICE = (OAuth2ScopeService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(OAuth2ScopeService.class, null);
+    }
+
+    private static class RealmServiceHolder {
+
+        static final RealmService SERVICE;
+
+        static {
+            SERVICE = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                    .getOSGiService(RealmService.class, null);
+
+            if (SERVICE == null) {
+                throw new IllegalStateException("RealmService is not available from OSGi context.");
+            }
+        }
+    }
+
+    /**
+     * Get OAuth2ScopeService
+     *
+     * @return OAuth2ScopeService
+     */
+    public static ApplicationManagementService getApplicationManagementService() {
+
+        return ApplicationManagementServiceHolder.SERVICE;
+    }
+
+    /**
+     * Get OAuthAdminService
+     *
+     * @return OAuthAdminServiceImpl
+     */
+    public static OAuthAdminServiceImpl getOAuthAdminService() {
+
+        return OAuthAdminServiceImplServiceHolder.SERVICE;
+    }
+
+    /**
+     * Get OAuth2ScopeService
+     *
+     * @return OAuth2ScopeService
+     */
+    public static OAuth2ScopeService getOAuth2ScopeService() {
+
+        return OAuth2ScopeServiceHolder.SERVICE;
+    }
+
+    /**
+     * Get RealmService
+     *
+     * @return RealmService
+     */
+    public static RealmService getRealmService() {
+
+        return RealmServiceHolder.SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/resources/META-INF/cxf/authorized-apps-user-v2-cxf.xml b/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/resources/META-INF/cxf/authorized-apps-user-v2-cxf.xml
deleted file mode 100644
index 21fccc568..000000000
--- a/components/org.wso2.carbon.identity.api.user.authorized.apps/org.wso2.carbon.identity.rest.api.user.authorized.apps.v2/src/main/resources/META-INF/cxf/authorized-apps-user-v2-cxf.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2020, 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.rest.api.user.authorized.apps.v2.core.AuthorizedAppsService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.impl.UserIdApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.impl.MeApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.impl.AuthorizedAppsApiServiceImpl"/>
-</beans>

From 0b4fc56fce4ad547dbf933fcc73a02091e15b373 Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Fri, 10 Jan 2025 17:15:32 +0530
Subject: [PATCH 06/15] Remove Spring dependency from api.user.backupcode

---
 .../pom.xml                                   |  9 +----
 .../pom.xml                                   |  9 +----
 .../rest/api/user/backupcode/v1/MeApi.java    | 28 +++++++------
 .../v1/factories/MeApiServiceFactory.java     | 27 ++++++++-----
 .../factories/BackupCodeServiceFactory.java   | 39 +++++++++++++++++++
 .../backupcode/v1/impl/MeApiServiceImpl.java  | 29 ++++++++------
 .../META-INF/cxf/user-backupcode-v1-cxf.xml   | 21 ----------
 7 files changed, 95 insertions(+), 67 deletions(-)
 create mode 100644 components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/factories/BackupCodeServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/main/resources/META-INF/cxf/user-backupcode-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.common/pom.xml b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.common/pom.xml
index da8944ae7..2cee13d82 100644
--- a/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) All Rights Reserved.
+  ~ Copyright (c) 2022-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
@@ -33,10 +33,5 @@
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
         </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.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/pom.xml
index 2b50ff7a9..3fc8f0bc9 100644
--- a/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) All Rights Reserved.
+  ~ Copyright (c) 2022-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
@@ -84,11 +84,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>
diff --git a/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/MeApi.java
index 1d119fe93..4e963231b 100644
--- a/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/MeApi.java
@@ -1,24 +1,26 @@
 /*
- * Copyright (c) 2022, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.backupcode.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.backupcode.v1.dto.BackupCodeResponseDTO;
 import org.wso2.carbon.identity.rest.api.user.backupcode.v1.dto.RemainingBackupCodeResponseDTO;
+import org.wso2.carbon.identity.rest.api.user.backupcode.v1.factories.MeApiServiceFactory;
 
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
@@ -35,8 +37,12 @@
 @io.swagger.annotations.Api(value = "/me", description = "the me API")
 public class MeApi  {
 
-    @Autowired
-    private MeApiService delegate;
+    private final MeApiService delegate;
+
+    public MeApi() {
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @Valid
     @DELETE
diff --git a/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/factories/MeApiServiceFactory.java
index 0b4f63092..eaca16ca0 100644
--- a/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/factories/MeApiServiceFactory.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2022, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.backupcode.v1.factories;
@@ -24,10 +26,15 @@
  */
 public class MeApiServiceFactory {
 
-    private final static MeApiService service = new MeApiServiceImpl();
+    private final static MeApiService SERVICE = new MeApiServiceImpl();
 
+    /**
+     * Get me api service.
+     *
+     * @return MeApiService instance.
+     */
     public static MeApiService getMeApi() {
 
-        return service;
+        return SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/factories/BackupCodeServiceFactory.java b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/factories/BackupCodeServiceFactory.java
new file mode 100644
index 000000000..1f4b77ea4
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/factories/BackupCodeServiceFactory.java
@@ -0,0 +1,39 @@
+/*
+ * 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.rest.api.user.backupcode.v1.factories;
+
+import org.wso2.carbon.identity.rest.api.user.backupcode.v1.core.BackupCodeService;
+
+/**
+ * Service factory class for backup code authenticator.
+ */
+public class BackupCodeServiceFactory {
+
+    private static final BackupCodeService SERVICE = new BackupCodeService();
+
+    /**
+     * Get backup code service.
+     *
+     * @return BackupCodeService instance.
+     */
+    public static BackupCodeService getBackupCodeService() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/impl/MeApiServiceImpl.java
index 8ba6eaa4a..9a6cca6cd 100644
--- a/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/backupcode/v1/impl/MeApiServiceImpl.java
@@ -1,23 +1,26 @@
 /*
- * Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) All Rights Reserved.
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.backupcode.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.backupcode.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.backupcode.v1.core.BackupCodeService;
+import org.wso2.carbon.identity.rest.api.user.backupcode.v1.factories.BackupCodeServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -26,8 +29,12 @@
  */
 public class MeApiServiceImpl extends MeApiService {
 
-    @Autowired
-    BackupCodeService backupCodeService;
+    private final BackupCodeService backupCodeService;
+
+    public MeApiServiceImpl() {
+
+        backupCodeService = BackupCodeServiceFactory.getBackupCodeService();
+    }
 
     @Override
     public Response meBackupCodesDelete() {
diff --git a/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/main/resources/META-INF/cxf/user-backupcode-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/main/resources/META-INF/cxf/user-backupcode-v1-cxf.xml
deleted file mode 100644
index e5a7de69d..000000000
--- a/components/org.wso2.carbon.identity.api.user.backupcode/org.wso2.carbon.identity.api.user.backupcode.v1/src/main/resources/META-INF/cxf/user-backupcode-v1-cxf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) 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.rest.api.user.backupcode.v1.impl.MeApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.backupcode.v1.core.BackupCodeService"/>
-</beans>

From de05888410c010fabc302ecfc8e82fe53a61012a Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Fri, 10 Jan 2025 17:15:52 +0530
Subject: [PATCH 07/15] Remove Spring dependency from api.user.common

---
 .../org.wso2.carbon.identity.api.user.common/pom.xml       | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.user.common/pom.xml b/components/org.wso2.carbon.identity.api.user.common/pom.xml
index 886aaab71..e19025dfc 100644
--- a/components/org.wso2.carbon.identity.api.user.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.org).
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -56,11 +56,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>

From 157ca08ad974a9f8873463372f5cb7649351192b Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Fri, 10 Jan 2025 17:16:53 +0530
Subject: [PATCH 08/15] Remove Spring dependency from api.user.fido2.v1

---
 .../pom.xml                                   |  5 ---
 .../pom.xml                                   |  5 ---
 .../rest/api/user/fido2/v1/MeApi.java         | 27 +++++++------
 .../v1/factories/MeApiServiceFactory.java     | 22 ++++++++++-
 .../v1/factories/WebAuthnServiceFactory.java  | 39 +++++++++++++++++++
 .../user/fido2/v1/impl/MeApiServiceImpl.java  | 28 +++++++++++--
 .../META-INF/cxf/user-fido2-v1-cxf.xml        | 21 ----------
 7 files changed, 100 insertions(+), 47 deletions(-)
 create mode 100644 components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/factories/WebAuthnServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/main/resources/META-INF/cxf/user-fido2-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.common/pom.xml b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.common/pom.xml
index 2a024bc11..e75482867 100644
--- a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.common/pom.xml
@@ -36,11 +36,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>
diff --git a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/pom.xml
index 808570c30..281ace8ec 100644
--- a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/pom.xml
@@ -88,11 +88,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>
diff --git a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/MeApi.java
index b65db2581..5a8d2ab74 100644
--- a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/MeApi.java
@@ -1,22 +1,23 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.fido2.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.fido2.v1.dto.*;
 import org.wso2.carbon.identity.rest.api.user.fido2.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.fido2.v1.factories.MeApiServiceFactory;
@@ -40,8 +41,12 @@
 @io.swagger.annotations.Api(value = "/me", description = "the me API")
 public class MeApi  {
 
-   @Autowired
-   private MeApiService delegate;
+   private final MeApiService delegate;
+
+   public MeApi() {
+
+      this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @DELETE
     @Path("/webauthn/{credentialId}")
diff --git a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/factories/MeApiServiceFactory.java
index f8f28c215..bba723072 100644
--- a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/factories/MeApiServiceFactory.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2019-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.rest.api.user.fido2.v1.factories;
 
 import org.wso2.carbon.identity.rest.api.user.fido2.v1.MeApiService;
@@ -5,10 +23,10 @@
 
 public class MeApiServiceFactory {
 
-   private final static MeApiService service = new MeApiServiceImpl();
+   private final static MeApiService SERVICE = new MeApiServiceImpl();
 
    public static MeApiService getMeApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/factories/WebAuthnServiceFactory.java b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/factories/WebAuthnServiceFactory.java
new file mode 100644
index 000000000..be739fd73
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/factories/WebAuthnServiceFactory.java
@@ -0,0 +1,39 @@
+/*
+ * 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.rest.api.user.fido2.v1.factories;
+
+import org.wso2.carbon.identity.application.authenticator.fido2.core.WebAuthnService;
+
+/**
+ * Factory class for WebAuthnService.
+ */
+public class WebAuthnServiceFactory {
+
+    private static final WebAuthnService SERVICE = new WebAuthnService();
+
+    /**
+    * This method is used to get the WebAuthnService instance.
+    *
+    * @return WebAuthnService instance.
+    */
+    public static WebAuthnService getWebAuthnService() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/impl/MeApiServiceImpl.java
index ced7ed072..83a63ca73 100644
--- a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/fido2/v1/impl/MeApiServiceImpl.java
@@ -1,9 +1,26 @@
+/*
+ * Copyright (c) 2019-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.rest.api.user.fido2.v1.impl;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.user.fido2.common.Constants;
 import org.wso2.carbon.identity.api.user.fido2.common.Util;
 import org.wso2.carbon.identity.application.authenticator.fido2.core.WebAuthnService;
@@ -15,6 +32,7 @@
 import org.wso2.carbon.identity.core.util.IdentityCoreConstants;
 import org.wso2.carbon.identity.core.util.IdentityUtil;
 import org.wso2.carbon.identity.rest.api.user.fido2.v1.MeApiService;
+import org.wso2.carbon.identity.rest.api.user.fido2.v1.factories.WebAuthnServiceFactory;
 
 import java.io.IOException;
 import java.net.URLDecoder;
@@ -28,8 +46,12 @@ public class MeApiServiceImpl extends MeApiService {
 
     private static final Log log = LogFactory.getLog(MeApiServiceImpl.class);
 
-    @Autowired
-    private WebAuthnService webAuthnService;
+    private final WebAuthnService webAuthnService;
+
+    public MeApiServiceImpl() {
+
+        this.webAuthnService = WebAuthnServiceFactory.getWebAuthnService();
+    }
 
     @Override
     public Response meWebauthnCredentialIdDelete(String credentialId) {
diff --git a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/main/resources/META-INF/cxf/user-fido2-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/main/resources/META-INF/cxf/user-fido2-v1-cxf.xml
deleted file mode 100644
index a94ada1bf..000000000
--- a/components/org.wso2.carbon.identity.api.user.fido2/org.wso2.carbon.identity.api.user.fido2.v1/src/main/resources/META-INF/cxf/user-fido2-v1-cxf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2019, 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.application.authenticator.fido2.core.WebAuthnService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.fido2.v1.impl.MeApiServiceImpl"/>
-</beans>

From e9f2333ad3181d6c286586d505ef212193e613f2 Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Fri, 10 Jan 2025 17:25:01 +0530
Subject: [PATCH 09/15] Remove Spring dependency from api.user.functionality

---
 .../pom.xml                                   |  9 +--
 .../UserFunctionalityServiceHolder.java       | 40 +++++-----
 .../RealmServiceOSGIServiceFactory.java       | 54 -------------
 ...serFunctionalityMgtOSGIServiceFactory.java | 53 -------------
 .../pom.xml                                   |  9 +--
 .../rest/api/user/functionality/v1/MeApi.java | 41 +++++-----
 .../api/user/functionality/v1/UserIdApi.java  | 15 ++--
 .../v1/factories/MeApiServiceFactory.java     | 48 +++++++-----
 .../v1/factories/UserIdApiServiceFactory.java | 22 ++++--
 .../v1/core/UserFunctionalityService.java     | 32 ++++----
 .../UserFunctionalityServiceFactory.java      | 77 +++++++++++++++++++
 .../v1/impl/MeApiServiceImpl.java             | 45 +++++++----
 .../v1/impl/UserIdApiServiceImpl.java         | 19 +++--
 .../cxf/user-functionality-v1-cxf.xml         | 33 --------
 14 files changed, 236 insertions(+), 261 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/RealmServiceOSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/UserFunctionalityMgtOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserFunctionalityServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/resources/META-INF/cxf/user-functionality-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/pom.xml b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/pom.xml
index df30dbef7..dcdbd55b7 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-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
@@ -28,11 +28,6 @@
     <artifactId>org.wso2.carbon.identity.api.user.functionality.common</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.user.functionality.mgt</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/UserFunctionalityServiceHolder.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/UserFunctionalityServiceHolder.java
index c1ebc51e7..45146f540 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/UserFunctionalityServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/UserFunctionalityServiceHolder.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-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
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.user.functionality.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.user.functionality.mgt.UserFunctionalityManager;
 import org.wso2.carbon.user.core.service.RealmService;
 
@@ -26,8 +27,21 @@
  */
 public class UserFunctionalityServiceHolder {
 
-    private static UserFunctionalityManager userFunctionalityManager;
-    private static RealmService realmService;
+    private UserFunctionalityServiceHolder() {
+
+    }
+
+    private static class UserFunctionalityManagerServiceHolder {
+
+        static final UserFunctionalityManager SERVICE = (UserFunctionalityManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(UserFunctionalityManager.class, null);
+    }
+
+    private static class RealmServiceHolder {
+
+        static final RealmService SERVICE = (RealmService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(RealmService.class, null);
+    }
 
     /**
      * Get UserFunctionalityManager osgi service.
@@ -36,26 +50,16 @@ public class UserFunctionalityServiceHolder {
      */
     public static UserFunctionalityManager getuserFunctionalityManager() {
 
-        return userFunctionalityManager;
+        return UserFunctionalityManagerServiceHolder.SERVICE;
     }
 
     /**
-     * Set UserFunctionalityManager osgi service.
+     * Get RealmService osgi service.
      *
-     * @param userFunctionalityManager UserFunctionalityManager
+     * @return RealmService
      */
-    public static void setUserFunctionalityManager(UserFunctionalityManager userFunctionalityManager) {
-
-        UserFunctionalityServiceHolder.userFunctionalityManager = userFunctionalityManager;
-    }
-
     public static RealmService getRealmService() {
 
-        return realmService;
-    }
-
-    public static void setRealmService(RealmService realmService) {
-
-        UserFunctionalityServiceHolder.realmService = realmService;
+        return RealmServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/RealmServiceOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/RealmServiceOSGIServiceFactory.java
deleted file mode 100644
index fcbaecdba..000000000
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/RealmServiceOSGIServiceFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. 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.user.functionality.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.user.core.service.RealmService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the RealmService type of object inside the container.
- */
-public class RealmServiceOSGIServiceFactory extends AbstractFactoryBean<RealmService> {
-
-    private RealmService realmService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected RealmService createInstance() throws Exception {
-
-        if (this.realmService == null) {
-            RealmService realmService
-                    = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                    .getOSGiService(RealmService.class, null);
-            if (realmService != null) {
-                this.realmService = realmService;
-            } else {
-                throw new Exception("Unable to retrieve RealmService.");
-            }
-        }
-        return this.realmService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/UserFunctionalityMgtOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/UserFunctionalityMgtOSGIServiceFactory.java
deleted file mode 100644
index d8171ab1b..000000000
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.api.user.functionality.common/src/main/java/org/wso2/carbon/identity/api/user/functionality/common/factory/UserFunctionalityMgtOSGIServiceFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. 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.user.functionality.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.user.functionality.mgt.UserFunctionalityManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the UserFunctionalityManager type of object inside the container.
- */
-public class UserFunctionalityMgtOSGIServiceFactory extends AbstractFactoryBean<UserFunctionalityManager> {
-
-    private UserFunctionalityManager userFunctionalityManager;
-
-    @Override
-    public Class<UserFunctionalityManager> getObjectType() {
-
-        return UserFunctionalityManager.class;
-    }
-
-    @Override
-    protected UserFunctionalityManager createInstance() throws Exception {
-
-        if (this.userFunctionalityManager == null) {
-            UserFunctionalityManager userFunctionalityManager = (UserFunctionalityManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(UserFunctionalityManager.class, null);
-            if (userFunctionalityManager != null) {
-                this.userFunctionalityManager = userFunctionalityManager;
-            } else {
-                throw new Exception("Unable to retrieve UserFunctionalityManager service.");
-            }
-        }
-        return this.userFunctionalityManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/pom.xml
index ec859a1c0..a69e76c82 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-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
@@ -40,11 +40,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>
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/MeApi.java
index 544288c36..b13a4945a 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/MeApi.java
@@ -1,31 +1,32 @@
 /*
-* Copyright (c) 2020, 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) 2020-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.rest.api.user.functionality.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.rest.api.user.functionality.v1.factories.MeApiServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.Error;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.LockStatusResponse;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.UserStatusChangeRequest;
-import org.wso2.carbon.identity.rest.api.user.functionality.v1.MeApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -39,8 +40,12 @@
 
 public class MeApi  {
 
-    @Autowired
-    private MeApiService delegate;
+    private final MeApiService delegate;
+
+    public MeApi() {
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @Valid
     @PUT
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/UserIdApi.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/UserIdApi.java
index be360ebbc..e6fd74333 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/UserIdApi.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/UserIdApi.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-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
@@ -18,8 +18,7 @@
 
 package org.wso2.carbon.identity.rest.api.user.functionality.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
+import org.wso2.carbon.identity.rest.api.user.functionality.v1.factories.UserIdApiServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.Error;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.LockStatusResponse;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.StatusChangeRequest;
@@ -34,8 +33,12 @@
 
 public class UserIdApi {
 
-    @Autowired
-    private UserIdApiService delegate;
+    private final UserIdApiService delegate;
+
+    public UserIdApi() {
+
+        this.delegate = UserIdApiServiceFactory.getUserIdApi();
+    }
 
     @Valid
     @PUT
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/MeApiServiceFactory.java
index 7c90277f7..a98ab8799 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/MeApiServiceFactory.java
@@ -1,30 +1,40 @@
 /*
-* Copyright (c) 2020, 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) 2020-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.rest.api.user.functionality.v1.factories;
 
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.impl.MeApiServiceImpl;
 
+/**
+ * Factory class for MeApiService.
+ */
 public class MeApiServiceFactory {
 
-   private final static MeApiService service = new MeApiServiceImpl();
+    private final static MeApiService SERVICE = new MeApiServiceImpl();
 
-   public static MeApiService getMeApi()
-   {
-      return service;
-   }
+    /**
+     * Get MeApiService service.
+     *
+     * @return MeApiService
+     */
+    public static MeApiService getMeApi() {
+
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserIdApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserIdApiServiceFactory.java
index 9ea7a8f78..df8439360 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserIdApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserIdApiServiceFactory.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-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
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.impl.UserIdApiServiceImpl;
 
+/**
+ * Factory class for UserIdApiService.
+ */
 public class UserIdApiServiceFactory {
 
-   private final static UserIdApiService service = new UserIdApiServiceImpl();
+    private final static UserIdApiService SERVICE = new UserIdApiServiceImpl();
+
+    /**
+     * Get UserIdApiService service.
+     *
+     * @return UserIdApiService
+     */
+    public static UserIdApiService getUserIdApi() {
 
-   public static UserIdApiService getUserIdApi()
-   {
-      return service;
-   }
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/core/UserFunctionalityService.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/core/UserFunctionalityService.java
index 26531bffa..28b01f8c8 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/core/UserFunctionalityService.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/core/UserFunctionalityService.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-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
@@ -26,7 +26,6 @@
 import org.wso2.carbon.identity.api.user.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.user.common.function.UserToUniqueId;
 import org.wso2.carbon.identity.api.user.functionality.common.Constants;
-import org.wso2.carbon.identity.api.user.functionality.common.UserFunctionalityServiceHolder;
 import org.wso2.carbon.identity.application.common.model.User;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.LockStatusResponse;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.StatusChangeRequest;
@@ -36,6 +35,7 @@
 import org.wso2.carbon.identity.user.functionality.mgt.exception.UserFunctionalityManagementClientException;
 import org.wso2.carbon.identity.user.functionality.mgt.exception.UserFunctionalityManagementException;
 import org.wso2.carbon.identity.user.functionality.mgt.model.FunctionalityLockStatus;
+import org.wso2.carbon.user.core.service.RealmService;
 
 import javax.ws.rs.core.Response;
 
@@ -48,8 +48,17 @@
  */
 public class UserFunctionalityService {
 
+    private final UserFunctionalityManager userFunctionalityManager;
+    private final RealmService realmService;
+
     private static final Log log = LogFactory.getLog(UserFunctionalityService.class);
 
+    public UserFunctionalityService(UserFunctionalityManager userFunctionalityManager, RealmService realmService) {
+
+        this.userFunctionalityManager = userFunctionalityManager;
+        this.realmService = realmService;
+    }
+
     /**
      * Lock or Unlock a functionality of a user by a privileged user.
      *
@@ -91,8 +100,6 @@ public Response lock(String userId, String functionalityIdentifier, StatusChange
             if (statusChangeRequest.getTimeToLock() != null) {
                 unlockTime = Long.parseLong(statusChangeRequest.getTimeToLock());
             }
-            UserFunctionalityManager userFunctionalityManager =
-                    UserFunctionalityServiceHolder.getuserFunctionalityManager();
             userFunctionalityManager.lock(userId,
                     tenantId, functionalityIdentifier, unlockTime,
                     statusChangeRequest.getFunctionalityLockReasonCode(),
@@ -119,8 +126,6 @@ public Response unlock(String userId, String functionalityIdentifier) {
 
         try {
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-            UserFunctionalityManager userFunctionalityManager =
-                    UserFunctionalityServiceHolder.getuserFunctionalityManager();
             userFunctionalityManager.unlock(userId,
                     tenantId, functionalityIdentifier);
             userFunctionalityManager.deleteAllPropertiesForUser(userId, tenantId, functionalityIdentifier);
@@ -147,9 +152,8 @@ public LockStatusResponse getLockStatus(String userId, String functionalityIdent
         try {
             LockStatusResponse lockStatusResponse;
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-            FunctionalityLockStatus functionalityLockStatus =
-                    UserFunctionalityServiceHolder.getuserFunctionalityManager().getLockStatus(userId,
-                            tenantId, functionalityIdentifier);
+            FunctionalityLockStatus functionalityLockStatus = userFunctionalityManager.getLockStatus(userId,
+                    tenantId, functionalityIdentifier);
             lockStatusResponse = new FunctionalityLockStatusToExternal().apply(functionalityLockStatus);
             return lockStatusResponse;
         } catch (UserFunctionalityManagementException e) {
@@ -195,8 +199,6 @@ public Response unlockLoggedInUser(String userId, String functionalityIdentifier
 
         try {
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-            UserFunctionalityManager userFunctionalityManager =
-                    UserFunctionalityServiceHolder.getuserFunctionalityManager();
 
             FunctionalityLockStatus lockStatus = userFunctionalityManager.getLockStatus(userId, tenantId,
                     functionalityIdentifier);
@@ -236,8 +238,6 @@ public Response lockLoggedInUser(String userId, String functionalityIdentifier,
             if (userStatusChangeRequest.getTimeToLock() != null) {
                 unlockTime = Long.parseLong(userStatusChangeRequest.getTimeToLock());
             }
-            UserFunctionalityManager userFunctionalityManager =
-                    UserFunctionalityServiceHolder.getuserFunctionalityManager();
             FunctionalityLockStatus status = userFunctionalityManager.getLockStatus(userId, tenantId,
                     functionalityIdentifier);
             if (status.getLockStatus() && !StringUtils.equals(status.getLockReasonCode(),
@@ -275,8 +275,6 @@ public LockStatusResponse getLockStatusOfLoggedInUser(String functionalityIdenti
             String userId = getUserIdFromUser(getUserFromContext());
             LockStatusResponse lockStatusResponse;
             int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
-            UserFunctionalityManager userFunctionalityManager =
-                    UserFunctionalityServiceHolder.getuserFunctionalityManager();
             FunctionalityLockStatus functionalityLockStatus = userFunctionalityManager
                     .getLockStatus(userId, tenantId, functionalityIdentifier);
             lockStatusResponse = new FunctionalityLockStatusToExternal().apply(functionalityLockStatus);
@@ -321,6 +319,6 @@ private static APIError handleError(Response.Status status, Constants.ErrorMessa
 
     private String getUserIdFromUser(User user) {
 
-        return new UserToUniqueId().apply(UserFunctionalityServiceHolder.getRealmService(), user);
+        return new UserToUniqueId().apply(realmService, user);
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserFunctionalityServiceFactory.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserFunctionalityServiceFactory.java
new file mode 100644
index 000000000..dc63c52b3
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/factories/UserFunctionalityServiceFactory.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.rest.api.user.functionality.v1.factories;
+
+import org.wso2.carbon.identity.api.user.functionality.common.UserFunctionalityServiceHolder;
+import org.wso2.carbon.identity.rest.api.user.functionality.v1.core.UserFunctionalityService;
+import org.wso2.carbon.identity.user.functionality.mgt.UserFunctionalityManager;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * Factory class for UserFunctionalityService.
+ */
+public class UserFunctionalityServiceFactory {
+
+    private UserFunctionalityServiceFactory() {
+
+    }
+
+    private static class UserFunctionalityServicesHolder {
+
+        private static final UserFunctionalityService SERVICE = createServiceInstance();
+    }
+
+    private static UserFunctionalityService createServiceInstance() {
+
+        UserFunctionalityManager userFunctionalityManager = getUserFunctionalityManager();
+        RealmService realmService = getRealmService();
+
+        return new UserFunctionalityService(userFunctionalityManager, realmService);
+    }
+
+    /**
+     * Get UserFunctionalityService service.
+     *
+     * @return UserFunctionalityService
+     */
+    public static UserFunctionalityService getUserFunctionalityService() {
+
+        return UserFunctionalityServicesHolder.SERVICE;
+    }
+
+    private static UserFunctionalityManager getUserFunctionalityManager() {
+
+        UserFunctionalityManager service = UserFunctionalityServiceHolder.getuserFunctionalityManager();
+        if (service == null) {
+            throw new IllegalStateException("UserFunctionalityManager is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static RealmService getRealmService() {
+
+        RealmService service = UserFunctionalityServiceHolder.getRealmService();
+        if (service == null) {
+            throw new IllegalStateException("RealmService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/MeApiServiceImpl.java
index 231c4d99c..2e0ee0705 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/MeApiServiceImpl.java
@@ -1,24 +1,26 @@
 /*
-* Copyright (c) 2020, 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) 2020-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.rest.api.user.functionality.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.core.UserFunctionalityService;
+import org.wso2.carbon.identity.rest.api.user.functionality.v1.factories.UserFunctionalityServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.UserStatusChangeRequest;
 
 import javax.ws.rs.core.Response;
@@ -28,8 +30,17 @@
  */
 public class MeApiServiceImpl implements MeApiService {
 
-    @Autowired
-    private UserFunctionalityService userFunctionalityService;
+    private final UserFunctionalityService userFunctionalityService;
+
+    public MeApiServiceImpl() {
+
+        try {
+            this.userFunctionalityService = UserFunctionalityServiceFactory.getUserFunctionalityService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating required services for " +
+                    "UserFunctionalityService.", e);
+        }
+    }
 
     @Override
     public Response changeStatusOfLoggedInUser(String functionId, UserStatusChangeRequest userStatusChangeRequest) {
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/UserIdApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/UserIdApiServiceImpl.java
index c36d6332e..e7ce901e5 100644
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/UserIdApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/functionality/v1/impl/UserIdApiServiceImpl.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-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
@@ -18,9 +18,9 @@
 
 package org.wso2.carbon.identity.rest.api.user.functionality.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.core.UserFunctionalityService;
+import org.wso2.carbon.identity.rest.api.user.functionality.v1.factories.UserFunctionalityServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.functionality.v1.model.StatusChangeRequest;
 
 import javax.ws.rs.core.Response;
@@ -30,8 +30,17 @@
  */
 public class UserIdApiServiceImpl implements UserIdApiService {
 
-    @Autowired
-    private UserFunctionalityService userFunctionalityService;
+    private final UserFunctionalityService userFunctionalityService;
+
+    public UserIdApiServiceImpl() {
+
+        try {
+            this.userFunctionalityService = UserFunctionalityServiceFactory.getUserFunctionalityService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating required services for " +
+                    "UserFunctionalityService.", e);
+        }
+    }
 
     @Override
     public Response changeStatus(String functionId, String userId, StatusChangeRequest statusChangeRequest) {
diff --git a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/resources/META-INF/cxf/user-functionality-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/resources/META-INF/cxf/user-functionality-v1-cxf.xml
deleted file mode 100644
index a7996d9f3..000000000
--- a/components/org.wso2.carbon.identity.api.user.functionality/org.wso2.carbon.identity.rest.api.user.functionality.v1/src/main/resources/META-INF/cxf/user-functionality-v1-cxf.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. 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.
-  -->
-
-<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-    <bean class="org.wso2.carbon.identity.rest.api.user.functionality.v1.impl.UserIdApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.functionality.v1.core.UserFunctionalityService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.functionality.v1.impl.MeApiServiceImpl"/>
-    <bean id="userFunctionalityManager"
-          class="org.wso2.carbon.identity.api.user.functionality.common.UserFunctionalityServiceHolder">
-        <property name="userFunctionalityManager" ref="userFunctionalityServiceFactoryBean"/>
-        <property name="realmService" ref="realmServiceOSGIServiceFactoryBean"/>
-    </bean>
-    <bean id="userFunctionalityServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.functionality.common.factory.UserFunctionalityMgtOSGIServiceFactory"/>
-    <bean id="realmServiceOSGIServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.functionality.common.factory.RealmServiceOSGIServiceFactory"/>
-</beans>

From d561c3307014ae0b8e609eaabb826c0a6412fa09 Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Fri, 10 Jan 2025 17:27:08 +0530
Subject: [PATCH 10/15] Remove Spring dependency from api.user.idv

---
 .../pom.xml                                   |  7 +-
 .../IdentityVerificationServiceHolder.java    | 38 +++++------
 ...dentityVerificationManagerOSGIFactory.java | 55 ----------------
 .../pom.xml                                   |  7 +-
 .../rest/api/user/idv/v1/DefaultApi.java      | 13 ++--
 .../identity/rest/api/user/idv/v1/MeApi.java  | 13 ++--
 .../factories/DefaultApiServiceFactory.java   | 20 ++++--
 .../idv/v1/factories/MeApiServiceFactory.java | 20 ++++--
 .../v1/core/IdentityVerificationService.java  | 37 ++++++-----
 .../IdentityVerificationServiceFactory.java   | 65 +++++++++++++++++++
 .../idv/v1/impl/DefaultApiServiceImpl.java    | 17 +++--
 .../user/idv/v1/impl/MeApiServiceImpl.java    | 18 +++--
 .../resources/META-INF/cxf/idv-v1-cxf.xml     | 29 ---------
 13 files changed, 175 insertions(+), 164 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.common/src/main/java/org/wso2/carbon/identity/api/user/idv/common/factory/IdentityVerificationManagerOSGIFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/factories/IdentityVerificationServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/resources/META-INF/cxf/idv-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.common/pom.xml b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.common/pom.xml
index e220f14f3..5d2e6c9f9 100644
--- a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023-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
@@ -39,11 +39,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>org.wso2.carbon.extension.identity.verification</groupId>
             <artifactId>org.wso2.carbon.extension.identity.verification.provider</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.common/src/main/java/org/wso2/carbon/identity/api/user/idv/common/IdentityVerificationServiceHolder.java b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.common/src/main/java/org/wso2/carbon/identity/api/user/idv/common/IdentityVerificationServiceHolder.java
index dc9185634..5a3e0eb8d 100644
--- a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.common/src/main/java/org/wso2/carbon/identity/api/user/idv/common/IdentityVerificationServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.common/src/main/java/org/wso2/carbon/identity/api/user/idv/common/IdentityVerificationServiceHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.user.idv.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.extension.identity.verification.mgt.IdentityVerificationManager;
 import org.wso2.carbon.extension.identity.verification.provider.IdVProviderManager;
 
@@ -26,37 +27,30 @@
  */
 public class IdentityVerificationServiceHolder {
 
-    private static IdVProviderManager idVProviderManager;
-    private static IdentityVerificationManager identityVerificationManager;
+    private IdentityVerificationServiceHolder() {
 
-    /**
-     * Get IdVProviderManager osgi service.
-     *
-     * @return IdVProviderManager
-     */
-    public static IdVProviderManager getIdVProviderManager() {
+    }
 
-        return idVProviderManager;
+    private static class IdVProviderManagerHolder {
+
+        static final IdVProviderManager SERVICE = (IdVProviderManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(IdVProviderManager.class, null);
     }
 
-    /**
-     * Set IdVProviderManager osgi service.
-     *
-     * @param idVProviderManager IdVProviderManager.
-     */
-    public static void setIdVProviderManager(IdVProviderManager idVProviderManager) {
+    private static class IdentityVerificationManagerHolder {
 
-        IdentityVerificationServiceHolder.idVProviderManager = idVProviderManager;
+        static final IdentityVerificationManager SERVICE = (IdentityVerificationManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(IdentityVerificationManager.class, null);
     }
 
     /**
-     * Set IdentityVerificationManager osgi service.
+     * Get IdVProviderManager osgi service.
      *
-     * @param identityVerificationManager IdentityVerificationManager.
+     * @return IdVProviderManager
      */
-    public static void setIdentityVerificationManager(IdentityVerificationManager identityVerificationManager) {
+    public static IdVProviderManager getIdVProviderManager() {
 
-        IdentityVerificationServiceHolder.identityVerificationManager = identityVerificationManager;
+        return IdVProviderManagerHolder.SERVICE;
     }
 
     /**
@@ -66,6 +60,6 @@ public static void setIdentityVerificationManager(IdentityVerificationManager id
      */
     public static IdentityVerificationManager getIdentityVerificationManager() {
 
-        return identityVerificationManager;
+        return IdentityVerificationManagerHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.common/src/main/java/org/wso2/carbon/identity/api/user/idv/common/factory/IdentityVerificationManagerOSGIFactory.java b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.common/src/main/java/org/wso2/carbon/identity/api/user/idv/common/factory/IdentityVerificationManagerOSGIFactory.java
deleted file mode 100644
index f7c5945bf..000000000
--- a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.common/src/main/java/org/wso2/carbon/identity/api/user/idv/common/factory/IdentityVerificationManagerOSGIFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2023, 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.user.idv.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.extension.identity.verification.mgt.IdentityVerificationManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the IdentityVerificationServiceOSGIFactory inside the container.
- */
-public class IdentityVerificationManagerOSGIFactory extends AbstractFactoryBean<IdentityVerificationManager> {
-
-    private IdentityVerificationManager identityVerificationManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected IdentityVerificationManager createInstance() throws Exception {
-
-        if (this.identityVerificationManager == null) {
-            IdentityVerificationManager identityVerificationManager = (IdentityVerificationManager)
-                    (PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(IdentityVerificationManager.class, null));
-            if (identityVerificationManager != null) {
-                this.identityVerificationManager = identityVerificationManager;
-            } else {
-                throw new Exception("Unable to retrieve IdentityVerificationService.");
-            }
-        }
-        return this.identityVerificationManager;
-    }
-
-}
diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/pom.xml
index 18b090cae..8a48cb501 100644
--- a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023-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
@@ -84,11 +84,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/DefaultApi.java b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/DefaultApi.java
index 7874e3ea4..baa109d75 100644
--- a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/DefaultApi.java
+++ b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/DefaultApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,12 +18,12 @@
 
 package org.wso2.carbon.identity.rest.api.user.idv.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.rest.api.user.idv.v1.factories.DefaultApiServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.Error;
 import java.util.List;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerificationClaimRequest;
@@ -31,7 +31,6 @@
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerificationClaimUpdateRequest;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerificationPostResponse;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerifyRequest;
-import org.wso2.carbon.identity.rest.api.user.idv.v1.DefaultApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -45,8 +44,12 @@
 
 public class DefaultApi  {
 
-    @Autowired
-    private DefaultApiService delegate;
+    private final DefaultApiService delegate;
+
+    public DefaultApi() {
+
+        this.delegate = DefaultApiServiceFactory.getDefaultApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/MeApi.java
index 7db498460..bc1ea51b9 100644
--- a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/MeApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,17 +18,16 @@
 
 package org.wso2.carbon.identity.rest.api.user.idv.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.rest.api.user.idv.v1.factories.MeApiServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.Error;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerificationClaimResponse;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerificationPostResponse;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerifyRequest;
-import org.wso2.carbon.identity.rest.api.user.idv.v1.MeApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -42,8 +41,12 @@
 
 public class MeApi  {
 
-    @Autowired
-    private MeApiService delegate;
+    private final MeApiService delegate;
+
+    public MeApi() {
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/factories/DefaultApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/factories/DefaultApiServiceFactory.java
index bd4536d7b..729b0eef1 100644
--- a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/factories/DefaultApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/factories/DefaultApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.rest.api.user.idv.v1.DefaultApiService;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.impl.DefaultApiServiceImpl;
 
+/**
+ * Factory class for DefaultApiService.
+ */
 public class DefaultApiServiceFactory {
 
-   private final static DefaultApiService service = new DefaultApiServiceImpl();
+    private final static DefaultApiService SERVICE = new DefaultApiServiceImpl();
+
+    /**
+     * Get DefaultApiService.
+     *
+     * @return DefaultApiService
+     */
+    public static DefaultApiService getDefaultApi() {
 
-   public static DefaultApiService getDefaultApi()
-   {
-      return service;
-   }
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/factories/MeApiServiceFactory.java
index 75619cd52..65b6d331f 100644
--- a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/idv/v1/factories/MeApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.rest.api.user.idv.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.impl.MeApiServiceImpl;
 
+/**
+ * Factory class for MeApiService.
+ */
 public class MeApiServiceFactory {
 
-   private final static MeApiService service = new MeApiServiceImpl();
+    private final static MeApiService SERVICE = new MeApiServiceImpl();
+
+    /**
+     * Get MeApiService.
+     *
+     * @return MeApiService
+     */
+    public static MeApiService getMeApi() {
 
-   public static MeApiService getMeApi()
-   {
-      return service;
-   }
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/core/IdentityVerificationService.java b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/core/IdentityVerificationService.java
index 4bd0bde70..b29b2dd4f 100644
--- a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/core/IdentityVerificationService.java
+++ b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/core/IdentityVerificationService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -15,12 +15,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.wso2.carbon.identity.rest.api.user.idv.v1.core;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.extension.identity.verification.mgt.IdentityVerificationManager;
 import org.wso2.carbon.extension.identity.verification.mgt.exception.IdentityVerificationClientException;
 import org.wso2.carbon.extension.identity.verification.mgt.exception.IdentityVerificationException;
 import org.wso2.carbon.extension.identity.verification.mgt.model.IdVClaim;
@@ -30,7 +32,6 @@
 import org.wso2.carbon.identity.api.user.common.error.APIError;
 import org.wso2.carbon.identity.api.user.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.user.idv.common.Constants;
-import org.wso2.carbon.identity.api.user.idv.common.IdentityVerificationServiceHolder;
 import org.wso2.carbon.identity.base.IdentityException;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.ProviderProperty;
@@ -50,8 +51,15 @@
  */
 public class IdentityVerificationService {
 
+    private final IdentityVerificationManager identityVerificationManager;
+
     private static final Log log = LogFactory.getLog(IdentityVerificationService.class);
 
+    public IdentityVerificationService(IdentityVerificationManager identityVerificationManager) {
+
+        this.identityVerificationManager = identityVerificationManager;
+    }
+
     /**
      * Add identity verification claim.
      *
@@ -64,8 +72,8 @@ public List<VerificationClaimResponse> addIdVClaims(String userId,
         List<IdVClaim> idVClaims;
         int tenantId = getTenantId();
         try {
-            idVClaims = IdentityVerificationServiceHolder.getIdentityVerificationManager().
-                    addIdVClaims(userId, createIdVClaims(userId, verificationClaimRequest), tenantId);
+            idVClaims = identityVerificationManager.addIdVClaims(userId, createIdVClaims(userId,
+                    verificationClaimRequest), tenantId);
         } catch (IdentityVerificationException e) {
             if (IdentityVerificationConstants.ErrorMessage.ERROR_INVALID_USER_ID.getCode().equals(e.getErrorCode())) {
                 throw handleIdVException(e, Constants.ErrorMessage.ERROR_CODE_USER_ID_NOT_FOUND, userId);
@@ -94,8 +102,7 @@ public VerificationClaimResponse getIdVClaim(String userId, String claimId) {
         IdVClaim idVClaim;
         int tenantId = getTenantId();
         try {
-            idVClaim = IdentityVerificationServiceHolder.
-                    getIdentityVerificationManager().getIdVClaim(userId, claimId, tenantId);
+            idVClaim = identityVerificationManager.getIdVClaim(userId, claimId, tenantId);
             if (idVClaim == null) {
                 throw handleException(Response.Status.NOT_FOUND,
                         Constants.ErrorMessage.ERROR_CODE_IDV_CLAIM_NOT_FOUND, claimId);
@@ -129,8 +136,7 @@ public VerificationClaimResponse updateIdVClaim(String userId, String claimId,
         IdVClaim idVClaim;
         int tenantId = getTenantId();
         try {
-            idVClaim = IdentityVerificationServiceHolder.getIdentityVerificationManager().
-                    getIdVClaim(userId, claimId, tenantId);
+            idVClaim = identityVerificationManager.getIdVClaim(userId, claimId, tenantId);
             if (idVClaim == null) {
                 throw handleException(Response.Status.NOT_FOUND,
                         Constants.ErrorMessage.ERROR_CODE_IDV_CLAIM_NOT_FOUND, claimId);
@@ -140,8 +146,8 @@ public VerificationClaimResponse updateIdVClaim(String userId, String claimId,
                 throw handleException(Response.Status.BAD_REQUEST,
                         Constants.ErrorMessage.ERROR_CODE_INCOMPLETE_UPDATE_REQUEST, claimId);
             }
-            idVClaim = IdentityVerificationServiceHolder.getIdentityVerificationManager().
-                    updateIdVClaim(userId, createIdVClaims(verificationClaimUpdateRequest, userId, claimId), tenantId);
+            idVClaim = identityVerificationManager.updateIdVClaim(userId,
+                    createIdVClaims(verificationClaimUpdateRequest, userId, claimId), tenantId);
         } catch (IdentityVerificationException e) {
             if (IdentityVerificationConstants.ErrorMessage.ERROR_INVALID_USER_ID.getCode().equals(e.getErrorCode())) {
                 throw handleIdVException(e, Constants.ErrorMessage.ERROR_CODE_USER_ID_NOT_FOUND, userId);
@@ -168,8 +174,8 @@ public List<VerificationClaimResponse> updateIdVClaims(String userId,
         List<IdVClaim> idVClaims;
         int tenantId = getTenantId();
         try {
-            idVClaims = IdentityVerificationServiceHolder.getIdentityVerificationManager().
-                    updateIdVClaims(userId, createIdVClaims(userId, verificationClaimRequest), tenantId);
+            idVClaims = identityVerificationManager.updateIdVClaims(userId, createIdVClaims(userId,
+                    verificationClaimRequest), tenantId);
         } catch (IdentityVerificationException e) {
             if (IdentityVerificationConstants.ErrorMessage.ERROR_INVALID_USER_ID.getCode().equals(e.getErrorCode())) {
                 throw handleIdVException(e, Constants.ErrorMessage.ERROR_CODE_USER_ID_NOT_FOUND, userId);
@@ -200,8 +206,7 @@ public List<VerificationClaimResponse> getIdVClaims(String userId, String idvPro
         IdVClaim[] idVClaims;
         int tenantId = getTenantId();
         try {
-            idVClaims = IdentityVerificationServiceHolder.getIdentityVerificationManager().
-                    getIdVClaims(userId, idvProviderId, null, tenantId);
+            idVClaims = identityVerificationManager.getIdVClaims(userId, idvProviderId, null, tenantId);
         } catch (IdentityVerificationException e) {
             if (IdentityVerificationConstants.ErrorMessage.ERROR_INVALID_USER_ID.getCode().equals(e.getErrorCode())) {
                 throw handleIdVException(e, Constants.ErrorMessage.ERROR_CODE_USER_ID_NOT_FOUND, userId);
@@ -227,8 +232,8 @@ public VerificationPostResponse verifyIdentity(String userId, VerifyRequest veri
         IdentityVerifierData identityVerifierData = getIdentityVerifierData(verifyRequest);
         int tenantId = getTenantId();
         try {
-            identityVerifierResponse = IdentityVerificationServiceHolder.getIdentityVerificationManager().
-                    verifyIdentity(userId, identityVerifierData, tenantId);
+            identityVerifierResponse = identityVerificationManager.verifyIdentity(userId,
+                    identityVerifierData, tenantId);
         } catch (IdentityVerificationException e) {
             if (IdentityVerificationConstants.ErrorMessage.ERROR_INVALID_USER_ID.getCode().equals(e.getErrorCode())) {
                 throw handleIdVException(e, Constants.ErrorMessage.ERROR_CODE_USER_ID_NOT_FOUND, userId);
diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/factories/IdentityVerificationServiceFactory.java b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/factories/IdentityVerificationServiceFactory.java
new file mode 100644
index 000000000..bd1b3aaba
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/factories/IdentityVerificationServiceFactory.java
@@ -0,0 +1,65 @@
+/*
+ * 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.rest.api.user.idv.v1.factories;
+
+import org.wso2.carbon.extension.identity.verification.mgt.IdentityVerificationManager;
+import org.wso2.carbon.identity.api.user.idv.common.IdentityVerificationServiceHolder;
+import org.wso2.carbon.identity.rest.api.user.idv.v1.core.IdentityVerificationService;
+
+/**
+ * Factory class for IdentityVerificationService.
+ */
+public class IdentityVerificationServiceFactory {
+
+    private IdentityVerificationServiceFactory() {
+
+    }
+
+    private static class IdentityVerificationServicesHolder {
+
+        private static final IdentityVerificationService SERVICE = createServiceInstance();
+    }
+
+    private static IdentityVerificationService createServiceInstance() {
+
+        IdentityVerificationManager identityVerificationManager = getIdentityVerificationManager();
+
+        return new IdentityVerificationService(identityVerificationManager);
+    }
+
+    /**
+     * Get IdentityVerificationService.
+     *
+     * @return IdentityVerificationService
+     */
+    public static IdentityVerificationService getIdentityVerificationService() {
+
+        return IdentityVerificationServicesHolder.SERVICE;
+    }
+
+    private static IdentityVerificationManager getIdentityVerificationManager() {
+
+        IdentityVerificationManager service = IdentityVerificationServiceHolder.getIdentityVerificationManager();
+        if (service == null) {
+            throw new IllegalStateException("IdentityVerificationManager is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/impl/DefaultApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/impl/DefaultApiServiceImpl.java
index 8a55dff16..12d7c2761 100644
--- a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/impl/DefaultApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/impl/DefaultApiServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,9 +18,9 @@
 
 package org.wso2.carbon.identity.rest.api.user.idv.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.DefaultApiService;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.core.IdentityVerificationService;
+import org.wso2.carbon.identity.rest.api.user.idv.v1.factories.IdentityVerificationServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerificationClaimRequest;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerificationClaimResponse;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerificationClaimUpdateRequest;
@@ -35,8 +35,17 @@
  */
 public class DefaultApiServiceImpl implements DefaultApiService {
 
-    @Autowired
-    IdentityVerificationService identityVerificationService;
+    private final IdentityVerificationService identityVerificationService;
+
+    public DefaultApiServiceImpl() {
+
+        try {
+            this.identityVerificationService = IdentityVerificationServiceFactory.getIdentityVerificationService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating required services for " +
+                    "IdentityVerificationService.", e);
+        }
+    }
 
     @Override
     public Response addIdVClaim(String userId, List<VerificationClaimRequest> verificationClaimRequest) {
diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/impl/MeApiServiceImpl.java
index fc82b453e..ee64cb5f9 100644
--- a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/idv/v1/impl/MeApiServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,9 +18,10 @@
 
 package org.wso2.carbon.identity.rest.api.user.idv.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.core.IdentityVerificationService;
+import org.wso2.carbon.identity.rest.api.user.idv.v1.factories.IdentityVerificationServiceFactory;
+import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerificationClaimRequest;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerificationClaimResponse;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerificationPostResponse;
 import org.wso2.carbon.identity.rest.api.user.idv.v1.model.VerifyRequest;
@@ -36,8 +37,17 @@
  */
 public class MeApiServiceImpl implements MeApiService {
 
-    @Autowired
-    IdentityVerificationService identityVerificationService;
+    private final IdentityVerificationService identityVerificationService;
+
+    public MeApiServiceImpl() {
+
+        try {
+            this.identityVerificationService = IdentityVerificationServiceFactory.getIdentityVerificationService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating required services for " +
+                    "IdentityVerificationService.", e);
+        }
+    }
 
     @Override
     public Response meGetIdVClaim(String claimId) {
diff --git a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/resources/META-INF/cxf/idv-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/resources/META-INF/cxf/idv-v1-cxf.xml
deleted file mode 100644
index ac9341400..000000000
--- a/components/org.wso2.carbon.identity.api.user.idv/org.wso2.carbon.identity.api.user.idv.v1/src/main/resources/META-INF/cxf/idv-v1-cxf.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  ~ Copyright (c) 2023, 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.
-  -->
-
-<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.rest.api.user.idv.v1.core.IdentityVerificationService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.idv.v1.impl.DefaultApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.idv.v1.impl.MeApiServiceImpl"/>
-    <bean id="IdentityVerificationServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.idv.common.factory.IdentityVerificationManagerOSGIFactory"/>
-    <bean id="IdentityVerificationServiceHolderBean"
-          class="org.wso2.carbon.identity.api.user.idv.common.IdentityVerificationServiceHolder">
-        <property name="identityVerificationManager" ref="IdentityVerificationServiceFactoryBean"/>
-    </bean>
-</beans>

From 7061f1cdaa3b6dea0bccd9fb8d223c42e846f24a Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Fri, 10 Jan 2025 17:27:43 +0530
Subject: [PATCH 11/15] Remove Spring dependency from api.user.mfa

---
 .../pom.xml                                   |  9 +--
 .../pom.xml                                   |  9 +--
 .../identity/rest/api/user/mfa/v1/MeApi.java  | 27 ++++----
 .../mfa/v1/factories/MeApiServiceFactory.java | 33 ++++++----
 .../RealmServiceOSGIServiceFactory.java       | 52 ---------------
 .../rest/api/user/mfa/v1/core/MFAService.java | 37 ++++++-----
 .../mfa/v1/factories/MFAServiceFactory.java   | 65 +++++++++++++++++++
 .../user/mfa/v1/impl/MeApiServiceImpl.java    | 33 ++++++----
 .../mfa/v1/util/UserMFAServiceHolder.java     | 41 ++++++------
 .../META-INF/cxf/user-mfa-v1-cxf.xml          | 28 --------
 10 files changed, 169 insertions(+), 165 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/factory/RealmServiceOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/factories/MFAServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/resources/META-INF/cxf/user-mfa-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.common/pom.xml b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.common/pom.xml
index 0ec043ce2..660738394 100644
--- a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) All Rights Reserved.
+  ~ Copyright (c) 2022-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
@@ -33,10 +33,5 @@
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
         </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.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/pom.xml
index 8eea717c7..6b7b4082c 100644
--- a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) All Rights Reserved.
+  ~ Copyright (c) 2022-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
@@ -84,11 +84,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>
diff --git a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/MeApi.java
index 64f3b1a03..bd43f858c 100644
--- a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/MeApi.java
@@ -1,22 +1,23 @@
 /*
- * Copyright (c) 2022, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.mfa.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.mfa.v1.dto.*;
 import org.wso2.carbon.identity.rest.api.user.mfa.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.mfa.v1.factories.MeApiServiceFactory;
@@ -42,8 +43,12 @@
 @io.swagger.annotations.Api(value = "/me", description = "the me API")
 public class MeApi  {
 
-    @Autowired
-    private MeApiService delegate;
+    private final MeApiService delegate;
+
+    public MeApi() {
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/factories/MeApiServiceFactory.java
index 1d73128b2..b2b7b17db 100644
--- a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/factories/MeApiServiceFactory.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2022, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.mfa.v1.factories;
@@ -24,10 +26,15 @@
  */
 public class MeApiServiceFactory {
 
-   private final static MeApiService service = new MeApiServiceImpl();
+    private final static MeApiService SERVICE = new MeApiServiceImpl();
 
-   public static MeApiService getMeApi()
-   {
-      return service;
-   }
+    /**
+     * Get me API service.
+     *
+     * @return MeApiService
+     */
+    public static MeApiService getMeApi() {
+
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/factory/RealmServiceOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/factory/RealmServiceOSGIServiceFactory.java
deleted file mode 100644
index 901dc4d9a..000000000
--- a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/factory/RealmServiceOSGIServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) 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.rest.api.user.mfa.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.user.core.service.RealmService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the RealmService type of object inside the container.
- */
-public class RealmServiceOSGIServiceFactory extends AbstractFactoryBean<RealmService> {
-
-    private RealmService realmService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected RealmService createInstance() throws Exception {
-
-        if (this.realmService == null) {
-            RealmService realmService
-                    = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                    .getOSGiService(RealmService.class, null);
-            if (realmService != null) {
-                this.realmService = realmService;
-            } else {
-                throw new Exception("Unable to retrieve RealmService.");
-            }
-        }
-        return this.realmService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/core/MFAService.java b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/core/MFAService.java
index 897c11d1f..ce9a4b104 100644
--- a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/core/MFAService.java
+++ b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/core/MFAService.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) All Rights Reserved.
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.mfa.v1.core;
@@ -27,9 +29,9 @@
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.core.util.IdentityUtil;
 import org.wso2.carbon.identity.rest.api.user.mfa.v1.dto.EnabledAuthenticatorsDTO;
-import org.wso2.carbon.identity.rest.api.user.mfa.v1.util.UserMFAServiceHolder;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.api.UserStoreManager;
+import org.wso2.carbon.user.core.service.RealmService;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -54,8 +56,15 @@
  */
 public class MFAService {
 
+    private final RealmService realmService;
+
     private static final Log log = LogFactory.getLog(MFAService.class);
 
+    public MFAService(RealmService realmService) {
+
+        this.realmService = realmService;
+    }
+
     /**
      * Uses to get enabled authenticators of the authenticated user.
      *
@@ -67,9 +76,8 @@ public EnabledAuthenticatorsDTO getEnabledAuthenticators() {
             throw handleError(Response.Status.FORBIDDEN, USER_ERROR_ACCESS_DENIED_FOR_BASIC_AUTH);
         }
         try {
-            UserStoreManager userStoreManager =
-                    UserMFAServiceHolder.getRealmService().getTenantUserRealm(IdentityTenantUtil
-                            .getTenantId(getTenantDomain())).getUserStoreManager();
+            UserStoreManager userStoreManager = realmService.getTenantUserRealm(IdentityTenantUtil
+                    .getTenantId(getTenantDomain())).getUserStoreManager();
             if (userStoreManager == null) {
                 if (log.isDebugEnabled()) {
                     log.debug("Unable to retrieve userstore manager.");
@@ -101,9 +109,8 @@ public EnabledAuthenticatorsDTO updateEnabledAuthenticators(String enabledAuthen
             validateAuthenticatorList(enabledAuthenticators);
         }
         try {
-            UserStoreManager userStoreManager =
-                    UserMFAServiceHolder.getRealmService().getTenantUserRealm(IdentityTenantUtil
-                            .getTenantId(getTenantDomain())).getUserStoreManager();
+            UserStoreManager userStoreManager = realmService.getTenantUserRealm(IdentityTenantUtil
+                    .getTenantId(getTenantDomain())).getUserStoreManager();
             Map<String, String> claims = new HashMap<>();
             if (userStoreManager == null) {
                 if (log.isDebugEnabled()) {
diff --git a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/factories/MFAServiceFactory.java b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/factories/MFAServiceFactory.java
new file mode 100644
index 000000000..cdfcf5e15
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/factories/MFAServiceFactory.java
@@ -0,0 +1,65 @@
+/*
+ * 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.rest.api.user.mfa.v1.factories;
+
+import org.wso2.carbon.identity.rest.api.user.mfa.v1.core.MFAService;
+import org.wso2.carbon.identity.rest.api.user.mfa.v1.util.UserMFAServiceHolder;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * Factory class for MFAService.
+ */
+public class MFAServiceFactory {
+
+    private MFAServiceFactory() {
+
+    }
+
+    private static class MFAServicesHolder {
+
+        private static final MFAService SERVICE = createServiceInstance();
+    }
+
+    private static MFAService createServiceInstance() {
+
+        RealmService realmService = getRealmService();
+
+        return new MFAService(realmService);
+    }
+
+    /**
+     * Get MFAService service.
+     *
+     * @return MFAService.
+     */
+    public static MFAService getMFAService() {
+
+        return MFAServicesHolder.SERVICE;
+    }
+
+    private static RealmService getRealmService() {
+
+        RealmService service = UserMFAServiceHolder.getRealmService();
+        if (service == null) {
+            throw new IllegalStateException("RealmService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/impl/MeApiServiceImpl.java
index 3fded7f5e..f4f7c9bfe 100644
--- a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/impl/MeApiServiceImpl.java
@@ -1,27 +1,28 @@
 /*
- * Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) All Rights Reserved.
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.mfa.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.mfa.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.mfa.v1.core.MFAService;
 
 import org.wso2.carbon.identity.rest.api.user.mfa.v1.dto.EnabledAuthenticatorsDTO;
-
+import org.wso2.carbon.identity.rest.api.user.mfa.v1.factories.MFAServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -30,8 +31,16 @@
  */
 public class MeApiServiceImpl extends MeApiService {
 
-    @Autowired
-    MFAService mfaService;
+    private final MFAService mfaService;
+
+    public MeApiServiceImpl() {
+
+        try {
+            this.mfaService = MFAServiceFactory.getMFAService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating the MFAService.", e);
+        }
+    }
 
     @Override
     public Response meMfaAuthenticatorsGet() {
diff --git a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/util/UserMFAServiceHolder.java b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/util/UserMFAServiceHolder.java
index a09fc9959..218db3211 100644
--- a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/util/UserMFAServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/util/UserMFAServiceHolder.java
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) All Rights Reserved.
+ * Copyright (c) 2022-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.mfa.v1.util;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.user.core.service.RealmService;
 
 /**
@@ -23,25 +26,23 @@
  */
 public class UserMFAServiceHolder {
 
-    private static RealmService realmService;
+    private UserMFAServiceHolder() {
 
-    /**
-     * Get realm service.
-     *
-     * @return Realm service.
-     */
-    public static RealmService getRealmService() {
+    }
+
+    private static class RealmServiceHolder {
 
-        return realmService;
+        static final RealmService SERVICE = (RealmService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(RealmService.class, null);
     }
 
     /**
-     * Set realm service.
+     * Get realm service.
      *
-     * @param realmService Realm service object.
+     * @return Realm service.
      */
-    public static void setRealmService(RealmService realmService) {
+    public static RealmService getRealmService() {
 
-        UserMFAServiceHolder.realmService = realmService;
+        return RealmServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/resources/META-INF/cxf/user-mfa-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/resources/META-INF/cxf/user-mfa-v1-cxf.xml
deleted file mode 100644
index 17199b39c..000000000
--- a/components/org.wso2.carbon.identity.api.user.mfa/org.wso2.carbon.identity.api.user.mfa.v1/src/main/resources/META-INF/cxf/user-mfa-v1-cxf.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com) 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"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-<bean class="org.wso2.carbon.identity.rest.api.user.mfa.v1.impl.MeApiServiceImpl"/>
-<bean class="org.wso2.carbon.identity.rest.api.user.mfa.v1.core.MFAService"/>
-    <bean id="RealmServiceOSGIServiceFactoryBean"
-          class="org.wso2.carbon.identity.rest.api.user.mfa.factory.RealmServiceOSGIServiceFactory"/>
-    <bean id="UserMFAServiceHolderBean"
-          class="org.wso2.carbon.identity.rest.api.user.mfa.v1.util.UserMFAServiceHolder">
-        <property name="realmService" ref="RealmServiceOSGIServiceFactoryBean"/>
-    </bean>
-</beans>

From bf4d7bd1ac2f0bf3a3e7a67ea7e3c19817143b50 Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Sat, 11 Jan 2025 07:43:34 +0530
Subject: [PATCH 12/15] Remove Spring dependency from api.user.onboard

---
 .../pom.xml                                   | 42 +++++-------
 .../common/UserOnboardServiceDataHolder.java  | 24 ++++---
 .../common/factory/OSGIServiceFactory.java    | 56 ----------------
 .../pom.xml                                   | 37 +++++------
 .../user/onboard/v1/OfflineInviteLinkApi.java | 13 ++--
 .../OfflineInviteLinkApiServiceFactory.java   | 16 +++--
 .../OfflineInviteLinkServiceFactory.java      | 65 +++++++++++++++++++
 .../impl/OfflineInviteLinkApiServiceImpl.java | 18 ++---
 .../v1/service/OfflineInviteLinkService.java  | 14 ++--
 .../cxf/user-onboard-management-cxf.xml       | 15 -----
 10 files changed, 151 insertions(+), 149 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.common/src/main/java/org/wso2/carbon/identity/api/user/onboard/common/factory/OSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/java/org/wso2/carbon/identity/api/user/onboard/v1/factories/OfflineInviteLinkServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/resources/META-INF/cxf/user-onboard-management-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.common/pom.xml b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.common/pom.xml
index 82379a397..6d7bc62be 100644
--- a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.common/pom.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org).
- ~
- ~ WSO2 Inc. 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.
- -->
+  ~ Copyright (c) 2023-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.
+  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
@@ -32,11 +32,6 @@
     <packaging>jar</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon</groupId>
             <artifactId>org.wso2.carbon.core</artifactId>
@@ -52,11 +47,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>
diff --git a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.common/src/main/java/org/wso2/carbon/identity/api/user/onboard/common/UserOnboardServiceDataHolder.java b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.common/src/main/java/org/wso2/carbon/identity/api/user/onboard/common/UserOnboardServiceDataHolder.java
index 5f4a8630a..8a609bc09 100644
--- a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.common/src/main/java/org/wso2/carbon/identity/api/user/onboard/common/UserOnboardServiceDataHolder.java
+++ b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.common/src/main/java/org/wso2/carbon/identity/api/user/onboard/common/UserOnboardServiceDataHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,25 +18,31 @@
 
 package org.wso2.carbon.identity.api.user.onboard.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.user.onboard.core.service.UserOnboardCoreService;
 
 /**
  * Service holder class for User onboard service.
- *
- * Note: This date holder is populated through Spring Factory beans. Hence there is no setter references visible. Please
- * check the cxf xml related to the user rest service inside META-INF/cxf folder for setter references.
  */
 public class UserOnboardServiceDataHolder {
 
-    private static UserOnboardCoreService userOnboardCoreService;
+    private UserOnboardServiceDataHolder() {
 
-    public static UserOnboardCoreService getUserOnboardCoreService() {
+    }
 
-        return userOnboardCoreService;
+    private static class UserOnboardCoreServiceHolder {
+
+        static final UserOnboardCoreService SERVICE = (UserOnboardCoreService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(UserOnboardCoreService.class, null);
     }
 
-    public static void setUserOnboardCoreService(UserOnboardCoreService userOnboardCoreService) {
+    /**
+     * Get UserOnboardCoreService OSGi service.
+     *
+     * @return UserOnboardCoreService
+     */
+    public static UserOnboardCoreService getUserOnboardCoreService() {
 
-        UserOnboardServiceDataHolder.userOnboardCoreService = userOnboardCoreService;
+        return UserOnboardCoreServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.common/src/main/java/org/wso2/carbon/identity/api/user/onboard/common/factory/OSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.common/src/main/java/org/wso2/carbon/identity/api/user/onboard/common/factory/OSGIServiceFactory.java
deleted file mode 100644
index 1ca6b3a45..000000000
--- a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.common/src/main/java/org/wso2/carbon/identity/api/user/onboard/common/factory/OSGIServiceFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2023, 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.user.onboard.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.lang.NonNull;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.user.onboard.core.service.UserOnboardCoreService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the UserOnboardCoreService type of object inside the container.
- */
-public class OSGIServiceFactory extends AbstractFactoryBean<UserOnboardCoreService> {
-
-    private UserOnboardCoreService userOnboardCoreService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return UserOnboardCoreService.class;
-    }
-
-    @Override
-    @NonNull
-    protected UserOnboardCoreService createInstance() throws Exception {
-
-        if (this.userOnboardCoreService == null) {
-            UserOnboardCoreService userOnboardCoreService = (UserOnboardCoreService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(UserOnboardCoreService.class, null);
-            if (userOnboardCoreService != null) {
-                this.userOnboardCoreService = userOnboardCoreService;
-            } else {
-                throw new Exception("Unable to retrieve GuestUserManagementService service.");
-            }
-        }
-        return this.userOnboardCoreService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/pom.xml
index 424273997..ec0e13aa5 100644
--- a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/pom.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org).
- ~
- ~ WSO2 Inc. 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.
- -->
+  ~ Copyright (c) 2023-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.
+  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
@@ -108,11 +108,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>
diff --git a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/gen/java/org/wso2/carbon/identity/api/user/onboard/v1/OfflineInviteLinkApi.java b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/gen/java/org/wso2/carbon/identity/api/user/onboard/v1/OfflineInviteLinkApi.java
index 606472246..2e712a89d 100644
--- a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/gen/java/org/wso2/carbon/identity/api/user/onboard/v1/OfflineInviteLinkApi.java
+++ b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/gen/java/org/wso2/carbon/identity/api/user/onboard/v1/OfflineInviteLinkApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -25,8 +25,7 @@
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.Authorization;
 
-import org.springframework.beans.factory.annotation.Autowired;
-
+import org.wso2.carbon.identity.api.user.onboard.v1.factories.OfflineInviteLinkApiServiceFactory;
 import org.wso2.carbon.identity.api.user.onboard.v1.model.Error;
 import org.wso2.carbon.identity.api.user.onboard.v1.model.InvitationRequest;
 
@@ -45,8 +44,12 @@
 
 public class OfflineInviteLinkApi  {
 
-    @Autowired
-    private OfflineInviteLinkApiService delegate;
+    private final OfflineInviteLinkApiService delegate;
+
+    public OfflineInviteLinkApi() {
+
+        this.delegate = OfflineInviteLinkApiServiceFactory.getOfflineInviteLinkApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/gen/java/org/wso2/carbon/identity/api/user/onboard/v1/factories/OfflineInviteLinkApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/gen/java/org/wso2/carbon/identity/api/user/onboard/v1/factories/OfflineInviteLinkApiServiceFactory.java
index df7e3d30a..4d73b17bd 100644
--- a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/gen/java/org/wso2/carbon/identity/api/user/onboard/v1/factories/OfflineInviteLinkApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/gen/java/org/wso2/carbon/identity/api/user/onboard/v1/factories/OfflineInviteLinkApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -26,9 +26,15 @@
  */
 public class OfflineInviteLinkApiServiceFactory {
 
-   private static final OfflineInviteLinkApiService service = new OfflineInviteLinkApiServiceImpl();
+    private static final OfflineInviteLinkApiService SERVICE = new OfflineInviteLinkApiServiceImpl();
 
-   public static OfflineInviteLinkApiService getOfflineInviteLinkApi() {
-      return service;
-   }
+    /**
+     * Get OfflineInviteLinkApiService.
+     *
+     * @return OfflineInviteLinkApiService
+     */
+    public static OfflineInviteLinkApiService getOfflineInviteLinkApi() {
+
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/java/org/wso2/carbon/identity/api/user/onboard/v1/factories/OfflineInviteLinkServiceFactory.java b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/java/org/wso2/carbon/identity/api/user/onboard/v1/factories/OfflineInviteLinkServiceFactory.java
new file mode 100644
index 000000000..4ec9e4acc
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/java/org/wso2/carbon/identity/api/user/onboard/v1/factories/OfflineInviteLinkServiceFactory.java
@@ -0,0 +1,65 @@
+/*
+ * 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.user.onboard.v1.factories;
+
+import org.wso2.carbon.identity.api.user.onboard.common.UserOnboardServiceDataHolder;
+import org.wso2.carbon.identity.api.user.onboard.v1.service.OfflineInviteLinkService;
+import org.wso2.carbon.identity.user.onboard.core.service.UserOnboardCoreService;
+
+/**
+ * Factory class for OfflineInviteLinkService.
+ */
+public class OfflineInviteLinkServiceFactory {
+
+    private OfflineInviteLinkServiceFactory() {
+
+    }
+
+    private static class OfflineInviteLinkServicesHolder {
+
+        private static final OfflineInviteLinkService SERVICE = createServiceInstance();
+    }
+
+    private static OfflineInviteLinkService createServiceInstance() {
+
+        UserOnboardCoreService userOnboardCoreService = getUserOnboardCoreService();
+
+        return new OfflineInviteLinkService(userOnboardCoreService);
+    }
+
+    /**
+     * Get OfflineInviteLinkService.
+     *
+     * @return OfflineInviteLinkService
+     */
+    public static OfflineInviteLinkService getOfflineInviteLinkService() {
+
+        return OfflineInviteLinkServicesHolder.SERVICE;
+    }
+
+    private static UserOnboardCoreService getUserOnboardCoreService() {
+
+        UserOnboardCoreService service = UserOnboardServiceDataHolder.getUserOnboardCoreService();
+        if (service == null) {
+            throw new IllegalStateException("UserOnboardCoreService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/java/org/wso2/carbon/identity/api/user/onboard/v1/impl/OfflineInviteLinkApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/java/org/wso2/carbon/identity/api/user/onboard/v1/impl/OfflineInviteLinkApiServiceImpl.java
index bdc7c5a1b..265b7ff81 100644
--- a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/java/org/wso2/carbon/identity/api/user/onboard/v1/impl/OfflineInviteLinkApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/java/org/wso2/carbon/identity/api/user/onboard/v1/impl/OfflineInviteLinkApiServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -20,8 +20,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.user.onboard.v1.OfflineInviteLinkApiService;
+import org.wso2.carbon.identity.api.user.onboard.v1.factories.OfflineInviteLinkServiceFactory;
 import org.wso2.carbon.identity.api.user.onboard.v1.model.InvitationRequest;
 import org.wso2.carbon.identity.api.user.onboard.v1.service.OfflineInviteLinkService;
 
@@ -35,14 +35,16 @@
 public class OfflineInviteLinkApiServiceImpl implements OfflineInviteLinkApiService {
 
     private static final Log LOG = LogFactory.getLog(OfflineInviteLinkApiServiceImpl.class);
-    @Autowired
-    private OfflineInviteLinkService offlineInviteLinkService;
+    private final OfflineInviteLinkService offlineInviteLinkService;
 
-    /**
-     * Creates UsersApiServiceImpl.
-     */
     public OfflineInviteLinkApiServiceImpl() {
-        super();
+
+        try {
+            this.offlineInviteLinkService = OfflineInviteLinkServiceFactory.getOfflineInviteLinkService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating required services for " +
+                    "OfflineInviteLinkService.", e);
+        }
     }
 
     @Override
diff --git a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/java/org/wso2/carbon/identity/api/user/onboard/v1/service/OfflineInviteLinkService.java b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/java/org/wso2/carbon/identity/api/user/onboard/v1/service/OfflineInviteLinkService.java
index 7a3c3c1ef..571a85e3d 100644
--- a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/java/org/wso2/carbon/identity/api/user/onboard/v1/service/OfflineInviteLinkService.java
+++ b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/java/org/wso2/carbon/identity/api/user/onboard/v1/service/OfflineInviteLinkService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -31,6 +31,7 @@
 import org.wso2.carbon.identity.recovery.IdentityRecoveryClientException;
 import org.wso2.carbon.identity.recovery.IdentityRecoveryConstants;
 import org.wso2.carbon.identity.recovery.IdentityRecoveryException;
+import org.wso2.carbon.identity.user.onboard.core.service.UserOnboardCoreService;
 import org.wso2.carbon.identity.user.onboard.core.service.model.Configuration;
 
 import java.util.Arrays;
@@ -38,13 +39,13 @@
 
 import javax.ws.rs.core.Response;
 
-import static org.wso2.carbon.identity.api.user.onboard.common.UserOnboardServiceDataHolder.getUserOnboardCoreService;
-
 /**
  * This class provides the implementation of the OfflineInviteLinkService.
  */
 public class OfflineInviteLinkService {
 
+    private final UserOnboardCoreService userOnboardCoreService;
+
     public static final String AUTH_USER_TENANT_DOMAIN = "authUserTenantDomain";
 
     private static final Log LOG = LogFactory.getLog(OfflineInviteLinkService.class);
@@ -59,6 +60,11 @@ public class OfflineInviteLinkService {
 
     );
 
+    public OfflineInviteLinkService(UserOnboardCoreService userOnboardCoreService) {
+
+        this.userOnboardCoreService = userOnboardCoreService;
+    }
+
     /**
      * This method generates the password reset URL.
      *
@@ -70,7 +76,7 @@ public String generatePasswordURL(InvitationRequest invitationRequest) {
         String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
         Configuration configuration = prepareConfigObject(invitationRequest, tenantDomain);
         try {
-            return getUserOnboardCoreService().generatePasswordResetLink(configuration);
+            return userOnboardCoreService.generatePasswordResetLink(configuration);
         } catch (IdentityRecoveryException e) {
             throw handleException(e, Constants.ErrorMessages.ERROR_UNABLE_TO_GENERATE_INVITE_LINK,
                     invitationRequest.getUsername());
diff --git a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/resources/META-INF/cxf/user-onboard-management-cxf.xml b/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/resources/META-INF/cxf/user-onboard-management-cxf.xml
deleted file mode 100644
index a034e2d18..000000000
--- a/components/org.wso2.carbon.identity.api.user.onboard/org.wso2.carbon.identity.api.user.onboard.v1/src/main/resources/META-INF/cxf/user-onboard-management-cxf.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-    <bean class="org.wso2.carbon.identity.api.user.onboard.v1.impl.OfflineInviteLinkApiServiceImpl" />
-    <bean class="org.wso2.carbon.identity.api.user.onboard.v1.service.OfflineInviteLinkService" />
-
-    <bean   id="userOnboardCoreServiceFactoryBean"
-            class="org.wso2.carbon.identity.api.user.onboard.common.factory.OSGIServiceFactory" />
-    <bean id="userOnboardCoreServiceDataHolder"
-          class="org.wso2.carbon.identity.api.user.onboard.common.UserOnboardServiceDataHolder" >
-        <property name="userOnboardCoreService" ref="userOnboardCoreServiceFactoryBean"/>
-    </bean>
-</beans>

From 648930469f3dea5e6e08dd94a4d189bf56c65fcf Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Sat, 11 Jan 2025 07:47:02 +0530
Subject: [PATCH 13/15] Remove Spring dependency from api.user.recovery

---
 .../pom.xml                                   | 23 +++----
 .../UserAccountRecoveryServiceDataHolder.java | 60 ++++++++---------
 ...wordRecoveryManagerOSGIServiceFactory.java | 49 --------------
 ...nameRecoveryManagerOSGIServiceFactory.java | 49 --------------
 .../pom.xml                                   | 23 +++----
 .../api/user/recovery/v1/RecoveryApi.java     | 41 +++++++-----
 .../factories/RecoveryApiServiceFactory.java  | 48 ++++++++------
 .../v1/impl/RecoveryApiServiceImpl.java       | 37 +++++++----
 .../v1/impl/core/PasswordRecoveryService.java | 50 +++++++-------
 .../v1/impl/core/UsernameRecoveryService.java | 38 ++++++-----
 .../PasswordRecoveryServiceFactory.java       | 65 +++++++++++++++++++
 .../UsernameRecoveryServiceFactory.java       | 65 +++++++++++++++++++
 .../META-INF/cxf/user-recovery-v1-cxf.xml     | 31 ---------
 .../pom.xml                                   |  7 +-
 .../api/user/recovery/v2/RecoveryApi.java     | 13 ++--
 .../factories/RecoveryApiServiceFactory.java  | 20 ++++--
 .../v2/impl/RecoveryApiServiceImpl.java       | 21 ++++--
 .../v2/impl/core/PasswordRecoveryService.java | 40 ++++++------
 .../v2/impl/core/UsernameRecoveryService.java | 21 +++---
 .../PasswordRecoveryServiceFactory.java       | 65 +++++++++++++++++++
 .../UsernameRecoveryServiceFactory.java       | 65 +++++++++++++++++++
 .../META-INF/cxf/user-recovery-v2-cxf.xml     | 33 ----------
 22 files changed, 506 insertions(+), 358 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/src/main/java/org/wso2/carbon/identity/api/user/recovery/commons/factory/PasswordRecoveryManagerOSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/src/main/java/org/wso2/carbon/identity/api/user/recovery/commons/factory/UsernameRecoveryManagerOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/factories/PasswordRecoveryServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/factories/UsernameRecoveryServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/resources/META-INF/cxf/user-recovery-v1-cxf.xml
 create mode 100644 components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/factories/PasswordRecoveryServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/factories/UsernameRecoveryServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/resources/META-INF/cxf/user-recovery-v2-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/pom.xml b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/pom.xml
index e7baf66f3..6f003a2f3 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/pom.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the 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
   ~
   ~ 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.
+  ~ 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.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
@@ -40,11 +42,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.governance</groupId>
             <artifactId>org.wso2.carbon.identity.recovery</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/src/main/java/org/wso2/carbon/identity/api/user/recovery/commons/UserAccountRecoveryServiceDataHolder.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/src/main/java/org/wso2/carbon/identity/api/user/recovery/commons/UserAccountRecoveryServiceDataHolder.java
index a2b9ef226..29a4d9b8a 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/src/main/java/org/wso2/carbon/identity/api/user/recovery/commons/UserAccountRecoveryServiceDataHolder.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/src/main/java/org/wso2/carbon/identity/api/user/recovery/commons/UserAccountRecoveryServiceDataHolder.java
@@ -1,20 +1,24 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.user.recovery.commons;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.recovery.services.password.PasswordRecoveryManager;
 import org.wso2.carbon.identity.recovery.services.username.UsernameRecoveryManager;
 
@@ -23,47 +27,39 @@
  */
 public class UserAccountRecoveryServiceDataHolder {
 
-    private static UsernameRecoveryManager usernameRecoveryManager;
-    private static PasswordRecoveryManager passwordRecoveryManager;
+    private UserAccountRecoveryServiceDataHolder () {
 
-    /**
-     * Get UsernameRecoveryManager instance.
-     *
-     * @return UsernameRecoveryManager
-     */
-    public static UsernameRecoveryManager getUsernameRecoveryManager() {
+    }
 
-        return UserAccountRecoveryServiceDataHolder.usernameRecoveryManager;
+    private static class UsernameRecoveryManagerHolder {
+
+        static final UsernameRecoveryManager SERVICE = (UsernameRecoveryManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(UsernameRecoveryManager.class, null);
     }
 
-    /**
-     * Set UsernameRecoveryManager instance.
-     *
-     * @param usernameRecoveryManager UsernameRecoveryManager
-     */
-    public static void setUsernameRecoveryManager(UsernameRecoveryManager usernameRecoveryManager) {
+    private static class PasswordRecoveryManagerHolder {
 
-        UserAccountRecoveryServiceDataHolder.usernameRecoveryManager = usernameRecoveryManager;
+        static final PasswordRecoveryManager SERVICE = (PasswordRecoveryManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(PasswordRecoveryManager.class, null);
     }
 
     /**
-     * Get PasswordRecoveryManager instance.
+     * Get UsernameRecoveryManager instance.
      *
-     * @return PasswordRecoveryManager
+     * @return UsernameRecoveryManager
      */
-    public static PasswordRecoveryManager getPasswordRecoveryManager() {
+    public static UsernameRecoveryManager getUsernameRecoveryManager() {
 
-        return UserAccountRecoveryServiceDataHolder.passwordRecoveryManager;
+        return UsernameRecoveryManagerHolder.SERVICE;
     }
 
     /**
      * Get PasswordRecoveryManager instance.
      *
-     * @param passwordRecoveryManager PasswordRecoveryManager
+     * @return PasswordRecoveryManager
      */
-    public static void setPasswordRecoveryManager(
-            PasswordRecoveryManager passwordRecoveryManager) {
+    public static PasswordRecoveryManager getPasswordRecoveryManager() {
 
-        UserAccountRecoveryServiceDataHolder.passwordRecoveryManager = passwordRecoveryManager;
+        return PasswordRecoveryManagerHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/src/main/java/org/wso2/carbon/identity/api/user/recovery/commons/factory/PasswordRecoveryManagerOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/src/main/java/org/wso2/carbon/identity/api/user/recovery/commons/factory/PasswordRecoveryManagerOSGIServiceFactory.java
deleted file mode 100644
index 0f6f4da43..000000000
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/src/main/java/org/wso2/carbon/identity/api/user/recovery/commons/factory/PasswordRecoveryManagerOSGIServiceFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2020, 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.user.recovery.commons.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.recovery.services.password.PasswordRecoveryManager;
-
-/**
- * This factory bean is used to instantiate PasswordRecoveryManager type object inside the container.
- */
-public class PasswordRecoveryManagerOSGIServiceFactory extends AbstractFactoryBean<PasswordRecoveryManager> {
-
-    private PasswordRecoveryManager passwordRecoveryManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected PasswordRecoveryManager createInstance() throws Exception {
-
-        if (this.passwordRecoveryManager == null) {
-            PasswordRecoveryManager passwordRecoveryManager = (PasswordRecoveryManager) PrivilegedCarbonContext
-                    .getThreadLocalCarbonContext().getOSGiService(PasswordRecoveryManager.class, null);
-            if (passwordRecoveryManager != null) {
-                this.passwordRecoveryManager = passwordRecoveryManager;
-            } else {
-                throw new Exception("Unable to retrieve PasswordRecoveryManager service.");
-            }
-        }
-        return this.passwordRecoveryManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/src/main/java/org/wso2/carbon/identity/api/user/recovery/commons/factory/UsernameRecoveryManagerOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/src/main/java/org/wso2/carbon/identity/api/user/recovery/commons/factory/UsernameRecoveryManagerOSGIServiceFactory.java
deleted file mode 100644
index 19409fa3b..000000000
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.api.user.recovery.commons/src/main/java/org/wso2/carbon/identity/api/user/recovery/commons/factory/UsernameRecoveryManagerOSGIServiceFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2020, 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.user.recovery.commons.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.recovery.services.username.UsernameRecoveryManager;
-
-/**
- * This factory bean is used to instantiate UsernameRecoveryManager type object inside the container.
- */
-public class UsernameRecoveryManagerOSGIServiceFactory extends AbstractFactoryBean<UsernameRecoveryManager> {
-
-    private UsernameRecoveryManager usernameRecoveryManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected UsernameRecoveryManager createInstance() throws Exception {
-
-        if (this.usernameRecoveryManager == null) {
-            UsernameRecoveryManager usernameRecoveryManager = (UsernameRecoveryManager) PrivilegedCarbonContext
-                    .getThreadLocalCarbonContext().getOSGiService(UsernameRecoveryManager.class, null);
-            if (usernameRecoveryManager != null) {
-                this.usernameRecoveryManager = usernameRecoveryManager;
-            } else {
-                throw new Exception("Unable to retrieve UsernameRecoveryManager service.");
-            }
-        }
-        return this.usernameRecoveryManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/pom.xml
index 5760dddfd..5a555906a 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/pom.xml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the 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
   ~
   ~ 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.
+  ~ 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.
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
@@ -105,11 +107,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>
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/RecoveryApi.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/RecoveryApi.java
index 6d23f68b2..e94ffe81b 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/RecoveryApi.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/RecoveryApi.java
@@ -1,26 +1,28 @@
 /*
-* Copyright (c) 2020, 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) 2020-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.rest.api.user.recovery.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 org.wso2.carbon.identity.rest.api.user.recovery.v1.factories.RecoveryApiServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.model.AccountRecoveryType;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.model.ConfirmRequest;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.model.ErrorResponse;
@@ -36,7 +38,6 @@
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.model.ResetRequest;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.model.RetryErrorResponse;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.model.UsernameRecoveryNotifyResponse;
-import org.wso2.carbon.identity.rest.api.user.recovery.v1.RecoveryApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -50,8 +51,12 @@
 
 public class RecoveryApi  {
 
-    @Autowired
-    private RecoveryApiService delegate;
+    private final RecoveryApiService delegate;
+
+    public RecoveryApi() {
+
+        this.delegate = RecoveryApiServiceFactory.getRecoveryApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/factories/RecoveryApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/factories/RecoveryApiServiceFactory.java
index b6c71fae0..993ab7b89 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/factories/RecoveryApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/factories/RecoveryApiServiceFactory.java
@@ -1,30 +1,40 @@
 /*
-* Copyright (c) 2020, 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) 2020-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.rest.api.user.recovery.v1.factories;
 
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.RecoveryApiService;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.impl.RecoveryApiServiceImpl;
 
+/**
+ * Factory class for RecoveryApiService.
+ */
 public class RecoveryApiServiceFactory {
 
-   private final static RecoveryApiService service = new RecoveryApiServiceImpl();
+    private final static RecoveryApiService SERVICE = new RecoveryApiServiceImpl();
 
-   public static RecoveryApiService getRecoveryApi()
-   {
-      return service;
-   }
+    /**
+     * Get RecoveryApiService instance.
+     *
+     * @return RecoveryApiService
+     */
+    public static RecoveryApiService getRecoveryApi() {
+
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/RecoveryApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/RecoveryApiServiceImpl.java
index bc9de7327..542e49fd0 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/RecoveryApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/RecoveryApiServiceImpl.java
@@ -1,26 +1,29 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.recovery.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.RecoveryApiService;
 
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.impl.core.PasswordRecoveryService;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.impl.core.UsernameRecoveryService;
+import org.wso2.carbon.identity.rest.api.user.recovery.v1.impl.factories.PasswordRecoveryServiceFactory;
+import org.wso2.carbon.identity.rest.api.user.recovery.v1.impl.factories.UsernameRecoveryServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.model.ConfirmRequest;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.model.InitRequest;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.model.RecoveryRequest;
@@ -34,11 +37,19 @@
  */
 public class RecoveryApiServiceImpl implements RecoveryApiService {
 
-    @Autowired
-    private UsernameRecoveryService usernameRecoveryService;
+    private final UsernameRecoveryService usernameRecoveryService;
+    private final PasswordRecoveryService passwordRecoveryService;
 
-    @Autowired
-    private PasswordRecoveryService passwordRecoveryService;
+    public RecoveryApiServiceImpl() {
+
+        try {
+            this.usernameRecoveryService = UsernameRecoveryServiceFactory.getUsernameRecoveryService();
+            this.passwordRecoveryService = PasswordRecoveryServiceFactory.getPasswordRecoveryService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating required services for " +
+                    "RecoveryApiServiceImpl.", e);
+        }
+    }
 
     @Override
     public Response confirmRecovery(ConfirmRequest confirmRequest) {
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/core/PasswordRecoveryService.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/core/PasswordRecoveryService.java
index 54b3c5c2b..2f8798214 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/core/PasswordRecoveryService.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/core/PasswordRecoveryService.java
@@ -1,25 +1,27 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.recovery.v1.impl.core;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.user.common.Util;
-import org.wso2.carbon.identity.api.user.recovery.commons.UserAccountRecoveryServiceDataHolder;
 import org.wso2.carbon.identity.governance.service.notification.NotificationChannels;
 import org.wso2.carbon.identity.recovery.IdentityRecoveryClientException;
 import org.wso2.carbon.identity.recovery.IdentityRecoveryConstants;
@@ -62,8 +64,15 @@
  */
 public class PasswordRecoveryService {
 
+    private final PasswordRecoveryManager passwordRecoveryManager;
+
     private static final Log log = LogFactory.getLog(PasswordRecoveryService.class.getName());
 
+    public PasswordRecoveryService(PasswordRecoveryManager passwordRecoveryManager) {
+
+        this.passwordRecoveryManager = passwordRecoveryManager;
+    }
+
     /**
      * Initiate Password Recovery from POST.
      *
@@ -129,9 +138,8 @@ public Response recoverPassword(RecoveryRequest recoveryRequest) {
         String recoveryId = recoveryRequest.getRecoveryCode();
         String channelId = recoveryRequest.getChannelId();
         try {
-            PasswordRecoverDTO passwordRecoverDTO = UserAccountRecoveryServiceDataHolder.getPasswordRecoveryManager()
-                    .notify(recoveryId, channelId, tenantDomain,
-                            RecoveryUtil.buildPropertiesMap(recoveryRequest.getProperties()));
+            PasswordRecoverDTO passwordRecoverDTO = passwordRecoveryManager.notify(recoveryId, channelId, tenantDomain,
+                    RecoveryUtil.buildPropertiesMap(recoveryRequest.getProperties()));
             if (passwordRecoverDTO == null) {
                 if (log.isDebugEnabled()) {
                     String message = String
@@ -161,10 +169,9 @@ public Response confirmRecovery(ConfirmRequest confirmRequest) {
 
         String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
         try {
-            PasswordResetCodeDTO passwordResetCodeDTO =
-                    UserAccountRecoveryServiceDataHolder.getPasswordRecoveryManager()
-                            .confirm(confirmRequest.getConfirmationCode(), tenantDomain,
-                                    RecoveryUtil.buildPropertiesMap(confirmRequest.getProperties()));
+            PasswordResetCodeDTO passwordResetCodeDTO = passwordRecoveryManager.confirm(confirmRequest
+                    .getConfirmationCode(), tenantDomain, RecoveryUtil.buildPropertiesMap(confirmRequest
+                    .getProperties()));
             return Response.ok().entity(buildResetCodeResponse(tenantDomain, passwordResetCodeDTO)).build();
         } catch (IdentityRecoveryClientException e) {
             throw RecoveryUtil.handleClientExceptions(PasswordRecoveryService.class.getName(), tenantDomain,
@@ -187,10 +194,8 @@ public Response resetPassword(ResetRequest resetRequest) {
         String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
         char[] password = resetRequest.getPassword().toCharArray();
         try {
-            SuccessfulPasswordResetDTO successfulPasswordResetDTO =
-                    UserAccountRecoveryServiceDataHolder.getPasswordRecoveryManager()
-                            .reset(resetRequest.getResetCode(), password,
-                                    RecoveryUtil.buildPropertiesMap(resetRequest.getProperties()));
+            SuccessfulPasswordResetDTO successfulPasswordResetDTO = passwordRecoveryManager.reset(resetRequest
+                    .getResetCode(), password, RecoveryUtil.buildPropertiesMap(resetRequest.getProperties()));
             return Response.ok().entity(buildPasswordResetResponse(successfulPasswordResetDTO)).build();
         } catch (IdentityRecoveryClientException e) {
             // Send the reset code again for a retry attempt.
@@ -216,9 +221,8 @@ public Response resendConfirmation(ResendConfirmationRequest resendConfirmationR
         String resendCode = resendConfirmationRequest.getResendCode();
         Map<String, String> properties = RecoveryUtil.buildPropertiesMap(resendConfirmationRequest.getProperties());
         try {
-            ResendConfirmationDTO resendConfirmationDTO =
-                    UserAccountRecoveryServiceDataHolder.getPasswordRecoveryManager()
-                            .resend(tenantDomain, resendCode, properties);
+            ResendConfirmationDTO resendConfirmationDTO = passwordRecoveryManager.resend(tenantDomain, resendCode,
+                    properties);
             if (resendConfirmationDTO == null) {
                 if (log.isDebugEnabled()) {
                     log.debug("No ResendConfirmationDTO data for resend code :" + resendCode);
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/core/UsernameRecoveryService.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/core/UsernameRecoveryService.java
index 2c0ff1ad1..6cf368485 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/core/UsernameRecoveryService.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/core/UsernameRecoveryService.java
@@ -1,18 +1,21 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.recovery.v1.impl.core;
 
 import org.apache.commons.lang.StringUtils;
@@ -21,7 +24,6 @@
 
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.user.common.Util;
-import org.wso2.carbon.identity.api.user.recovery.commons.UserAccountRecoveryServiceDataHolder;
 import org.wso2.carbon.identity.governance.service.notification.NotificationChannels;
 import org.wso2.carbon.identity.recovery.IdentityRecoveryClientException;
 import org.wso2.carbon.identity.recovery.IdentityRecoveryConstants;
@@ -30,6 +32,7 @@
 import org.wso2.carbon.identity.recovery.dto.RecoveryInformationDTO;
 import org.wso2.carbon.identity.recovery.dto.UsernameRecoverDTO;
 
+import org.wso2.carbon.identity.recovery.services.username.UsernameRecoveryManager;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.impl.core.utils.RecoveryUtil;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.model.APICall;
 import org.wso2.carbon.identity.rest.api.user.recovery.v1.model.AccountRecoveryType;
@@ -49,8 +52,15 @@
  */
 public class UsernameRecoveryService {
 
+    private final UsernameRecoveryManager usernameRecoveryManager;
+
     private static final Log log = LogFactory.getLog(UsernameRecoveryService.class);
 
+    public UsernameRecoveryService(UsernameRecoveryManager usernameRecoveryManager) {
+
+        this.usernameRecoveryManager = usernameRecoveryManager;
+    }
+
     /**
      * Initiate userName recovery from POST.
      *
@@ -64,9 +74,8 @@ public Response initiateUsernameRecovery(InitRequest initRequest) {
         Map<String, String> userClaims = RecoveryUtil.buildUserClaimsMap(initRequest.getClaims());
         try {
             // Get username recovery notification information.
-            RecoveryInformationDTO recoveryInformationDTO =
-                    UserAccountRecoveryServiceDataHolder.getUsernameRecoveryManager().initiate(userClaims, tenantDomain,
-                            RecoveryUtil.buildPropertiesMap(initRequest.getProperties()));
+            RecoveryInformationDTO recoveryInformationDTO = usernameRecoveryManager.initiate(userClaims, tenantDomain,
+                    RecoveryUtil.buildPropertiesMap(initRequest.getProperties()));
             if (recoveryInformationDTO == null) {
                 // If RecoveryChannelInfoDTO is null throw not found error.
                 if (log.isDebugEnabled()) {
@@ -100,9 +109,8 @@ public Response recoverUsername(RecoveryRequest recoveryRequest) {
         String recoveryId = recoveryRequest.getRecoveryCode();
         String channelId = recoveryRequest.getChannelId();
         try {
-            UsernameRecoverDTO usernameRecoverDTO = UserAccountRecoveryServiceDataHolder.getUsernameRecoveryManager().
-                    notify(recoveryId, channelId, tenantDomain,
-                            RecoveryUtil.buildPropertiesMap(recoveryRequest.getProperties()));
+            UsernameRecoverDTO usernameRecoverDTO = usernameRecoveryManager.notify(recoveryId, channelId, tenantDomain,
+                    RecoveryUtil.buildPropertiesMap(recoveryRequest.getProperties()));
             if (usernameRecoverDTO == null) {
                 if (log.isDebugEnabled()) {
                     String message = String.format("No recovery data object for recovery code : %s", recoveryId);
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/factories/PasswordRecoveryServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/factories/PasswordRecoveryServiceFactory.java
new file mode 100644
index 000000000..268593497
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/factories/PasswordRecoveryServiceFactory.java
@@ -0,0 +1,65 @@
+/*
+ * 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.rest.api.user.recovery.v1.impl.factories;
+
+import org.wso2.carbon.identity.api.user.recovery.commons.UserAccountRecoveryServiceDataHolder;
+import org.wso2.carbon.identity.recovery.services.password.PasswordRecoveryManager;
+import org.wso2.carbon.identity.rest.api.user.recovery.v1.impl.core.PasswordRecoveryService;
+
+/**
+ * Factory class for PasswordRecoveryService.
+ */
+public class PasswordRecoveryServiceFactory {
+
+    private PasswordRecoveryServiceFactory() {
+
+    }
+
+    private static class PasswordRecoveryServiceHolder {
+
+        private static final PasswordRecoveryService SERVICE = createServiceInstance();
+    }
+
+    private static PasswordRecoveryService createServiceInstance() {
+
+        PasswordRecoveryManager passwordRecoveryManager = getPasswordRecoveryManagerService();
+
+        return new PasswordRecoveryService(passwordRecoveryManager);
+    }
+
+    /**
+     * Get AuthorizedAppsService
+     *
+     * @return AuthorizedAppsService
+     */
+    public static PasswordRecoveryService getPasswordRecoveryService() {
+
+        return PasswordRecoveryServiceHolder.SERVICE;
+    }
+
+    private static PasswordRecoveryManager getPasswordRecoveryManagerService() {
+
+        PasswordRecoveryManager service = UserAccountRecoveryServiceDataHolder.getPasswordRecoveryManager();
+        if (service == null) {
+            throw new IllegalStateException("PasswordRecoveryManager is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/factories/UsernameRecoveryServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/factories/UsernameRecoveryServiceFactory.java
new file mode 100644
index 000000000..4a274d3f5
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v1/impl/factories/UsernameRecoveryServiceFactory.java
@@ -0,0 +1,65 @@
+/*
+ * 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.rest.api.user.recovery.v1.impl.factories;
+
+import org.wso2.carbon.identity.api.user.recovery.commons.UserAccountRecoveryServiceDataHolder;
+import org.wso2.carbon.identity.recovery.services.username.UsernameRecoveryManager;
+import org.wso2.carbon.identity.rest.api.user.recovery.v1.impl.core.UsernameRecoveryService;
+
+/**
+ * Factory class for UsernameRecoveryService.
+ */
+public class UsernameRecoveryServiceFactory {
+
+    private UsernameRecoveryServiceFactory() {
+
+    }
+
+    private static class UsernameRecoveryServiceHolder {
+
+        private static final UsernameRecoveryService SERVICE = createServiceInstance();
+    }
+
+    private static UsernameRecoveryService createServiceInstance() {
+
+        UsernameRecoveryManager passwordRecoveryManager = getUsernameRecoveryManager();
+
+        return new UsernameRecoveryService(passwordRecoveryManager);
+    }
+
+    /**
+     * Get AuthorizedAppsService
+     *
+     * @return AuthorizedAppsService
+     */
+    public static UsernameRecoveryService getUsernameRecoveryService() {
+
+        return UsernameRecoveryServiceHolder.SERVICE;
+    }
+
+    private static UsernameRecoveryManager getUsernameRecoveryManager() {
+
+        UsernameRecoveryManager service = UserAccountRecoveryServiceDataHolder.getUsernameRecoveryManager();
+        if (service == null) {
+            throw new IllegalStateException("UsernameRecoveryManager is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/resources/META-INF/cxf/user-recovery-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/resources/META-INF/cxf/user-recovery-v1-cxf.xml
deleted file mode 100644
index 5519b5d41..000000000
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v1/src/main/resources/META-INF/cxf/user-recovery-v1-cxf.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2020, 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.rest.api.user.recovery.v1.impl.core.PasswordRecoveryService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.recovery.v1.impl.core.UsernameRecoveryService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.recovery.v1.impl.RecoveryApiServiceImpl"/>
-    <bean id="UserAccountRecoveryServiceDataHolder" class="org.wso2.carbon.identity.api.user.recovery.commons.UserAccountRecoveryServiceDataHolder">
-        <property name="usernameRecoveryManager" ref="UsernameRecoveryManagerOSGIServiceFactoryBean"/>
-        <property name="passwordRecoveryManager" ref="PasswordRecoveryManagerOSGIServiceFactoryBean"/>
-    </bean>
-    <bean id="UsernameRecoveryManagerOSGIServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.recovery.commons.factory.UsernameRecoveryManagerOSGIServiceFactory"/>
-    <bean id="PasswordRecoveryManagerOSGIServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.recovery.commons.factory.PasswordRecoveryManagerOSGIServiceFactory"/>
-</beans>
-
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/pom.xml b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/pom.xml
index 7600565e3..23b4f3059 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023-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
@@ -108,11 +108,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>
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/RecoveryApi.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/RecoveryApi.java
index 2f317d88b..fc22b494e 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/RecoveryApi.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/RecoveryApi.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,12 +18,12 @@
 
 package org.wso2.carbon.identity.rest.api.user.recovery.v2;
 
-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.rest.api.user.recovery.v2.factories.RecoveryApiServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.model.AccountRecoveryType;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.model.ConfirmRequest;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.model.ErrorResponse;
@@ -39,7 +39,6 @@
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.model.ResetRequest;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.model.RetryErrorResponse;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.model.UsernameRecoveryNotifyResponse;
-import org.wso2.carbon.identity.rest.api.user.recovery.v2.RecoveryApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -53,8 +52,12 @@
 
 public class RecoveryApi  {
 
-    @Autowired
-    private RecoveryApiService delegate;
+    private final RecoveryApiService delegate;
+
+    public RecoveryApi() {
+
+        this.delegate = RecoveryApiServiceFactory.getRecoveryApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/factories/RecoveryApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/factories/RecoveryApiServiceFactory.java
index 8ce00fcf7..5f95dac6c 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/factories/RecoveryApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/gen/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/factories/RecoveryApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.RecoveryApiService;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.impl.RecoveryApiServiceImpl;
 
+/**
+ * Factory class for RecoveryApiService.
+ */
 public class RecoveryApiServiceFactory {
 
-   private final static RecoveryApiService service = new RecoveryApiServiceImpl();
+    private final static RecoveryApiService SERVICE = new RecoveryApiServiceImpl();
+
+    /**
+     * Get RecoveryApiService instance.
+     *
+     * @return RecoveryApiService
+     */
+    public static RecoveryApiService getRecoveryApi() {
 
-   public static RecoveryApiService getRecoveryApi()
-   {
-      return service;
-   }
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/RecoveryApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/RecoveryApiServiceImpl.java
index b49ed427f..9d6b8bd64 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/RecoveryApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/RecoveryApiServiceImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -18,11 +18,12 @@
 
 package org.wso2.carbon.identity.rest.api.user.recovery.v2.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.RecoveryApiService;
 
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.impl.core.PasswordRecoveryService;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.impl.core.UsernameRecoveryService;
+import org.wso2.carbon.identity.rest.api.user.recovery.v2.impl.factories.PasswordRecoveryServiceFactory;
+import org.wso2.carbon.identity.rest.api.user.recovery.v2.impl.factories.UsernameRecoveryServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.model.ConfirmRequest;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.model.InitRequest;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.model.RecoveryRequest;
@@ -36,11 +37,19 @@
  */
 public class RecoveryApiServiceImpl implements RecoveryApiService {
 
-    @Autowired
-    private UsernameRecoveryService usernameRecoveryService;
+    private final UsernameRecoveryService usernameRecoveryService;
+    private final PasswordRecoveryService passwordRecoveryService;
 
-    @Autowired
-    private PasswordRecoveryService passwordRecoveryService;
+    public RecoveryApiServiceImpl() {
+
+        try {
+            this.usernameRecoveryService = UsernameRecoveryServiceFactory.getUsernameRecoveryService();
+            this.passwordRecoveryService = PasswordRecoveryServiceFactory.getPasswordRecoveryService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating required services for " +
+                    "RecoveryApiServiceImpl.", e);
+        }
+    }
 
     @Override
     public Response confirmRecovery(ConfirmRequest confirmRequest) {
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/core/PasswordRecoveryService.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/core/PasswordRecoveryService.java
index 31d011930..c5e80ebc0 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/core/PasswordRecoveryService.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/core/PasswordRecoveryService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -22,7 +22,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.user.common.Util;
-import org.wso2.carbon.identity.api.user.recovery.commons.UserAccountRecoveryServiceDataHolder;
 import org.wso2.carbon.identity.governance.service.notification.NotificationChannels;
 import org.wso2.carbon.identity.recovery.IdentityRecoveryConstants;
 import org.wso2.carbon.identity.recovery.IdentityRecoveryException;
@@ -32,6 +31,7 @@
 import org.wso2.carbon.identity.recovery.dto.RecoveryInformationDTO;
 import org.wso2.carbon.identity.recovery.dto.ResendConfirmationDTO;
 import org.wso2.carbon.identity.recovery.dto.SuccessfulPasswordResetDTO;
+import org.wso2.carbon.identity.recovery.services.password.PasswordRecoveryManager;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.impl.core.utils.RecoveryUtil;
 
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.model.APICall;
@@ -60,8 +60,15 @@
  */
 public class PasswordRecoveryService {
 
+    private final PasswordRecoveryManager passwordRecoveryManager;
+
     private static final Log LOG = LogFactory.getLog(PasswordRecoveryService.class.getName());
 
+    public PasswordRecoveryService(PasswordRecoveryManager passwordRecoveryManager) {
+
+        this.passwordRecoveryManager = passwordRecoveryManager;
+    }
+
     /**
      * Initiate Password Recovery from POST.
      *
@@ -78,9 +85,8 @@ public Response initiatePasswordRecovery(InitRequest initRequest) {
         Map<String, String> userClaims = RecoveryUtil.buildUserClaimsMap(initRequest.getClaims());
         try {
             // Get password recovery notification information.
-            RecoveryInformationDTO recoveryInformationDTO =
-                    UserAccountRecoveryServiceDataHolder.getPasswordRecoveryManager().initiate(userClaims, tenantDomain,
-                            RecoveryUtil.buildPropertiesMap(initRequest.getProperties()));
+            RecoveryInformationDTO recoveryInformationDTO = passwordRecoveryManager.initiate(userClaims, tenantDomain,
+                    RecoveryUtil.buildPropertiesMap(initRequest.getProperties()));
             return Response.ok().entity(buildPasswordRecoveryInitResponse(tenantDomain, recoveryInformationDTO))
                     .build();
         } catch (IdentityRecoveryException e) {
@@ -105,9 +111,8 @@ public Response recoverPassword(RecoveryRequest recoveryRequest) {
         String recoveryId = recoveryRequest.getRecoveryCode();
         String channelId = recoveryRequest.getChannelId();
         try {
-            PasswordRecoverDTO passwordRecoverDTO = UserAccountRecoveryServiceDataHolder.getPasswordRecoveryManager()
-                    .notify(recoveryId, channelId, tenantDomain,
-                            RecoveryUtil.buildPropertiesMap(recoveryRequest.getProperties()));
+            PasswordRecoverDTO passwordRecoverDTO = passwordRecoveryManager.notify(recoveryId, channelId, tenantDomain,
+                    RecoveryUtil.buildPropertiesMap(recoveryRequest.getProperties()));
             if (passwordRecoverDTO == null) {
                 if (LOG.isDebugEnabled()) {
                     String message = String
@@ -137,10 +142,9 @@ public Response confirmRecovery(ConfirmRequest confirmRequest) {
         }
         String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
         try {
-            PasswordResetCodeDTO passwordResetCodeDTO =
-                    UserAccountRecoveryServiceDataHolder.getPasswordRecoveryManager()
-                            .confirm(confirmRequest.getOtp(), confirmRequest.getConfirmationCode(), tenantDomain,
-                                    RecoveryUtil.buildPropertiesMap(confirmRequest.getProperties()));
+            PasswordResetCodeDTO passwordResetCodeDTO = passwordRecoveryManager.confirm(confirmRequest.getOtp(),
+                    confirmRequest.getConfirmationCode(), tenantDomain, RecoveryUtil.buildPropertiesMap(confirmRequest
+                            .getProperties()));
             return Response.ok().entity(buildResetCodeResponse(tenantDomain, passwordResetCodeDTO)).build();
         } catch (IdentityRecoveryException e) {
             throw RecoveryUtil.handleIdentityRecoveryException(e, tenantDomain,
@@ -163,10 +167,9 @@ public Response resetPassword(ResetRequest resetRequest) {
         String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
         char[] password = resetRequest.getPassword().toCharArray();
         try {
-            SuccessfulPasswordResetDTO successfulPasswordResetDTO =
-                    UserAccountRecoveryServiceDataHolder.getPasswordRecoveryManager()
-                            .reset(resetRequest.getResetCode(), resetRequest.getFlowConfirmationCode(), password,
-                                    RecoveryUtil.buildPropertiesMap(resetRequest.getProperties()));
+            SuccessfulPasswordResetDTO successfulPasswordResetDTO = passwordRecoveryManager.reset(resetRequest
+                    .getResetCode(), resetRequest.getFlowConfirmationCode(), password, RecoveryUtil
+                    .buildPropertiesMap(resetRequest.getProperties()));
             return Response.ok().entity(buildPasswordResetResponse(successfulPasswordResetDTO)).build();
         } catch (IdentityRecoveryException e) {
             // Send the reset code again for a retry attempt.
@@ -192,9 +195,8 @@ public Response resendConfirmation(ResendConfirmationRequest resendConfirmationR
         String resendCode = resendConfirmationRequest.getResendCode();
         Map<String, String> properties = RecoveryUtil.buildPropertiesMap(resendConfirmationRequest.getProperties());
         try {
-            ResendConfirmationDTO resendConfirmationDTO =
-                    UserAccountRecoveryServiceDataHolder.getPasswordRecoveryManager()
-                            .resend(tenantDomain, resendCode, properties);
+            ResendConfirmationDTO resendConfirmationDTO = passwordRecoveryManager.resend(tenantDomain,
+                    resendCode, properties);
             if (resendConfirmationDTO == null) {
                 if (LOG.isDebugEnabled()) {
                     LOG.debug("No ResendConfirmationDTO data for resend code :" + resendCode);
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/core/UsernameRecoveryService.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/core/UsernameRecoveryService.java
index c0e8fc298..123a5bfea 100644
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/core/UsernameRecoveryService.java
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/core/UsernameRecoveryService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-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
@@ -23,7 +23,6 @@
 
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.user.common.Util;
-import org.wso2.carbon.identity.api.user.recovery.commons.UserAccountRecoveryServiceDataHolder;
 import org.wso2.carbon.identity.governance.service.notification.NotificationChannels;
 import org.wso2.carbon.identity.recovery.IdentityRecoveryConstants;
 import org.wso2.carbon.identity.recovery.IdentityRecoveryException;
@@ -31,6 +30,7 @@
 import org.wso2.carbon.identity.recovery.dto.RecoveryInformationDTO;
 import org.wso2.carbon.identity.recovery.dto.UsernameRecoverDTO;
 
+import org.wso2.carbon.identity.recovery.services.username.UsernameRecoveryManager;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.impl.core.utils.RecoveryUtil;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.model.APICall;
 import org.wso2.carbon.identity.rest.api.user.recovery.v2.model.AccountRecoveryType;
@@ -50,8 +50,15 @@
  */
 public class UsernameRecoveryService {
 
+    private final UsernameRecoveryManager usernameRecoveryManager;
+
     private static final Log log = LogFactory.getLog(UsernameRecoveryService.class);
 
+    public UsernameRecoveryService(UsernameRecoveryManager usernameRecoveryManager) {
+
+        this.usernameRecoveryManager = usernameRecoveryManager;
+    }
+
     /**
      * Initiate userName recovery from POST.
      *
@@ -64,9 +71,8 @@ public Response initiateUsernameRecovery(InitRequest initRequest) {
         Map<String, String> userClaims = RecoveryUtil.buildUserClaimsMap(initRequest.getClaims());
         try {
             // Get username recovery notification information.
-            RecoveryInformationDTO recoveryInformationDTO =
-                    UserAccountRecoveryServiceDataHolder.getUsernameRecoveryManager().initiate(userClaims, tenantDomain,
-                            RecoveryUtil.buildPropertiesMap(initRequest.getProperties()));
+            RecoveryInformationDTO recoveryInformationDTO = usernameRecoveryManager.initiate(userClaims, tenantDomain,
+                    RecoveryUtil.buildPropertiesMap(initRequest.getProperties()));
             if (recoveryInformationDTO == null) {
                 // If RecoveryChannelInfoDTO is null throw not found error.
                 String message = "No recovery information username recovery request";
@@ -94,9 +100,8 @@ public Response recoverUsername(RecoveryRequest recoveryRequest) {
         String recoveryId = recoveryRequest.getRecoveryCode();
         String channelId = recoveryRequest.getChannelId();
         try {
-            UsernameRecoverDTO usernameRecoverDTO = UserAccountRecoveryServiceDataHolder.getUsernameRecoveryManager().
-                    notify(recoveryId, channelId, tenantDomain,
-                            RecoveryUtil.buildPropertiesMap(recoveryRequest.getProperties()));
+            UsernameRecoverDTO usernameRecoverDTO = usernameRecoveryManager.notify(recoveryId, channelId, tenantDomain,
+                    RecoveryUtil.buildPropertiesMap(recoveryRequest.getProperties()));
             if (usernameRecoverDTO == null) {
                 if (log.isDebugEnabled()) {
                     String message = String.format("No recovery data object for recovery code : %s", recoveryId);
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/factories/PasswordRecoveryServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/factories/PasswordRecoveryServiceFactory.java
new file mode 100644
index 000000000..6c3ea164c
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/factories/PasswordRecoveryServiceFactory.java
@@ -0,0 +1,65 @@
+/*
+ * 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.rest.api.user.recovery.v2.impl.factories;
+
+import org.wso2.carbon.identity.api.user.recovery.commons.UserAccountRecoveryServiceDataHolder;
+import org.wso2.carbon.identity.recovery.services.password.PasswordRecoveryManager;
+import org.wso2.carbon.identity.rest.api.user.recovery.v2.impl.core.PasswordRecoveryService;
+
+/**
+ * Factory class for PasswordRecoveryService.
+ */
+public class PasswordRecoveryServiceFactory {
+
+    private PasswordRecoveryServiceFactory() {
+
+    }
+
+    private static class PasswordRecoveryServiceHolder {
+
+        private static final PasswordRecoveryService SERVICE = createServiceInstance();
+    }
+
+    private static PasswordRecoveryService createServiceInstance() {
+
+        PasswordRecoveryManager passwordRecoveryManager = getPasswordRecoveryManagerService();
+
+        return new PasswordRecoveryService(passwordRecoveryManager);
+    }
+
+    /**
+     * Get AuthorizedAppsService
+     *
+     * @return AuthorizedAppsService
+     */
+    public static PasswordRecoveryService getPasswordRecoveryService() {
+
+        return PasswordRecoveryServiceHolder.SERVICE;
+    }
+
+    private static PasswordRecoveryManager getPasswordRecoveryManagerService() {
+
+        PasswordRecoveryManager service = UserAccountRecoveryServiceDataHolder.getPasswordRecoveryManager();
+        if (service == null) {
+            throw new IllegalStateException("PasswordRecoveryManager is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/factories/UsernameRecoveryServiceFactory.java b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/factories/UsernameRecoveryServiceFactory.java
new file mode 100644
index 000000000..e98158c3d
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/java/org/wso2/carbon/identity/rest/api/user/recovery/v2/impl/factories/UsernameRecoveryServiceFactory.java
@@ -0,0 +1,65 @@
+/*
+ * 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.rest.api.user.recovery.v2.impl.factories;
+
+import org.wso2.carbon.identity.api.user.recovery.commons.UserAccountRecoveryServiceDataHolder;
+import org.wso2.carbon.identity.recovery.services.username.UsernameRecoveryManager;
+import org.wso2.carbon.identity.rest.api.user.recovery.v2.impl.core.UsernameRecoveryService;
+
+/**
+ * Factory class for UsernameRecoveryService.
+ */
+public class UsernameRecoveryServiceFactory {
+
+    private UsernameRecoveryServiceFactory() {
+
+    }
+
+    private static class UsernameRecoveryServiceHolder {
+
+        private static final UsernameRecoveryService SERVICE = createServiceInstance();
+    }
+
+    private static UsernameRecoveryService createServiceInstance() {
+
+        UsernameRecoveryManager passwordRecoveryManager = getUsernameRecoveryManager();
+
+        return new UsernameRecoveryService(passwordRecoveryManager);
+    }
+
+    /**
+     * Get AuthorizedAppsService
+     *
+     * @return AuthorizedAppsService
+     */
+    public static UsernameRecoveryService getUsernameRecoveryService() {
+
+        return UsernameRecoveryServiceHolder.SERVICE;
+    }
+
+    private static UsernameRecoveryManager getUsernameRecoveryManager() {
+
+        UsernameRecoveryManager service = UserAccountRecoveryServiceDataHolder.getUsernameRecoveryManager();
+        if (service == null) {
+            throw new IllegalStateException("UsernameRecoveryManager is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/resources/META-INF/cxf/user-recovery-v2-cxf.xml b/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/resources/META-INF/cxf/user-recovery-v2-cxf.xml
deleted file mode 100644
index aed37b9e2..000000000
--- a/components/org.wso2.carbon.identity.api.user.recovery/org.wso2.carbon.identity.rest.api.user.recovery.v2/src/main/resources/META-INF/cxf/user-recovery-v2-cxf.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2023, 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.
-  -->
-
-<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.rest.api.user.recovery.v2.impl.core.PasswordRecoveryService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.recovery.v2.impl.core.UsernameRecoveryService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.recovery.v2.impl.RecoveryApiServiceImpl"/>
-    <bean id="UserAccountRecoveryServiceDataHolder" class="org.wso2.carbon.identity.api.user.recovery.commons.UserAccountRecoveryServiceDataHolder">
-        <property name="usernameRecoveryManager" ref="UsernameRecoveryManagerOSGIServiceFactoryBean"/>
-        <property name="passwordRecoveryManager" ref="PasswordRecoveryManagerOSGIServiceFactoryBean"/>
-    </bean>
-    <bean id="UsernameRecoveryManagerOSGIServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.recovery.commons.factory.UsernameRecoveryManagerOSGIServiceFactory"/>
-    <bean id="PasswordRecoveryManagerOSGIServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.recovery.commons.factory.PasswordRecoveryManagerOSGIServiceFactory"/>
-</beans>
-

From 8ef3bd8867461d8714b75f4a8fd07a8eb545bcd6 Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Sat, 11 Jan 2025 07:48:01 +0530
Subject: [PATCH 14/15] Remove Spring dependency from api.user.totp

---
 .../pom.xml                                   |  9 +----
 .../pom.xml                                   |  9 +----
 .../identity/rest/api/user/totp/v1/MeApi.java | 27 ++++++++-----
 .../v1/factories/MeApiServiceFactory.java     | 36 +++++++++++------
 .../totp/v1/factories/TOTPServiceFactory.java | 40 +++++++++++++++++++
 .../user/totp/v1/impl/MeApiServiceImpl.java   | 29 +++++++++-----
 .../META-INF/cxf/user-totp-v1-cxf.xml         | 21 ----------
 7 files changed, 101 insertions(+), 70 deletions(-)
 create mode 100644 components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/totp/v1/factories/TOTPServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/main/resources/META-INF/cxf/user-totp-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.common/pom.xml b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.common/pom.xml
index 8ee885508..419d2c6da 100644
--- a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-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
@@ -74,11 +74,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>
diff --git a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/pom.xml
index 9bf0264bf..7a8e5135b 100644
--- a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-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
@@ -82,11 +82,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>
diff --git a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/totp/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/totp/v1/MeApi.java
index 39f75cea3..ccb5e6ef4 100644
--- a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/totp/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/totp/v1/MeApi.java
@@ -1,22 +1,23 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.totp.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.totp.v1.dto.*;
 import org.wso2.carbon.identity.rest.api.user.totp.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.totp.v1.factories.MeApiServiceFactory;
@@ -44,8 +45,12 @@
 @io.swagger.annotations.Api(value = "/me", description = "the me API")
 public class MeApi  {
 
-   @Autowired
-   private MeApiService delegate;
+    private final MeApiService delegate;
+
+    public MeApi() {
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @Valid
     @DELETE
diff --git a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/totp/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/totp/v1/factories/MeApiServiceFactory.java
index f5c74c321..936c9c497 100644
--- a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/totp/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/totp/v1/factories/MeApiServiceFactory.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.totp.v1.factories;
@@ -19,12 +21,20 @@
 import org.wso2.carbon.identity.rest.api.user.totp.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.totp.v1.impl.MeApiServiceImpl;
 
+/**
+ * Factory class for MeApiService.
+ */
 public class MeApiServiceFactory {
 
-   private final static MeApiService service = new MeApiServiceImpl();
+    private final static MeApiService SERVICE = new MeApiServiceImpl();
+
+    /**
+     * Get MeApiService.
+     *
+     * @return MeApiService.
+     */
+    public static MeApiService getMeApi() {
 
-   public static MeApiService getMeApi()
-   {
-      return service;
-   }
+        return SERVICE;
+    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/totp/v1/factories/TOTPServiceFactory.java b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/totp/v1/factories/TOTPServiceFactory.java
new file mode 100644
index 000000000..f819dd7e8
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/totp/v1/factories/TOTPServiceFactory.java
@@ -0,0 +1,40 @@
+/*
+ * 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.rest.api.user.totp.v1.factories;
+
+import org.wso2.carbon.identity.rest.api.user.totp.v1.core.TOTPService;
+
+/**
+ * Factory class for TOTPService.
+ */
+public class TOTPServiceFactory {
+
+    private static final TOTPService SERVICE = new TOTPService();
+
+    /**
+     * Get TOTPService.
+     *
+     * @return TOTPService.
+     */
+    public static TOTPService getTOTPService() {
+
+        return SERVICE;
+    }
+
+}
diff --git a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/totp/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/totp/v1/impl/MeApiServiceImpl.java
index 78775cb2e..2c94bfc80 100644
--- a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/totp/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/totp/v1/impl/MeApiServiceImpl.java
@@ -1,24 +1,27 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the 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
  *
  * 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.
+ * 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.rest.api.user.totp.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.totp.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.totp.v1.core.TOTPService;
 import org.wso2.carbon.identity.rest.api.user.totp.v1.dto.UserRequestDTO;
+import org.wso2.carbon.identity.rest.api.user.totp.v1.factories.TOTPServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -31,8 +34,12 @@
  */
 public class MeApiServiceImpl extends MeApiService {
 
-    @Autowired
-    TOTPService totpService;
+    private final TOTPService totpService;
+
+    public MeApiServiceImpl() {
+
+        this.totpService = TOTPServiceFactory.getTOTPService();
+    }
 
     @Override
     public Response meTotpDelete() {
diff --git a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/main/resources/META-INF/cxf/user-totp-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/main/resources/META-INF/cxf/user-totp-v1-cxf.xml
deleted file mode 100644
index bf32efa34..000000000
--- a/components/org.wso2.carbon.identity.api.user.totp/org.wso2.carbon.identity.api.user.totp.v1/src/main/resources/META-INF/cxf/user-totp-v1-cxf.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2019, 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.rest.api.user.totp.v1.impl.MeApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.totp.v1.core.TOTPService"/>
-</beans>

From 6bb213dcd647f4f0ae5d16dcd678ae68231625e3 Mon Sep 17 00:00:00 2001
From: lashinie <lashinisharikaj@gmail.com>
Date: Sat, 11 Jan 2025 07:48:42 +0530
Subject: [PATCH 15/15] Remove Spring dependency from main pom.xml

---
 pom.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 67ad2eaec..49560b2c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-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
@@ -56,11 +56,6 @@
                 <artifactId>cxf-rt-rs-service-description</artifactId>
                 <version>${cxf-bundle.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-web</artifactId>
-                <version>${spring-web.version}</version>
-            </dependency>
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
@@ -471,7 +466,6 @@
         <jackson-dataformat-xml.version>2.16.1</jackson-dataformat-xml.version>
         <cxf-bundle.version>3.5.9</cxf-bundle.version>
         <jackson.version>1.9.13</jackson.version>
-        <spring-web.version>5.3.25</spring-web.version>
         <swagger-jaxrs.version>1.6.2</swagger-jaxrs.version>
         <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
         <version.org.wso2.orbit.javax.xml.bind>2.3.1.wso2v1</version.org.wso2.orbit.javax.xml.bind>