[Spring Cleanup] Remove Spring dependencies in the organization roles management API

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>

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,60 +27,36 @@
  */
 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);
     }
 
     /**
      * Get RoleManager OSGi service.
      *
      * @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;
     }
 
     /**
      * Method to get the organization user resident resolver OSGi service.
      *
      * @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;
     }
 }

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>

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

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;
    }
 }

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,80 @@
+/*
+ * 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 RoleManagementServiceFactory() {
+
+    }
+
+    private static class RoleManagementServiceHolder {
+
+        private static final RoleManagementService SERVICE = createServiceInstance();
+    }
+
+    private static RoleManagementService createServiceInstance() {
+
+        RoleManager roleManager = getRoleManagerService();
+        OrganizationUserResidentResolverService organizationUserResidentResolverService =
+                getOrganizationUserResidentResolverService();
+
+        return new RoleManagementService(roleManager, organizationUserResidentResolverService);
+    }
+
+    /**
+     * Get RoleManagementService.
+     *
+     * @return RoleManagementService.
+     */
+    public static RoleManagementService getRoleManagementService() {
+
+        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;
+    }
+}