Merge pull request #794 from lashinijay/master-extensions-mgmt

[Spring Cleanup] Remove Spring dependencies in the extension management API
wso2 · Jan 24, 2025 · f7c4c5a · f7c4c5a
2 parents 581cd71 + 0c66500
commit f7c4c5a
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 130 deletions.
diff --git a/...ension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml b/...ension.management/org.wso2.carbon.identity.api.server.extension.management.common/pom.xml
@@ -45,11 +45,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.extension.mgt</artifactId>

diff --git a/...bon/identity/api/server/extension/management/common/ExtensionManagementServiceHolder.java b/...bon/identity/api/server/extension/management/common/ExtensionManagementServiceHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-2025, 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,46 +18,29 @@
 
 package org.wso2.carbon.identity.api.server.extension.management.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.extension.mgt.ExtensionManager;
 
 /**
  * Extension management service holder.
  */
 public class ExtensionManagementServiceHolder {
 
-    private static ExtensionManagementServiceHolder instance = new ExtensionManagementServiceHolder();
-
-    private ExtensionManager extensionManager;
-
     private ExtensionManagementServiceHolder() {}
 
-    /**
-     * Get instance of ExtensionManagementServiceHolder.
-     *
-     * @return ExtensionManagementServiceHolder.
-     */
-    public static ExtensionManagementServiceHolder getInstance() {
+    private static class ExtensionManagerHolder {
 
-        return instance;
+        static final ExtensionManager SERVICE = (ExtensionManager) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(ExtensionManager.class, null);
     }
 
     /**
      * Get ExtensionManager osgi service.
      *
-     * @return ApplicationManagementService
-     */
-    public ExtensionManager getExtensionManager() {
-
-        return ExtensionManagementServiceHolder.getInstance().extensionManager;
-    }
-
-    /**
-     * Set ExtensionManager osgi service.
-     *
-     * @param extensionManager ExtensionManager.
+     * @return ExtensionManager
      */
-    public void setExtensionManager(ExtensionManager extensionManager) {
+    public static ExtensionManager getExtensionManager() {
 
-        ExtensionManagementServiceHolder.getInstance().extensionManager = extensionManager;
+        return ExtensionManagerHolder.SERVICE;
     }
 }
diff --git a/...entity/api/server/extension/management/common/factory/ExtensionMgtOSGIServiceFactory.java b/...entity/api/server/extension/management/common/factory/ExtensionMgtOSGIServiceFactory.java
diff --git a/.../wso2/carbon/identity/api/server/extension/management/common/utils/ExtensionMgtUtils.java b/.../wso2/carbon/identity/api/server/extension/management/common/utils/ExtensionMgtUtils.java
@@ -100,7 +100,7 @@ private static ErrorResponse.Builder getErrorBuilder(ExtensionMgtConstants.Error
      */
     public static void validateExtensionType(String extensionType) {
 
-        if (!ArrayUtils.contains(ExtensionManagementServiceHolder.getInstance().getExtensionManager()
+        if (!ArrayUtils.contains(ExtensionManagementServiceHolder.getExtensionManager()
                 .getExtensionTypes(), extensionType)) {
             throw handleClientException(Response.Status.BAD_REQUEST, ExtensionMgtConstants.ErrorMessage
                     .ERROR_CODE_INVALID_EXTENSION_TYPE, extensionType);

diff --git a/....extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml b/....extension.management/org.wso2.carbon.identity.api.server.extension.management.v1/pom.xml
@@ -103,11 +103,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/...c/gen/java/org/wso2/carbon/identity/api/server/extension/management/v1/ExtensionsApi.java b/...c/gen/java/org/wso2/carbon/identity/api/server/extension/management/v1/ExtensionsApi.java
@@ -18,12 +18,12 @@
 
 package org.wso2.carbon.identity.api.server.extension.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.extension.management.v1.factories.ExtensionsApiServiceFactory;
 import org.wso2.carbon.identity.api.server.extension.management.v1.model.Error;
 import org.wso2.carbon.identity.api.server.extension.management.v1.model.ExtensionListItem;
 import org.wso2.carbon.identity.api.server.extension.management.v1.model.ExtensionResponseModel;
@@ -42,8 +42,12 @@
 
 public class ExtensionsApi  {
 
-    @Autowired
-    private ExtensionsApiService delegate;
+    private final ExtensionsApiService delegate;
+
+    public ExtensionsApi() {
+
+        this.delegate = ExtensionsApiServiceFactory.getExtensionsApi();
+    }
 
     @Valid
     @GET

diff --git a/...on/identity/api/server/extension/management/v1/factories/ExtensionsApiServiceFactory.java b/...on/identity/api/server/extension/management/v1/factories/ExtensionsApiServiceFactory.java
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.api.server.extension.management.v1.ExtensionsApiService;
 import org.wso2.carbon.identity.api.server.extension.management.v1.impl.ExtensionsApiServiceImpl;
 
+/**
+ * Extensions Api Service Factory.
+ */
 public class ExtensionsApiServiceFactory {
 
-   private final static ExtensionsApiService service = new ExtensionsApiServiceImpl();
+   private static final ExtensionsApiService SERVICE = new ExtensionsApiServiceImpl();
+
+   /**
+    * Get Extensions Api Service.
+    *
+    * @return ExtensionsApiService.
+    */
+   public static ExtensionsApiService getExtensionsApi() {
 
-   public static ExtensionsApiService getExtensionsApi()
-   {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/...so2/carbon/identity/api/server/extension/management/v1/impl/ExtensionsApiServiceImpl.java b/...so2/carbon/identity/api/server/extension/management/v1/impl/ExtensionsApiServiceImpl.java
@@ -48,7 +48,7 @@ public class ExtensionsApiServiceImpl implements ExtensionsApiService {
     @Override
     public Response listExtensions() {
 
-        List<ExtensionInfo> extensionInfoList = ExtensionManagementServiceHolder.getInstance().getExtensionManager()
+        List<ExtensionInfo> extensionInfoList = ExtensionManagementServiceHolder.getExtensionManager()
                 .getExtensions();
         return Response.ok().entity(extensionInfoList.stream().map(new
                 ExtensionListItemBuilder()).collect(Collectors.toList())).build();
@@ -66,7 +66,7 @@ public Response listExtensionsByType(String extensionType) {
         // TODO: Add pagination support.
         validateExtensionType(extensionType);
         try {
-            List<ExtensionInfo> extensionInfoList = ExtensionManagementServiceHolder.getInstance().getExtensionManager()
+            List<ExtensionInfo> extensionInfoList = ExtensionManagementServiceHolder.getExtensionManager()
                     .getExtensionsByType(extensionType);
             return Response.ok().entity(extensionInfoList.stream().map(new
                     ExtensionListItemBuilder()).collect(Collectors.toList())).build();
@@ -88,7 +88,7 @@ public Response getExtensionInfoById(String extensionType, String extensionId) {
 
         validateExtensionType(extensionType);
         try {
-            ExtensionInfo extensionInfo = ExtensionManagementServiceHolder.getInstance().getExtensionManager()
+            ExtensionInfo extensionInfo = ExtensionManagementServiceHolder.getExtensionManager()
                     .getExtensionByTypeAndId(extensionType, extensionId);
             if (extensionInfo == null) {
                 throw ExtensionMgtUtils.handleClientException(Response.Status.NOT_FOUND,
@@ -113,7 +113,7 @@ public Response getTemplateById(String extensionType, String extensionId) {
 
         validateExtensionType(extensionType);
         try {
-            JSONObject template = ExtensionManagementServiceHolder.getInstance().getExtensionManager()
+            JSONObject template = ExtensionManagementServiceHolder.getExtensionManager()
                     .getExtensionTemplate(extensionType, extensionId);
             if (template == null) {
                 throw ExtensionMgtUtils.handleClientException(Response.Status.NOT_FOUND,
@@ -138,7 +138,7 @@ public Response getMetadataById(String extensionType, String extensionId) {
 
         validateExtensionType(extensionType);
         try {
-            JSONObject metadata = ExtensionManagementServiceHolder.getInstance().getExtensionManager()
+            JSONObject metadata = ExtensionManagementServiceHolder.getExtensionManager()
                     .getExtensionMetadata(extensionType, extensionId);
             if (metadata == null) {
                 throw ExtensionMgtUtils.handleClientException(Response.Status.NOT_FOUND,

diff --git a/...r.extension.management.v1/src/main/resources/META-INF/cxf/extension-mgt-server-v1-cxf.xml b/...r.extension.management.v1/src/main/resources/META-INF/cxf/extension-mgt-server-v1-cxf.xml