Remove Spring dependencies in API resource management API

wso2 · Oct 7, 2024 · a936809 · a936809
1 parent a76694f
commit a936809
Show file tree

Hide file tree

Showing 20 changed files with 220 additions and 312 deletions.
diff --git a/...y.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml b/...y.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.common/pom.xml
@@ -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/...o2/carbon/identity/api/server/api/resource/common/APIResourceManagementServiceHolder.java b/...o2/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,56 @@
  */
 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/...ty/api/server/api/resource/common/factory/APIResourceCollectionMgtOSGiServiceFactory.java b/...ty/api/server/api/resource/common/factory/APIResourceCollectionMgtOSGiServiceFactory.java
diff --git a/...bon/identity/api/server/api/resource/common/factory/APIResourceMgtOSGiServiceFactory.java b/...bon/identity/api/server/api/resource/common/factory/APIResourceMgtOSGiServiceFactory.java
diff --git a/.../carbon/identity/api/server/api/resource/common/factory/OAuthAdminOSGiServiceFactory.java b/.../carbon/identity/api/server/api/resource/common/factory/OAuthAdminOSGiServiceFactory.java
diff --git a/...ntity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml b/...ntity.api.server.api.resource/org.wso2.carbon.identity.api.server.api.resource.v1/pom.xml
@@ -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/....v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ApiResourcesApi.java b/....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,11 @@
 
 public class ApiResourcesApi  {
 
-    @Autowired
-    private ApiResourcesApiService delegate;
+    private final ApiResourcesApiService delegate;
+
+    public ApiResourcesApi() {
+        this.delegate = ApiResourcesApiServiceFactory.getApiResourcesApi();
+    }
 
     @Valid
     @POST

diff --git a/...resource.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/MetaApi.java b/...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,11 @@
 
 public class MetaApi  {
 
-    @Autowired
-    private MetaApiService delegate;
+    private final MetaApiService delegate;
+
+    public MetaApi() {
+        this.delegate = MetaApiServiceFactory.getMetaApi();
+    }
 
     @Valid
     @GET

diff --git a/...source.v1/src/gen/java/org/wso2/carbon/identity/api/server/api/resource/v1/ScopesApi.java b/...source.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,11 @@
 
 public class ScopesApi  {
 
-    @Autowired
-    private ScopesApiService delegate;
+    private final ScopesApiService delegate;
+
+    public ScopesApi() {
+        this.delegate = ScopesApiServiceFactory.getScopesApi();
+    }
 
     @Valid
     @GET