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

* Remove Spring dependencies in API resource management API

* Resolve PR comments
---
 .../pom.xml                                   |  7 +--
 .../APIResourceManagementServiceHolder.java   | 61 +++++++-----------
 ...sourceCollectionMgtOSGiServiceFactory.java | 50 ---------------
 .../APIResourceMgtOSGiServiceFactory.java     | 50 ---------------
 .../factory/OAuthAdminOSGiServiceFactory.java | 53 ----------------
 .../pom.xml                                   |  7 +--
 .../api/resource/v1/ApiResourcesApi.java      | 12 ++--
 .../api/server/api/resource/v1/MetaApi.java   | 12 ++--
 .../api/server/api/resource/v1/ScopesApi.java | 12 ++--
 .../ApiResourcesApiServiceFactory.java        | 12 +++-
 .../v1/factories/MetaApiServiceFactory.java   |  9 ++-
 .../v1/factories/ScopesApiServiceFactory.java | 12 +++-
 ...PIResourceCollectionManagementService.java | 22 ++++---
 .../ServerAPIResourceManagementService.java   | 62 +++++++++----------
 ...rceCollectionManagementServiceFactory.java | 52 ++++++++++++++++
 ...erAPIResourceManagementServiceFactory.java | 52 ++++++++++++++++
 .../v1/impl/ApiResourcesApiServiceImpl.java   | 16 +++--
 .../resource/v1/impl/MetaApiServiceImpl.java  | 17 +++--
 .../v1/impl/ScopesApiServiceImpl.java         | 14 ++++-
 .../cxf/api-resource-server-v1-cxf.xml        | 44 -------------
 20 files changed, 262 insertions(+), 314 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/APIResourceCollectionMgtOSGiServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/APIResourceMgtOSGiServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/OAuthAdminOSGiServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceCollectionManagementServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceManagementServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/META-INF/cxf/api-resource-server-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
index a9e47daa00..c0ea34de48 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.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
@@ -43,11 +43,6 @@
     </build>
 
     <dependencies>
-        <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.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.java
index 005b76a655..9d06159bce 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.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.api.resource.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.api.resource.collection.mgt.APIResourceCollectionManager;
 import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
 import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
@@ -27,67 +28,53 @@
  */
 public class APIResourceManagementServiceHolder {
 
-    private static APIResourceManager apiResourceManager;
-    private static APIResourceCollectionManager apiResourceCollectionManager;
-    private static OAuthAdminServiceImpl oAuthAdminServiceImpl;
+    private APIResourceManagementServiceHolder() {}
 
-    /**
-     * Get APIResourceManager osgi service.
-     *
-     * @return APIResourceManager.
-     */
-    public static APIResourceManager getApiResourceManager() {
+    private static class APIResourceManagerHolder {
 
-        return apiResourceManager;
+        static final APIResourceManager SERVICE = (APIResourceManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(APIResourceManager.class, null);
     }
 
-    /**
-     * Set APIResourceManager osgi service.
-     *
-     * @param apiResourceManager APIResourceManager.
-     */
-    public static void setApiResourceManager(APIResourceManager apiResourceManager) {
+    private static class APIResourceCollectionManagerHolder {
 
-        APIResourceManagementServiceHolder.apiResourceManager = apiResourceManager;
+        static final APIResourceCollectionManager SERVICE = (APIResourceCollectionManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(APIResourceCollectionManager.class, null);
     }
 
-    /**
-     * Get APIResourceCollectionManager osgi service.
-     *
-     * @return APIResourceCollectionManager.
-     */
-    public static APIResourceCollectionManager getApiResourceCollectionManager() {
+    private static class OAuthAdminServiceImplHolder {
 
-        return apiResourceCollectionManager;
+        static final OAuthAdminServiceImpl SERVICE = (OAuthAdminServiceImpl) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(OAuthAdminServiceImpl.class, null);
     }
 
     /**
-     * Set APIResourceCollectionManager osgi service.
+     * Get APIResourceManager osgi service.
      *
-     * @param apiResourceCollectionManager APIResourceCollectionManager.
+     * @return APIResourceManager.
      */
-    public static void setApiResourceCollectionManager(APIResourceCollectionManager apiResourceCollectionManager) {
+    public static APIResourceManager getApiResourceManager() {
 
-        APIResourceManagementServiceHolder.apiResourceCollectionManager = apiResourceCollectionManager;
+        return APIResourceManagerHolder.SERVICE;
     }
 
     /**
-     * Get OAuthAdminServiceImpl instance.
+     * Get APIResourceCollectionManager osgi service.
      *
-     * @return OAuthAdminServiceImpl instance.
+     * @return APIResourceCollectionManager.
      */
-    public static OAuthAdminServiceImpl getOAuthAdminServiceImpl() {
+    public static APIResourceCollectionManager getApiResourceCollectionManager() {
 
-        return oAuthAdminServiceImpl;
+        return APIResourceCollectionManagerHolder.SERVICE;
     }
 
     /**
-     * Set OAuthAdminServiceImpl instance.
+     * Get OAuthAdminServiceImpl instance.
      *
-     * @param oAuthAdminServiceImpl OAuthAdminServiceImpl instance.
+     * @return OAuthAdminServiceImpl instance.
      */
-    public static void setOAuthAdminServiceImpl(OAuthAdminServiceImpl oAuthAdminServiceImpl) {
+    public static OAuthAdminServiceImpl getOAuthAdminServiceImpl() {
 
-        APIResourceManagementServiceHolder.oAuthAdminServiceImpl = oAuthAdminServiceImpl;
+        return OAuthAdminServiceImplHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/APIResourceCollectionMgtOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/APIResourceCollectionMgtOSGiServiceFactory.java
deleted file mode 100644
index aefa779310..0000000000
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/APIResourceCollectionMgtOSGiServiceFactory.java
+++ /dev/null
@@ -1,50 +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.api.resource.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.api.resource.collection.mgt.APIResourceCollectionManager;
-
-/**
- * Factory class for APIResourceManagementOSGiService.
- */
-public class APIResourceCollectionMgtOSGiServiceFactory extends AbstractFactoryBean<APIResourceCollectionManager> {
-
-    private APIResourceCollectionManager apiResourceCollectionManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected APIResourceCollectionManager createInstance() throws Exception {
-
-        if (this.apiResourceCollectionManager == null) {
-            apiResourceCollectionManager = (APIResourceCollectionManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(APIResourceCollectionManager.class, null);
-            if (apiResourceCollectionManager == null) {
-                throw new Exception("Unable to retrieve APIResourceCollectionManager service.");
-            }
-        }
-        return this.apiResourceCollectionManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/APIResourceMgtOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/APIResourceMgtOSGiServiceFactory.java
deleted file mode 100644
index 953bd1cfd5..0000000000
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/APIResourceMgtOSGiServiceFactory.java
+++ /dev/null
@@ -1,50 +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.api.resource.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
-
-/**
- * Factory class for APIResourceManagementOSGiService.
- */
-public class APIResourceMgtOSGiServiceFactory extends AbstractFactoryBean<APIResourceManager> {
-
-    private APIResourceManager apiResourceManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected APIResourceManager createInstance() throws Exception {
-
-        if (this.apiResourceManager == null) {
-            apiResourceManager = (APIResourceManager) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(APIResourceManager.class, null);
-            if (apiResourceManager == null) {
-                throw new Exception("Unable to retrieve APIResourceManager service.");
-            }
-        }
-        return this.apiResourceManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/OAuthAdminOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/OAuthAdminOSGiServiceFactory.java
deleted file mode 100644
index e160b1eb4b..0000000000
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/src/main/java/org/wso2/carbon/identity/api/server/api/resource/common/factory/OAuthAdminOSGiServiceFactory.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.api.resource.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.oauth.OAuthAdminServiceImpl;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the OAuthAdminServiceImpl type of object inside the container.
- */
-public class OAuthAdminOSGiServiceFactory extends AbstractFactoryBean<OAuthAdminServiceImpl> {
-
-    private OAuthAdminServiceImpl oauthAdminService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected OAuthAdminServiceImpl createInstance() throws Exception {
-
-        if (this.oauthAdminService == null) {
-            oauthAdminService = (OAuthAdminServiceImpl) PrivilegedCarbonContext
-                    .getThreadLocalCarbonContext().getOSGiService(OAuthAdminServiceImpl.class, null);
-
-            if (oauthAdminService == null) {
-                throw new Exception("Unable to retrieve OAuthAdminServiceImpl service.");
-            }
-        }
-        return this.oauthAdminService;
-    }
-}
-
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
index 8985a3d21b..88c283fb46 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.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
@@ -82,11 +82,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.java
index e6befc4bc3..d061c00cab 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.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,7 +18,6 @@
 
 package org.wso2.carbon.identity.api.server.api.resource.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;
@@ -38,6 +37,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import io.swagger.annotations.*;
+import org.wso2.carbon.identity.api.server.api.resource.v1.factories.ApiResourcesApiServiceFactory;
 
 import javax.validation.constraints.*;
 
@@ -46,8 +46,12 @@
 
 public class ApiResourcesApi  {
 
-    @Autowired
-    private ApiResourcesApiService delegate;
+    private final ApiResourcesApiService delegate;
+
+    public ApiResourcesApi() {
+
+        this.delegate = ApiResourcesApiServiceFactory.getApiResourcesApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/MetaApi.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/MetaApi.java
index f1239cc27a..2d15931e9d 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/MetaApi.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/MetaApi.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
@@ -24,7 +24,7 @@
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.Authorization;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.wso2.carbon.identity.api.server.api.resource.v1.factories.MetaApiServiceFactory;
 
 import javax.validation.Valid;
 import javax.ws.rs.GET;
@@ -39,8 +39,12 @@
 
 public class MetaApi  {
 
-    @Autowired
-    private MetaApiService delegate;
+    private final MetaApiService delegate;
+
+    public MetaApi() {
+
+        this.delegate = MetaApiServiceFactory.getMetaApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.java
index 83564b4976..e8af53fba8 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.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,7 +18,6 @@
 
 package org.wso2.carbon.identity.api.server.api.resource.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;
@@ -32,6 +31,7 @@
 import javax.ws.rs.*;
 import javax.ws.rs.core.Response;
 import io.swagger.annotations.*;
+import org.wso2.carbon.identity.api.server.api.resource.v1.factories.ScopesApiServiceFactory;
 
 import javax.validation.constraints.*;
 
@@ -40,8 +40,12 @@
 
 public class ScopesApi  {
 
-    @Autowired
-    private ScopesApiService delegate;
+    private final ScopesApiService delegate;
+
+    public ScopesApi() {
+
+        this.delegate = ScopesApiServiceFactory.getScopesApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ApiResourcesApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ApiResourcesApiServiceFactory.java
index 1d89750b24..bf5537e06d 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ApiResourcesApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ApiResourcesApiServiceFactory.java
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.api.server.api.resource.v1.ApiResourcesApiService;
 import org.wso2.carbon.identity.api.server.api.resource.v1.impl.ApiResourcesApiServiceImpl;
 
+/**
+ * Factory class for ApiResourcesApiService.
+ */
 public class ApiResourcesApiServiceFactory {
 
-   private final static ApiResourcesApiService service = new ApiResourcesApiServiceImpl();
+   private final static ApiResourcesApiService SERVICE = new ApiResourcesApiServiceImpl();
 
+   /**
+    * Get ApiResourcesApiService.
+    *
+    * @return ApiResourcesApiService.
+    */
    public static ApiResourcesApiService getApiResourcesApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/MetaApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/MetaApiServiceFactory.java
index c2b23f5274..e2fa4f39d3 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/MetaApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/MetaApiServiceFactory.java
@@ -26,10 +26,15 @@
  */
 public class MetaApiServiceFactory {
 
-   private final static MetaApiService service = new MetaApiServiceImpl();
+   private final static MetaApiService SERVICE = new MetaApiServiceImpl();
 
+   /**
+    * Get MetaApiService.
+    *
+    * @return MetaApiService.
+    */
    public static MetaApiService getMetaApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ScopesApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ScopesApiServiceFactory.java
index cb91296d06..c6857d33d4 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ScopesApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ScopesApiServiceFactory.java
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.api.server.api.resource.v1.ScopesApiService;
 import org.wso2.carbon.identity.api.server.api.resource.v1.impl.ScopesApiServiceImpl;
 
+/**
+ * Factory class for ScopesApiService.
+ */
 public class ScopesApiServiceFactory {
 
-   private final static ScopesApiService service = new ScopesApiServiceImpl();
+   private final static ScopesApiService SERVICE = new ScopesApiServiceImpl();
 
+   /**
+    * Get ScopesApiService.
+    *
+    * @return ScopesApiService.
+    */
    public static ScopesApiService getScopesApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceCollectionManagementService.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceCollectionManagementService.java
index f25683624d..8329e69350 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceCollectionManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceCollectionManagementService.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,11 +21,11 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.wso2.carbon.context.CarbonContext;
+import org.wso2.carbon.identity.api.resource.collection.mgt.APIResourceCollectionManager;
 import org.wso2.carbon.identity.api.resource.collection.mgt.constant.APIResourceCollectionManagementConstants;
 import org.wso2.carbon.identity.api.resource.collection.mgt.exception.APIResourceCollectionMgtException;
 import org.wso2.carbon.identity.api.resource.collection.mgt.model.APIResourceCollection;
 import org.wso2.carbon.identity.api.resource.collection.mgt.model.APIResourceCollectionSearchResult;
-import org.wso2.carbon.identity.api.server.api.resource.common.APIResourceManagementServiceHolder;
 import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceCollectionItem;
 import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceCollectionListItem;
 import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceCollectionListResponse;
@@ -54,6 +54,13 @@
  */
 public class ServerAPIResourceCollectionManagementService {
 
+    private final APIResourceCollectionManager apiResourceCollectionManager;
+
+    public ServerAPIResourceCollectionManagementService(APIResourceCollectionManager apiResourceCollectionManager) {
+
+        this.apiResourceCollectionManager = apiResourceCollectionManager;
+    }
+
     /**
      * Get API Resource Collections List.
      *
@@ -72,10 +79,9 @@ public APIResourceCollectionListResponse getAPIResourceCollections(String filter
                 validateRequiredAttributes(requestedAttributeList);
             }
 
-            APIResourceCollectionSearchResult apiResourceCollectionSearchResult =
-                    APIResourceManagementServiceHolder.getApiResourceCollectionManager()
-                            .getAPIResourceCollections(filter, requestedAttributeList,
-                                    CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+            APIResourceCollectionSearchResult apiResourceCollectionSearchResult = apiResourceCollectionManager
+                    .getAPIResourceCollections(filter, requestedAttributeList,
+                            CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
             List<APIResourceCollection> apiResourceCollections =
                     apiResourceCollectionSearchResult.getAPIResourceCollections();
             if (CollectionUtils.isEmpty(apiResourceCollections)) {
@@ -104,8 +110,8 @@ public APIResourceCollectionResponse getAPIResourceCollectionByCollectionId(Stri
         APIResourceCollectionResponse apiResourceCollectionResponse = new APIResourceCollectionResponse();
 
         try {
-            APIResourceCollection apiResourceCollection = APIResourceManagementServiceHolder
-                    .getApiResourceCollectionManager().getAPIResourceCollectionById(collectionId,
+            APIResourceCollection apiResourceCollection = apiResourceCollectionManager
+                    .getAPIResourceCollectionById(collectionId,
                             CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
             if (apiResourceCollection == null) {
                 throw APIResourceMgtEndpointUtil.handleException(Response.Status.NOT_FOUND,
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
index 8d7eba9736..aa3d890e49 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/core/ServerAPIResourceManagementService.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,9 +23,9 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.CarbonContext;
+import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
 import org.wso2.carbon.identity.api.resource.mgt.APIResourceMgtException;
 import org.wso2.carbon.identity.api.resource.mgt.model.APIResourceSearchResult;
-import org.wso2.carbon.identity.api.server.api.resource.common.APIResourceManagementServiceHolder;
 import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceCreationModel;
 import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceListItem;
 import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceListResponse;
@@ -67,8 +67,14 @@
  */
 public class ServerAPIResourceManagementService {
 
+    private final APIResourceManager apiResourceManager;
     private static final Log LOG = LogFactory.getLog(ServerAPIResourceManagementService.class);
 
+    public ServerAPIResourceManagementService(APIResourceManager apiResourceManager) {
+
+        this.apiResourceManager = apiResourceManager;
+    }
+
     /**
      * Add API resource.
      *
@@ -82,8 +88,8 @@ public APIResourceResponse addAPIResourceWithResourceId(APIResourceCreationModel
         }
         try {
             APIResource apiResource = createAPIResource(apIResourceCreationModel);
-            APIResource createdAPIResource = APIResourceManagementServiceHolder.getApiResourceManager()
-                    .addAPIResource(apiResource, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+            APIResource createdAPIResource = apiResourceManager.addAPIResource(apiResource,
+                    CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
             if (createdAPIResource == null) {
                 LOG.error(ErrorMessage.ERROR_CODE_ADD_API_RESOURCE.getDescription());
                 throw APIResourceMgtEndpointUtil.handleException(Response.Status.INTERNAL_SERVER_ERROR,
@@ -130,12 +136,12 @@ public APIResourceListResponse getAPIResources(String before, String after, Stri
 
             APIResourceSearchResult apiResourceSearchResult;
             if (CollectionUtils.isNotEmpty(requestedAttributeList)) {
-                apiResourceSearchResult = APIResourceManagementServiceHolder.getApiResourceManager()
-                        .getAPIResourcesWithRequiredAttributes(before, after, limit + 1, filter, paginationSortOrder,
+                apiResourceSearchResult = apiResourceManager.getAPIResourcesWithRequiredAttributes(before,
+                        after, limit + 1, filter, paginationSortOrder,
                                 CarbonContext.getThreadLocalCarbonContext().getTenantDomain(), requestedAttributeList);
             } else {
-                apiResourceSearchResult = APIResourceManagementServiceHolder.getApiResourceManager()
-                        .getAPIResources(before, after, limit + 1, filter, paginationSortOrder,
+                apiResourceSearchResult = apiResourceManager.getAPIResources(before,
+                        after, limit + 1, filter, paginationSortOrder,
                                 CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
             }
             List<APIResource> apiResources = apiResourceSearchResult.getAPIResources();
@@ -203,8 +209,8 @@ public APIResourceResponse getAPIResourceResponseById(String apiResourceId) {
     private APIResource getAPIResourceById(String apiResourceID) {
 
         try {
-            APIResource apiResource = APIResourceManagementServiceHolder.getApiResourceManager()
-                    .getAPIResourceById(apiResourceID, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+            APIResource apiResource = apiResourceManager.getAPIResourceById(apiResourceID,
+                    CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
             if (apiResource == null) {
                 throw APIResourceMgtEndpointUtil.handleException(Response.Status.NOT_FOUND,
                         APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_API_RESOURCE_NOT_FOUND, apiResourceID);
@@ -246,7 +252,7 @@ public void patchAPIResourceById(String apiResourceID, APIResourcePatchModel api
                     .type(currentAPIResource.getType())
                     .description(description);
             APIResource apiResource = apiResourceBuilder.build();
-            APIResourceManagementServiceHolder.getApiResourceManager().updateAPIResource(apiResource, addedScopes,
+            apiResourceManager.updateAPIResource(apiResource, addedScopes,
                     removedScopeNames, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
         } catch (APIResourceMgtException e) {
             throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
@@ -265,14 +271,12 @@ public void deleteAPIResource(String apiResourceID) {
                 LOG.debug("Deleting API Resource with ID: " + apiResourceID);
             }
             String tenantDomain = CarbonContext.getThreadLocalCarbonContext().getTenantDomain();
-            APIResource apiResource = APIResourceManagementServiceHolder.getApiResourceManager()
-                    .getAPIResourceById(apiResourceID, tenantDomain);
+            APIResource apiResource = apiResourceManager.getAPIResourceById(apiResourceID, tenantDomain);
             if (apiResource == null) {
                 return;
             }
             handleSystemAPI(apiResource);
-            APIResourceManagementServiceHolder.getApiResourceManager().deleteAPIResourceById(apiResourceID,
-                    tenantDomain);
+            apiResourceManager.deleteAPIResourceById(apiResourceID, tenantDomain);
         } catch (APIResourceMgtException e) {
             throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
         }
@@ -287,8 +291,8 @@ public void deleteAPIResource(String apiResourceID) {
     public List<Scope> getScopesByAPIId(String apiResourceId) {
 
         try {
-            APIResource apiResource = APIResourceManagementServiceHolder.getApiResourceManager()
-                    .getAPIResourceById(apiResourceId, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+            APIResource apiResource = apiResourceManager.getAPIResourceById(apiResourceId,
+                    CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
             if (apiResource == null) {
                 throw APIResourceMgtEndpointUtil.handleException(Response.Status.NOT_FOUND,
                         APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_API_RESOURCE_NOT_FOUND, apiResourceId);
@@ -308,15 +312,15 @@ public List<Scope> getScopesByAPIId(String apiResourceId) {
     public void putScopesByAPIId(String apiResourceId, List<ScopeCreationModel> scopeCreationModels) {
 
         try {
-            APIResource apiResource = APIResourceManagementServiceHolder.getApiResourceManager()
-                    .getAPIResourceById(apiResourceId, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
+            APIResource apiResource = apiResourceManager.getAPIResourceById(apiResourceId,
+                    CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
             if (apiResource == null) {
                 throw APIResourceMgtEndpointUtil.handleException(Response.Status.NOT_FOUND,
                         APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_API_RESOURCE_NOT_FOUND, apiResourceId);
             }
             handleSystemAPI(apiResource);
             List<Scope> scopes = createScopes(scopeCreationModels);
-            APIResourceManagementServiceHolder.getApiResourceManager().putScopes(apiResourceId, apiResource.getScopes(),
+            apiResourceManager.putScopes(apiResourceId, apiResource.getScopes(),
                     scopes, CarbonContext.getThreadLocalCarbonContext().getTenantDomain());
         } catch (APIResourceMgtException e) {
             throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
@@ -336,13 +340,12 @@ public void deleteScopeByScopeName(String apiResourceId, String scopeName) {
                 LOG.debug("Deleting scope with ID: " + scopeName + " of API Resource ID: " + apiResourceId);
             }
             String tenantDomain = CarbonContext.getThreadLocalCarbonContext().getTenantDomain();
-            APIResource apiResource = APIResourceManagementServiceHolder.getApiResourceManager()
-                    .getAPIResourceById(apiResourceId, tenantDomain);
+            APIResource apiResource = apiResourceManager.getAPIResourceById(apiResourceId, tenantDomain);
             if (apiResource == null) {
                 return;
             }
             handleSystemAPI(apiResource);
-            APIResourceManagementServiceHolder.getApiResourceManager().deleteAPIScopeByScopeName(apiResourceId,
+            apiResourceManager.deleteAPIScopeByScopeName(apiResourceId,
                     scopeName, tenantDomain);
         } catch (APIResourceMgtException e) {
             throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
@@ -364,15 +367,13 @@ public void patchScopeMetadataByScopeName(String apiResourceId, String scopeName
             }
             String tenantDomain = CarbonContext.getThreadLocalCarbonContext().getTenantDomain();
 
-            APIResource apiResource = APIResourceManagementServiceHolder.getApiResourceManager()
-                    .getAPIResourceById(apiResourceId, tenantDomain);
+            APIResource apiResource = apiResourceManager.getAPIResourceById(apiResourceId, tenantDomain);
             if (apiResource == null) {
                 throw APIResourceMgtEndpointUtil.handleException(Response.Status.NOT_FOUND,
                         APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_API_RESOURCE_NOT_FOUND, apiResourceId);
             }
 
-            Scope scopeWithMetadata = APIResourceManagementServiceHolder.getApiResourceManager()
-                    .getScopeByName(scopeName, tenantDomain);
+            Scope scopeWithMetadata = apiResourceManager.getScopeByName(scopeName, tenantDomain);
             if (scopeWithMetadata == null) {
                 throw APIResourceMgtEndpointUtil.handleException(Response.Status.NOT_FOUND,
                         APIResourceMgtEndpointConstants.ErrorMessage.ERROR_CODE_INVALID_SCOPE_NAME);
@@ -391,8 +392,7 @@ public void patchScopeMetadataByScopeName(String apiResourceId, String scopeName
                     .apiID(scopeWithMetadata.getApiID())
                     .orgID(scopeWithMetadata.getOrgID());
             Scope scopeForUpdate = scopeBuilder.build();
-            APIResourceManagementServiceHolder.getApiResourceManager().updateScopeMetadata(scopeForUpdate, apiResource,
-                    tenantDomain);
+            apiResourceManager.updateScopeMetadata(scopeForUpdate, apiResource, tenantDomain);
         } catch (APIResourceMgtException e) {
             throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
         }
@@ -407,8 +407,8 @@ public void patchScopeMetadataByScopeName(String apiResourceId, String scopeName
     public List<Scope> getScopesByTenant(String filter) {
 
         try {
-            return APIResourceManagementServiceHolder.getApiResourceManager()
-                    .getScopesByTenantDomain(CarbonContext.getThreadLocalCarbonContext().getTenantDomain(), filter);
+            return apiResourceManager.getScopesByTenantDomain(CarbonContext.getThreadLocalCarbonContext()
+                    .getTenantDomain(), filter);
         } catch (APIResourceMgtException e) {
             throw APIResourceMgtEndpointUtil.handleAPIResourceMgtException(e);
         }
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceCollectionManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceCollectionManagementServiceFactory.java
new file mode 100644
index 0000000000..64ce6f99b6
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceCollectionManagementServiceFactory.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1.factories;
+
+import org.wso2.carbon.identity.api.resource.collection.mgt.APIResourceCollectionManager;
+import org.wso2.carbon.identity.api.server.api.resource.common.APIResourceManagementServiceHolder;
+import org.wso2.carbon.identity.api.server.api.resource.v1.core.ServerAPIResourceCollectionManagementService;
+
+/**
+ * Factory class for ServerAPIResourceCollectionManagementService.
+ */
+public class ServerAPIResourceCollectionManagementServiceFactory {
+
+    private static final ServerAPIResourceCollectionManagementService SERVICE;
+
+    static {
+        APIResourceCollectionManager apiResourceCollectionManager = APIResourceManagementServiceHolder
+                .getApiResourceCollectionManager();
+
+        if (apiResourceCollectionManager == null) {
+            throw new IllegalStateException("APIResourceCollectionManager is not available from OSGi context.");
+        }
+
+        SERVICE = new ServerAPIResourceCollectionManagementService(apiResourceCollectionManager);
+    }
+
+    /**
+     * Get ServerAPIResourceCollectionManagementService instance.
+     *
+     * @return ServerAPIResourceCollectionManagementService.
+     */
+    public static ServerAPIResourceCollectionManagementService getServerAPIResourceCollectionManagementService() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceManagementServiceFactory.java
new file mode 100644
index 0000000000..611e31a100
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/factories/ServerAPIResourceManagementServiceFactory.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.api.resource.v1.factories;
+
+import org.wso2.carbon.identity.api.resource.mgt.APIResourceManager;
+import org.wso2.carbon.identity.api.server.api.resource.common.APIResourceManagementServiceHolder;
+import org.wso2.carbon.identity.api.server.api.resource.v1.core.ServerAPIResourceManagementService;
+
+/**
+ * Factory class for ServerAPIResourceManagementService.
+ */
+public class ServerAPIResourceManagementServiceFactory {
+
+    private static final ServerAPIResourceManagementService SERVICE;
+
+    static {
+        APIResourceManager apiResourceManager = APIResourceManagementServiceHolder.getApiResourceManager();
+
+        if (apiResourceManager == null) {
+            throw new IllegalStateException("APIResourceManager is not available from OSGi context.");
+        }
+
+        SERVICE = new ServerAPIResourceManagementService(apiResourceManager);
+    }
+
+    /**
+     * Get ServerAPIResourceManagementService instance.
+     *
+     * @return ServerAPIResourceManagementService.
+     */
+    public static ServerAPIResourceManagementService getServerAPIResourceManagementService() {
+
+        return SERVICE;
+    }
+
+}
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ApiResourcesApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ApiResourcesApiServiceImpl.java
index 518fb033da..911c9a0632 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ApiResourcesApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ApiResourcesApiServiceImpl.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,7 +18,6 @@
 
 package org.wso2.carbon.identity.api.server.api.resource.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceCreationModel;
 import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourcePatchModel;
 import org.wso2.carbon.identity.api.server.api.resource.v1.APIResourceResponse;
@@ -27,6 +26,7 @@
 import org.wso2.carbon.identity.api.server.api.resource.v1.ScopePatchModel;
 import org.wso2.carbon.identity.api.server.api.resource.v1.constants.APIResourceMgtEndpointConstants;
 import org.wso2.carbon.identity.api.server.api.resource.v1.core.ServerAPIResourceManagementService;
+import org.wso2.carbon.identity.api.server.api.resource.v1.factories.ServerAPIResourceManagementServiceFactory;
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
 
 import java.net.URI;
@@ -41,8 +41,16 @@
  */
 public class ApiResourcesApiServiceImpl implements ApiResourcesApiService {
 
-    @Autowired
-    ServerAPIResourceManagementService serverAPIResourceManagementService;
+    private final ServerAPIResourceManagementService serverAPIResourceManagementService;
+
+    public ApiResourcesApiServiceImpl() {
+        try {
+            this.serverAPIResourceManagementService = ServerAPIResourceManagementServiceFactory
+                    .getServerAPIResourceManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating API resource management service.", e);
+        }
+    }
 
     @Override
     public Response addAPIResource(APIResourceCreationModel apIResourceCreationModel) {
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/MetaApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/MetaApiServiceImpl.java
index feb5bcf864..25cdf27c52 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/MetaApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/MetaApiServiceImpl.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.api.server.api.resource.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.api.resource.v1.MetaApiService;
 import org.wso2.carbon.identity.api.server.api.resource.v1.core.ServerAPIResourceCollectionManagementService;
+import org.wso2.carbon.identity.api.server.api.resource.v1.factories.ServerAPIResourceCollectionManagementServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -29,8 +29,17 @@
  */
 public class MetaApiServiceImpl implements MetaApiService {
 
-    @Autowired
-    ServerAPIResourceCollectionManagementService serverAPIResourceManagementService;
+    private final ServerAPIResourceCollectionManagementService serverAPIResourceManagementService;
+
+    public MetaApiServiceImpl() {
+        try {
+            this.serverAPIResourceManagementService = ServerAPIResourceCollectionManagementServiceFactory
+                    .getServerAPIResourceCollectionManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating API resource collection management service.",
+                    e);
+        }
+    }
 
     @Override
     public Response getAPIResourceCollectionByCollectionId(String collectionId) {
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ScopesApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ScopesApiServiceImpl.java
index 808d70d219..a6fc19358e 100644
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ScopesApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/java/org/wso2/carbon/identity/api/server/api/resource/v1/impl/ScopesApiServiceImpl.java
@@ -18,9 +18,9 @@
 
 package org.wso2.carbon.identity.api.server.api.resource.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.server.api.resource.v1.ScopesApiService;
 import org.wso2.carbon.identity.api.server.api.resource.v1.core.ServerAPIResourceManagementService;
+import org.wso2.carbon.identity.api.server.api.resource.v1.factories.ServerAPIResourceManagementServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -29,8 +29,16 @@
  */
 public class ScopesApiServiceImpl implements ScopesApiService {
 
-    @Autowired
-    ServerAPIResourceManagementService serverAPIResourceManagementService;
+    private final ServerAPIResourceManagementService serverAPIResourceManagementService;
+
+    public ScopesApiServiceImpl() {
+        try {
+            this.serverAPIResourceManagementService = ServerAPIResourceManagementServiceFactory
+                    .getServerAPIResourceManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating API resource management service.", e);
+        }
+    }
 
     @Override
     public Response scopesGet(String filter) {
diff --git a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/META-INF/cxf/api-resource-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/META-INF/cxf/api-resource-server-v1-cxf.xml
deleted file mode 100644
index d977454b72..0000000000
--- a/components/org.wso2.carbon.identity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/src/main/resources/META-INF/cxf/api-resource-server-v1-cxf.xml
+++ /dev/null
@@ -1,44 +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"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-    <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.core.ServerAPIResourceManagementService"/>
-    <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.core.ServerAPIResourceCollectionManagementService"/>
-    <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.impl.ApiResourcesApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.impl.MetaApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.impl.ScopesApiServiceImpl"/>
-
-    <bean id="apiResourceManagementServiceHolderBean"
-          class="org.wso2.carbon.identity.api.server.api.resource.common.APIResourceManagementServiceHolder">
-        <property name="apiResourceManager" ref="apiResourceManagementServiceFactoryBean"/>
-        <property name="oAuthAdminServiceImpl" ref="oAuthAdminOSGiServiceFactoryBean"/>
-        <property name="apiResourceCollectionManager" ref="apiResourceCollectionManagementServiceFactoryBean"/>
-    </bean>
-
-    <bean id="apiResourceManagementServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.api.resource.common.factory.APIResourceMgtOSGiServiceFactory"/>
-
-    <bean id="oAuthAdminOSGiServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.api.resource.common.factory.OAuthAdminOSGiServiceFactory"/>
-
-    <bean id="apiResourceCollectionManagementServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.server.api.resource.common.factory.APIResourceCollectionMgtOSGiServiceFactory"/>
-</beans>