From ebf57b53a01188b69d32be308d068f93f3ddf039 Mon Sep 17 00:00:00 2001
From: NipuniBhagya <nipunib@wso2.com>
Date: Mon, 14 Oct 2024 12:27:57 +0530
Subject: [PATCH 1/3] Remove Spring dependencies in the organization roles API

---
 .../pom.xml                                   |  7 +--
 ...ganizationRoleManagementServiceHolder.java | 51 +++++-----------
 ...ationRoleManagementOSGIServiceFactory.java | 53 -----------------
 ...serResidentResolverOSGIServiceFactory.java | 56 ------------------
 .../pom.xml                                   |  7 +--
 .../role/management/v1/OrganizationsApi.java  | 13 +++--
 .../OrganizationsApiServiceFactory.java       | 14 ++++-
 .../RoleManagementServiceFactory.java         | 58 +++++++++++++++++++
 .../v1/impl/OrganizationsApiServiceImpl.java  | 15 +++--
 .../v1/service/RoleManagementService.java     | 34 ++++++-----
 .../v1/util/RoleManagementEndpointUtils.java  |  6 +-
 .../cxf/org-role-mgt-server-v1-cxf.xml        | 34 -----------
 12 files changed, 128 insertions(+), 220 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationRoleManagementOSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationUserResidentResolverOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/resources/META-INF/cxf/org-role-mgt-server-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
index 57ce9c0881..647192d669 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.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
@@ -30,11 +30,6 @@
     <artifactId>org.wso2.carbon.identity.api.server.organization.role.management.common</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.organization.management</groupId>
             <artifactId>org.wso2.carbon.identity.organization.management.role.management.service</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/OrganizationRoleManagementServiceHolder.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/OrganizationRoleManagementServiceHolder.java
index 8057d94bec..dea5bce306 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/OrganizationRoleManagementServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/OrganizationRoleManagementServiceHolder.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.server.organization.role.management.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.organization.management.role.management.service.RoleManager;
 import org.wso2.carbon.identity.organization.management.service.OrganizationUserResidentResolverService;
 
@@ -26,19 +27,17 @@
  */
 public class OrganizationRoleManagementServiceHolder {
 
-    private static OrganizationRoleManagementServiceHolder instance = new OrganizationRoleManagementServiceHolder();
-
-    private RoleManager roleManager;
-
-    private OrganizationUserResidentResolverService organizationUserResidentResolverService;
-
-    private OrganizationRoleManagementServiceHolder() {
+    private OrganizationRoleManagementServiceHolder() {}
 
+    private static class RoleManagerServiceHolder {
+        static final RoleManager SERVICE = (RoleManager) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                .getOSGiService(RoleManager.class, null);
     }
 
-    public static OrganizationRoleManagementServiceHolder getInstance() {
-
-        return instance;
+    private static class OrganizationUserResidentResolverServiceHolder {
+        static final OrganizationUserResidentResolverService SERVICE =
+                (OrganizationUserResidentResolverService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(OrganizationUserResidentResolverService.class, null);
     }
 
     /**
@@ -46,19 +45,9 @@ public static OrganizationRoleManagementServiceHolder getInstance() {
      *
      * @return RoleManager.
      */
-    public RoleManager getRoleManager() {
-
-        return OrganizationRoleManagementServiceHolder.getInstance().roleManager;
-    }
-
-    /**
-     * Set RoleManager OSGi service.
-     *
-     * @param roleManager RoleManager.
-     */
-    public void setRoleManager(RoleManager roleManager) {
+    public static RoleManager getRoleManager() {
 
-        OrganizationRoleManagementServiceHolder.getInstance().roleManager = roleManager;
+        return RoleManagerServiceHolder.SERVICE;
     }
 
     /**
@@ -66,20 +55,8 @@ public void setRoleManager(RoleManager roleManager) {
      *
      * @return OrganizationUserResidentResolverService.
      */
-    public OrganizationUserResidentResolverService getOrganizationUserResidentResolverService() {
-
-        return OrganizationRoleManagementServiceHolder.getInstance().organizationUserResidentResolverService;
-    }
-
-    /**
-     * Set OrganizationUserResidentResolverService OSGi service.
-     *
-     * @param organizationUserResidentResolverService OrganizationUserResidentResolverService.
-     */
-    public void setOrganizationUserResidentResolverService(
-            OrganizationUserResidentResolverService organizationUserResidentResolverService) {
+    public static OrganizationUserResidentResolverService getOrganizationUserResidentResolverService() {
 
-        OrganizationRoleManagementServiceHolder.getInstance().organizationUserResidentResolverService
-                = organizationUserResidentResolverService;
+        return OrganizationUserResidentResolverServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationRoleManagementOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationRoleManagementOSGIServiceFactory.java
deleted file mode 100644
index cd7a5f33c7..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationRoleManagementOSGIServiceFactory.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.server.organization.role.management.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.organization.management.role.management.service.RoleManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the RoleManager type of object inside the container.
- */
-public class OrganizationRoleManagementOSGIServiceFactory extends AbstractFactoryBean<RoleManager> {
-
-    private RoleManager roleManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected RoleManager createInstance() throws Exception {
-
-        if (this.roleManager == null) {
-            RoleManager service = (RoleManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(RoleManager.class, null);
-            if (service != null) {
-                this.roleManager = service;
-            } else {
-                throw new Exception("Unable to retrieve RoleManager service.");
-            }
-        }
-        return this.roleManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationUserResidentResolverOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/common/factory/OrganizationUserResidentResolverOSGIServiceFactory.java
deleted file mode 100644
index 2e0f3eacd4..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.common/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/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.server.organization.role.management.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.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
index 5a243eab0c..1e3f830c52 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.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
@@ -43,11 +43,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.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/OrganizationsApi.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/OrganizationsApi.java
index 0e28659331..b2e7536e10 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/OrganizationsApi.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/OrganizationsApi.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.api.server.organization.role.management.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.Multipart;
 import java.io.InputStream;
 import java.util.List;
 
+import org.wso2.carbon.identity.api.server.organization.role.management.v1.factories.OrganizationsApiServiceFactory;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.Error;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RoleGetResponse;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RoleObj;
@@ -34,7 +34,6 @@
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolePutRequest;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolePutResponse;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolesListResponse;
-import org.wso2.carbon.identity.api.server.organization.role.management.v1.OrganizationsApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -48,8 +47,12 @@
 
 public class OrganizationsApi  {
 
-    @Autowired
-    private OrganizationsApiService delegate;
+    private final OrganizationsApiService delegate;
+
+    public OrganizationsApi() {
+
+        this.delegate = OrganizationsApiServiceFactory.getOrganizationsApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/OrganizationsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/OrganizationsApiServiceFactory.java
index 941cd276ba..e7bd34a202 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/OrganizationsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/gen/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/OrganizationsApiServiceFactory.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.api.server.organization.role.management.v1.OrganizationsApiService;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.impl.OrganizationsApiServiceImpl;
 
+/**
+ * Factory class for OrganizationsApiService.
+ */
 public class OrganizationsApiServiceFactory {
 
-   private final static OrganizationsApiService service = new OrganizationsApiServiceImpl();
+   private final static OrganizationsApiService SERVICE = new OrganizationsApiServiceImpl();
 
+   /**
+    * Get OrganizationsApiService.
+    *
+    * @return OrganizationsApiService.
+    */
    public static OrganizationsApiService getOrganizationsApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java
new file mode 100644
index 0000000000..f7b2d12086
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.organization.role.management.v1.factories;
+
+import org.wso2.carbon.identity.api.server.organization.role.management.common.OrganizationRoleManagementServiceHolder;
+import org.wso2.carbon.identity.api.server.organization.role.management.v1.service.RoleManagementService;
+import org.wso2.carbon.identity.organization.management.role.management.service.RoleManager;
+import org.wso2.carbon.identity.organization.management.service.OrganizationUserResidentResolverService;
+
+/**
+ * Factory class for RoleManagementService.
+ */
+public class RoleManagementServiceFactory {
+
+    private static final RoleManagementService SERVICE;
+
+    static {
+        RoleManager roleManager = OrganizationRoleManagementServiceHolder.getRoleManager();
+        OrganizationUserResidentResolverService organizationUserResidentResolverService =
+                OrganizationRoleManagementServiceHolder.getOrganizationUserResidentResolverService();
+
+        if (roleManager == null) {
+            throw new IllegalStateException("RoleManager service is not available from OSGi context.");
+        }
+
+        if (organizationUserResidentResolverService == null) {
+            throw new IllegalStateException("OrganizationUserResidentResolverService is not available " +
+                    "from OSGi context.");
+        }
+
+        SERVICE = new RoleManagementService(roleManager, organizationUserResidentResolverService);
+    }
+
+    /**
+     * Get RoleManagementService.
+     *
+     * @return RoleManagementService.
+     */
+    public static RoleManagementService getRoleManagementService() {
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/impl/OrganizationsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/impl/OrganizationsApiServiceImpl.java
index 5066d050f4..230ca25006 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/impl/OrganizationsApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/impl/OrganizationsApiServiceImpl.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,8 +18,8 @@
 
 package org.wso2.carbon.identity.api.server.organization.role.management.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.OrganizationsApiService;
+import org.wso2.carbon.identity.api.server.organization.role.management.v1.factories.RoleManagementServiceFactory;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolePatchRequest;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolePostRequest;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolePutRequest;
@@ -32,8 +32,15 @@
  */
 public class OrganizationsApiServiceImpl implements OrganizationsApiService {
 
-    @Autowired
-    private RoleManagementService roleManagementService;
+    private final RoleManagementService roleManagementService;
+
+    public OrganizationsApiServiceImpl() {
+        try {
+            this.roleManagementService = RoleManagementServiceFactory.getRoleManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating role management service.", e);
+        }
+    }
 
     @Override
     public Response createRole(String organizationId, RolePostRequest rolePostRequest) {
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/service/RoleManagementService.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/service/RoleManagementService.java
index f8bbfc88da..ca1dbbe9ad 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/service/RoleManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/service/RoleManagementService.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
@@ -43,11 +43,13 @@
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.model.RolesListResponse;
 import org.wso2.carbon.identity.api.server.organization.role.management.v1.util.RoleManagementEndpointUtils;
 import org.wso2.carbon.identity.core.util.IdentityUtil;
+import org.wso2.carbon.identity.organization.management.role.management.service.RoleManager;
 import org.wso2.carbon.identity.organization.management.role.management.service.models.Group;
 import org.wso2.carbon.identity.organization.management.role.management.service.models.PatchOperation;
 import org.wso2.carbon.identity.organization.management.role.management.service.models.Role;
 import org.wso2.carbon.identity.organization.management.role.management.service.models.RolesResponse;
 import org.wso2.carbon.identity.organization.management.role.management.service.models.User;
+import org.wso2.carbon.identity.organization.management.service.OrganizationUserResidentResolverService;
 import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementClientException;
 import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException;
 
@@ -76,8 +78,18 @@
  */
 public class RoleManagementService {
 
+    private final RoleManager roleManager;
+    private final OrganizationUserResidentResolverService organizationUserResidentResolverService;
+
     private static final Log LOG = LogFactory.getLog(RoleManagementService.class);
 
+    public RoleManagementService(RoleManager roleManager,
+                                 OrganizationUserResidentResolverService organizationUserResidentResolverService) {
+
+        this.roleManager = roleManager;
+        this.organizationUserResidentResolverService = organizationUserResidentResolverService;
+    }
+
     /**
      * Service for creating a role inside an organization.
      *
@@ -88,7 +100,7 @@ public class RoleManagementService {
     public Response createRole(String organizationId, RolePostRequest rolePostRequest) {
 
         try {
-            Role role = RoleManagementEndpointUtils.getRoleManager().createRole(organizationId,
+            Role role = roleManager.createRole(organizationId,
                     generateRoleFromPostRequest(rolePostRequest));
             URI roleURI = RoleManagementEndpointUtils.getUri(organizationId, role.getId(),
                     RoleManagementEndpointConstants.ROLE_PATH,
@@ -111,7 +123,7 @@ public Response createRole(String organizationId, RolePostRequest rolePostReques
     public Response deleteRole(String organizationId, String roleId) {
 
         try {
-            RoleManagementEndpointUtils.getRoleManager().deleteRole(organizationId, roleId);
+            roleManager.deleteRole(organizationId, roleId);
             return Response.noContent().build();
         } catch (OrganizationManagementClientException e) {
             return RoleManagementEndpointUtils.handleClientErrorResponse(e, LOG);
@@ -130,7 +142,7 @@ public Response deleteRole(String organizationId, String roleId) {
     public Response getRoleUsingOrganizationIdAndRoleId(String organizationId, String roleId) {
 
         try {
-            Role role = RoleManagementEndpointUtils.getRoleManager().getRoleById(organizationId, roleId);
+            Role role = roleManager.getRoleById(organizationId, roleId);
             URI roleURI = RoleManagementEndpointUtils.getUri(organizationId, roleId,
                     RoleManagementEndpointConstants.ROLE_PATH,
                     ERROR_CODE_ERROR_BUILDING_ROLE_URI);
@@ -155,8 +167,7 @@ public Response getRolesOfOrganization(String organizationId, String filter, Int
 
         try {
             int limitValue = validateCount(count);
-            RolesResponse rolesResponse = RoleManagementEndpointUtils.getRoleManager()
-                    .getOrganizationRoles(limitValue, filter, organizationId, cursor);
+            RolesResponse rolesResponse = roleManager.getOrganizationRoles(limitValue, filter, organizationId, cursor);
             return Response.ok().entity(getRoleListResponse(organizationId, rolesResponse)).build();
         } catch (OrganizationManagementClientException e) {
             return RoleManagementEndpointUtils.handleClientErrorResponse(e, LOG);
@@ -175,8 +186,7 @@ public Response getRolesOfOrganization(String organizationId, String filter, Int
     public Response getUserRolesOfOrganization(String organizationId, String userId) {
 
         try {
-            String userResidentOrgId = String.valueOf(RoleManagementEndpointUtils
-                    .getOrganizationUserResidentResolverService()
+            String userResidentOrgId = String.valueOf(organizationUserResidentResolverService
                     .resolveResidentOrganization(userId, organizationId)
                     .orElseThrow(() -> handleClientException(ERROR_CODE_USER_ROOT_ORGANIZATION_NOT_FOUND, userId)));
             if (!StringUtils.equals(userResidentOrgId, organizationId)) {
@@ -184,8 +194,7 @@ public Response getUserRolesOfOrganization(String organizationId, String userId)
                         (ERROR_CODE_ERROR_WHILE_RESOLVING_USER_FROM_RESIDENT_ORG, userResidentOrgId, organizationId);
             }
 
-            List<Role> userRolesResponse = RoleManagementEndpointUtils.getRoleManager()
-                    .getUserOrganizationRoles(userId, organizationId);
+            List<Role> userRolesResponse = roleManager.getUserOrganizationRoles(userId, organizationId);
             return Response.ok().entity(getUserRoleListResponse(organizationId, userRolesResponse)).build();
         } catch (OrganizationManagementClientException e) {
             return RoleManagementEndpointUtils.handleClientErrorResponse(e, LOG);
@@ -226,8 +235,7 @@ public Response patchRole(String organizationId, String roleId, RolePatchRequest
                     throw handleClientException(ERROR_CODE_PATCH_VALUE_EMPTY);
                 }
             }
-            Role role = RoleManagementEndpointUtils.getRoleManager().patchRole(organizationId, roleId,
-                    patchOperations);
+            Role role = roleManager.patchRole(organizationId, roleId, patchOperations);
             URI roleURI = RoleManagementEndpointUtils.getUri(organizationId, roleId,
                     RoleManagementEndpointConstants.ROLE_PATH,
                     ERROR_CODE_ERROR_BUILDING_ROLE_URI);
@@ -258,7 +266,7 @@ public Response putRole(String organizationId, String roleId, RolePutRequest rol
             List<RolePutRequestGroup> groups = rolePutRequest.getGroups();
             List<String> permissions = rolePutRequest.getPermissions();
 
-            Role role = RoleManagementEndpointUtils.getRoleManager().putRole(organizationId, roleId,
+            Role role = roleManager.putRole(organizationId, roleId,
                     new Role(roleId, displayName,
                             (groups == null ? Collections.emptyList() : groups.stream().map(group ->
                                     new Group(group.getValue())).collect(Collectors.toList())),
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/util/RoleManagementEndpointUtils.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/util/RoleManagementEndpointUtils.java
index dfc57c5c40..65f27e072a 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/util/RoleManagementEndpointUtils.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/util/RoleManagementEndpointUtils.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
@@ -58,7 +58,7 @@ public class RoleManagementEndpointUtils {
      */
     public static RoleManager getRoleManager() {
 
-        return OrganizationRoleManagementServiceHolder.getInstance().getRoleManager();
+        return OrganizationRoleManagementServiceHolder.getRoleManager();
     }
 
     /**
@@ -66,7 +66,7 @@ public static RoleManager getRoleManager() {
      */
     public static OrganizationUserResidentResolverService getOrganizationUserResidentResolverService() {
 
-        return OrganizationRoleManagementServiceHolder.getInstance().getOrganizationUserResidentResolverService();
+        return OrganizationRoleManagementServiceHolder.getOrganizationUserResidentResolverService();
     }
 
     /**
diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/resources/META-INF/cxf/org-role-mgt-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/resources/META-INF/cxf/org-role-mgt-server-v1-cxf.xml
deleted file mode 100644
index 0e2705cf42..0000000000
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/resources/META-INF/cxf/org-role-mgt-server-v1-cxf.xml
+++ /dev/null
@@ -1,34 +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.api.server.organization.role.management.v1.impl.OrganizationsApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.api.server.organization.role.management.v1.service.RoleManagementService"/>
-    <bean id="OrganizationUserResidentResolverServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.organization.role.management.common.factory.OrganizationUserResidentResolverOSGIServiceFactory"/>
-    <bean id="RoleMgtServiceFactoryBean" class="org.wso2.carbon.identity.api.server.organization.role.management.common.factory.OrganizationRoleManagementOSGIServiceFactory"/>
-    <bean id="RoleManagementServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.organization.role.management.common.OrganizationRoleManagementServiceHolder">
-        <property name="organizationUserResidentResolverService" ref="OrganizationUserResidentResolverServiceFactoryBean"/>
-        <property name="roleManager" ref="RoleMgtServiceFactoryBean"/>
-    </bean>
-</beans>

From 6e0eeb8c72bf3ee59dd60965ba7f296ec5a7ca84 Mon Sep 17 00:00:00 2001
From: NipuniBhagya <nipunib@wso2.com>
Date: Tue, 15 Oct 2024 19:51:30 +0530
Subject: [PATCH 2/3] Resolve PR comments

---
 .../management/v1/factories/RoleManagementServiceFactory.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java
index f7b2d12086..8bca9652df 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java
@@ -53,6 +53,7 @@ public class RoleManagementServiceFactory {
      * @return RoleManagementService.
      */
     public static RoleManagementService getRoleManagementService() {
+
         return SERVICE;
     }
 }

From b46450ff303ce68a456226a30bb935149aa1f948 Mon Sep 17 00:00:00 2001
From: NipuniBhagya <nipunib@wso2.com>
Date: Wed, 16 Oct 2024 15:43:22 +0530
Subject: [PATCH 3/3] Refactor RoleManagementServiceFactory class

---
 .../RoleManagementServiceFactory.java         | 49 +++++++++++++------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java
index 8bca9652df..5a2597b8ab 100644
--- a/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.organization.role.management/org.wso2.carbon.identity.api.server.organization.role.management.v1/src/main/java/org/wso2/carbon/identity/api/server/organization/role/management/v1/factories/RoleManagementServiceFactory.java
@@ -28,23 +28,22 @@
  */
 public class RoleManagementServiceFactory {
 
-    private static final RoleManagementService SERVICE;
+    private RoleManagementServiceFactory() {
 
-    static {
-        RoleManager roleManager = OrganizationRoleManagementServiceHolder.getRoleManager();
-        OrganizationUserResidentResolverService organizationUserResidentResolverService =
-                OrganizationRoleManagementServiceHolder.getOrganizationUserResidentResolverService();
+    }
 
-        if (roleManager == null) {
-            throw new IllegalStateException("RoleManager service is not available from OSGi context.");
-        }
+    private static class RoleManagementServiceHolder {
 
-        if (organizationUserResidentResolverService == null) {
-            throw new IllegalStateException("OrganizationUserResidentResolverService is not available " +
-                    "from OSGi context.");
-        }
+        private static final RoleManagementService SERVICE = createServiceInstance();
+    }
+
+    private static RoleManagementService createServiceInstance() {
 
-        SERVICE = new RoleManagementService(roleManager, organizationUserResidentResolverService);
+        RoleManager roleManager = getRoleManagerService();
+        OrganizationUserResidentResolverService organizationUserResidentResolverService =
+                getOrganizationUserResidentResolverService();
+
+        return new RoleManagementService(roleManager, organizationUserResidentResolverService);
     }
 
     /**
@@ -54,6 +53,28 @@ public class RoleManagementServiceFactory {
      */
     public static RoleManagementService getRoleManagementService() {
 
-        return SERVICE;
+        return RoleManagementServiceHolder.SERVICE;
+    }
+
+    private static RoleManager getRoleManagerService() {
+
+        RoleManager service = OrganizationRoleManagementServiceHolder.getRoleManager();
+        if (service == null) {
+            throw new IllegalStateException("RoleManager service is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static OrganizationUserResidentResolverService getOrganizationUserResidentResolverService() {
+
+        OrganizationUserResidentResolverService service = OrganizationRoleManagementServiceHolder
+                .getOrganizationUserResidentResolverService();
+        if (service == null) {
+            throw new IllegalStateException("OrganizationUserResidentResolverService is not available " +
+                    "from OSGi context.");
+        }
+
+        return service;
     }
 }