From 2c1f6446f71c37760b1f79c4bc43320d687d3c9d Mon Sep 17 00:00:00 2001
From: KaveeshaPiumini <piumini95kaveesha@gmail.com>
Date: Wed, 16 Oct 2024 14:35:19 +0530
Subject: [PATCH] [Spring Cleanup] Remove Spring dependencies in the User
 Organization Management API

---
 .../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 c4abaa797..ee94d24a4 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 9abc70944..bb38e06a7 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>