From 8ea711537bf6ab20fc967442c82ac4b67476b261 Mon Sep 17 00:00:00 2001
From: Piumini Kaveesha Ranasinghe
 <62582918+KaveeshaPiumini@users.noreply.github.com>
Date: Tue, 10 Dec 2024 09:45:12 +0530
Subject: [PATCH] [Spring Cleanup] Remove Spring dependencies in the Me API
 (#206)

---
 .../pom.xml                                   |  9 +--
 .../common/ApplicationServiceHolder.java      | 46 +++++++--------
 .../common/factory/OSGIServiceFactory.java    | 54 -----------------
 ...anizationManagementOSGIServiceFactory.java | 55 -----------------
 .../pom.xml                                   |  9 +--
 .../rest/api/user/application/v1/MeApi.java   | 41 +++++++------
 .../v1/factories/MeApiServiceFactory.java     | 42 ++++++++-----
 .../v1/core/ApplicationService.java           | 29 +++++----
 .../factories/ApplicationServiceFactory.java  | 59 +++++++++++++++++++
 .../application/v1/impl/MeApiServiceImpl.java | 31 ++++++----
 .../META-INF/cxf/application-user-v1-cxf.xml  | 33 -----------
 11 files changed, 171 insertions(+), 237 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OrganizationManagementOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/ApplicationServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/resources/META-INF/cxf/application-user-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/pom.xml b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/pom.xml
index 9dd2d72b8..83f1e12ac 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ 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
@@ -28,11 +28,6 @@
     <artifactId>org.wso2.carbon.identity.api.user.application.common</artifactId>
 
     <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.application.mgt</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/ApplicationServiceHolder.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/ApplicationServiceHolder.java
index 421900634..e19a22595 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/ApplicationServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/ApplicationServiceHolder.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * 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
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.api.user.application.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.application.mgt.DiscoverableApplicationManager;
 import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
 
@@ -26,28 +27,30 @@
  */
 public class ApplicationServiceHolder {
 
-    private static OrgApplicationManager orgApplicationManager;
-    private static DiscoverableApplicationManager discoverableApplicationManager;
+    private ApplicationServiceHolder () {}
 
-    /**
-     * Get application management service.
-     *
-     * @return ApplicationManagementService
-     */
-    public static DiscoverableApplicationManager getDiscoverableApplicationManager() {
+    private static class OrgApplicationManagerServiceHolder {
+
+        static final OrgApplicationManager SERVICE = (OrgApplicationManager)
+                PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(OrgApplicationManager.class, null);
+    }
+
+    private static class DiscoverableApplicationManagerServiceHolder {
 
-        return discoverableApplicationManager;
+        static final DiscoverableApplicationManager SERVICE = (DiscoverableApplicationManager)
+                PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(DiscoverableApplicationManager.class, null);
     }
 
     /**
-     * Set application management service.
+     * Get application management service.
      *
-     * @param discoverableApplicationManager
+     * @return ApplicationManagementService
      */
-    public static void setDiscoverableApplicationManager(DiscoverableApplicationManager
-                                                                 discoverableApplicationManager) {
+    public static DiscoverableApplicationManager getDiscoverableApplicationManager() {
 
-        ApplicationServiceHolder.discoverableApplicationManager = discoverableApplicationManager;
+        return DiscoverableApplicationManagerServiceHolder.SERVICE;
     }
 
     /**
@@ -57,16 +60,7 @@ public static void setDiscoverableApplicationManager(DiscoverableApplicationMana
      */
     public static OrgApplicationManager getOrgApplicationManager() {
 
-        return orgApplicationManager;
+        return OrgApplicationManagerServiceHolder.SERVICE;
     }
 
-    /**
-     * Set organization application management service.
-     *
-     * @param orgApplicationManager
-     */
-    public static void setOrgApplicationManager(OrgApplicationManager orgApplicationManager) {
-
-        ApplicationServiceHolder.orgApplicationManager = orgApplicationManager;
-    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OSGIServiceFactory.java
deleted file mode 100644
index 128814e71..000000000
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OSGIServiceFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. 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.user.application.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.application.mgt.DiscoverableApplicationManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the ApplicationManagementService type of object inside the container.
- */
-public class OSGIServiceFactory extends AbstractFactoryBean<DiscoverableApplicationManager> {
-
-    private DiscoverableApplicationManager discoverableApplicationManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return null;
-    }
-
-    @Override
-    protected DiscoverableApplicationManager createInstance() throws Exception {
-
-        if (this.discoverableApplicationManager == null) {
-            DiscoverableApplicationManager applicationManagementService = (DiscoverableApplicationManager)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(DiscoverableApplicationManager.class, null);
-            if (applicationManagementService != null) {
-                this.discoverableApplicationManager = applicationManagementService;
-            } else {
-                throw new Exception("Unable to retrieve DiscoverableApplicationManager service.");
-            }
-        }
-        return this.discoverableApplicationManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OrganizationManagementOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OrganizationManagementOSGIServiceFactory.java
deleted file mode 100644
index 8129c35ab..000000000
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.api.user.application.common/src/main/java/org/wso2/carbon/identity/api/user/application/common/factory/OrganizationManagementOSGIServiceFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2024, WSO2 LLC. (https://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.user.application.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the OrganizationManagementOSGIServiceFactory class and used to get OrganizationManagementOSGIService OSGI
- * service.
- */
-public class OrganizationManagementOSGIServiceFactory extends AbstractFactoryBean<OrgApplicationManager> {
-
-    private OrgApplicationManager orgApplicationManager;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return null;
-    }
-
-    @Override
-    protected OrgApplicationManager createInstance() throws Exception {
-
-        if (this.orgApplicationManager == null) {
-            OrgApplicationManager applicationManagementService = (OrgApplicationManager)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(OrgApplicationManager.class, null);
-            if (applicationManagementService != null) {
-                this.orgApplicationManager = applicationManagementService;
-            } else {
-                throw new Exception("Unable to retrieve OrgApplicationManager service.");
-            }
-        }
-        return this.orgApplicationManager;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/pom.xml
index cbf7ae4c3..ebdd4d5ff 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
   ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ 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
@@ -110,11 +110,6 @@
             <artifactId>cxf-rt-rs-service-description</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/MeApi.java
index ea51bbaab..ea7324399 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/MeApi.java
@@ -1,26 +1,27 @@
 /*
-* Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed 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.
-*/
+ * Copyright (c) 2019-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.rest.api.user.application.v1;
 
-import org.springframework.beans.factory.annotation.Autowired;
+import org.wso2.carbon.identity.rest.api.user.application.v1.factories.MeApiServiceFactory;
 import org.wso2.carbon.identity.rest.api.user.application.v1.model.ApplicationListResponse;
 import org.wso2.carbon.identity.rest.api.user.application.v1.model.ApplicationResponse;
 import org.wso2.carbon.identity.rest.api.user.application.v1.model.Error;
-import org.wso2.carbon.identity.rest.api.user.application.v1.MeApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -34,8 +35,12 @@
 
 public class MeApi  {
 
-    @Autowired
-    private MeApiService delegate;
+    private final MeApiService delegate;
+
+    public MeApi(){
+
+        this.delegate = MeApiServiceFactory.getMeApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/MeApiServiceFactory.java
index 97447af34..1cc877b45 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/MeApiServiceFactory.java
@@ -1,30 +1,40 @@
 /*
-* Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-*
-* Licensed 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.
-*/
+ * Copyright (c) 2019-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.rest.api.user.application.v1.factories;
 
 import org.wso2.carbon.identity.rest.api.user.application.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.application.v1.impl.MeApiServiceImpl;
 
+/**
+ * Factory class for MeApiService.
+ */
 public class MeApiServiceFactory {
 
-   private final static MeApiService service = new MeApiServiceImpl();
+   private final static MeApiService SERVICE = new MeApiServiceImpl();
 
+   /**
+    * Get MeApiService
+    *
+    * @return MeApiService
+    */
    public static MeApiService getMeApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/core/ApplicationService.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/core/ApplicationService.java
index 9ac7b0231..d204fd8fe 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/core/ApplicationService.java
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/core/ApplicationService.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * WSO2 Inc. licenses this file to you under the Apache License,
+ * 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
@@ -23,17 +23,18 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.api.user.application.common.ApplicationServiceConstants;
-import org.wso2.carbon.identity.api.user.application.common.ApplicationServiceHolder;
 import org.wso2.carbon.identity.api.user.common.ContextLoader;
 import org.wso2.carbon.identity.api.user.common.error.APIError;
 import org.wso2.carbon.identity.api.user.common.error.ErrorResponse;
 import org.wso2.carbon.identity.application.common.IdentityApplicationManagementException;
 import org.wso2.carbon.identity.application.common.model.ApplicationBasicInfo;
+import org.wso2.carbon.identity.application.mgt.DiscoverableApplicationManager;
 import org.wso2.carbon.identity.base.IdentityException;
 import org.wso2.carbon.identity.core.model.ExpressionNode;
 import org.wso2.carbon.identity.core.model.FilterTreeBuilder;
 import org.wso2.carbon.identity.core.model.Node;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
+import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
 import org.wso2.carbon.identity.organization.management.service.exception.OrganizationManagementException;
 import org.wso2.carbon.identity.organization.management.service.util.OrganizationManagementUtil;
 import org.wso2.carbon.identity.rest.api.user.application.v1.core.function.ApplicationBasicInfoToApiModel;
@@ -59,11 +60,21 @@
  */
 public class ApplicationService {
 
+    private final OrgApplicationManager orgApplicationManager;
+    private final DiscoverableApplicationManager discoverableApplicationManager;
+
     private static final String APPLICATIONS_PAGINATION_LINK_FORMAT = "/v1/me/applications?offset=%d&limit=%d";
     private static final Log LOG = LogFactory.getLog(ApplicationService.class);
     private static final String PAGE_LINK_REL_NEXT = "next";
     private static final String PAGE_LINK_REL_PREVIOUS = "previous";
 
+    public ApplicationService (OrgApplicationManager orgApplicationManager, DiscoverableApplicationManager
+            discoverableApplicationManager) {
+
+        this.orgApplicationManager = orgApplicationManager;
+        this.discoverableApplicationManager = discoverableApplicationManager;
+    }
+
     /**
      * Get application from application ID.
      *
@@ -75,7 +86,7 @@ public ApplicationResponse getApplication(String applicationId) {
         try {
 
             String tenantDomain = IdentityTenantUtil.resolveTenantDomain();
-            ApplicationBasicInfo applicationBasicInfo = ApplicationServiceHolder.getDiscoverableApplicationManager()
+            ApplicationBasicInfo applicationBasicInfo = discoverableApplicationManager
                     .getDiscoverableApplicationBasicInfoByResourceId(applicationId, tenantDomain);
             if (applicationBasicInfo == null) {
                 throw handleNotFoundError(applicationId, ApplicationServiceConstants.ErrorMessage
@@ -130,10 +141,10 @@ private List<ApplicationBasicInfo> getDiscoverableApplicationBasicInfo(int limit
 
         try {
             if (OrganizationManagementUtil.isOrganization(tenantDomain)) {
-                return ApplicationServiceHolder.getOrgApplicationManager().getDiscoverableSharedApplicationBasicInfo(
+                return orgApplicationManager.getDiscoverableSharedApplicationBasicInfo(
                         limit, offset, filter, sortOrder, sortBy, tenantDomain);
             }
-            return ApplicationServiceHolder.getDiscoverableApplicationManager().getDiscoverableApplicationBasicInfo(
+            return discoverableApplicationManager.getDiscoverableApplicationBasicInfo(
                     limit, offset, filter, sortOrder, sortBy, tenantDomain);
         } catch (OrganizationManagementException e) {
             throw new IdentityApplicationManagementException(e.getMessage(), e);
@@ -145,11 +156,9 @@ private int getCountOfDiscoverableApplications(String filter, String tenantDomai
 
         try {
             if (OrganizationManagementUtil.isOrganization(tenantDomain)) {
-                return ApplicationServiceHolder.getOrgApplicationManager()
-                        .getCountOfDiscoverableSharedApplications(filter, tenantDomain);
+                return orgApplicationManager.getCountOfDiscoverableSharedApplications(filter, tenantDomain);
             }
-            return ApplicationServiceHolder.getDiscoverableApplicationManager()
-                    .getCountOfDiscoverableApplications(filter, tenantDomain);
+            return discoverableApplicationManager.getCountOfDiscoverableApplications(filter, tenantDomain);
         } catch (OrganizationManagementException e) {
             throw new IdentityApplicationManagementException(e.getMessage(), e);
         }
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/ApplicationServiceFactory.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/ApplicationServiceFactory.java
new file mode 100644
index 000000000..c39207bf0
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/factories/ApplicationServiceFactory.java
@@ -0,0 +1,59 @@
+/*
+ * 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.rest.api.user.application.v1.factories;
+
+import org.wso2.carbon.identity.api.user.application.common.ApplicationServiceHolder;
+import org.wso2.carbon.identity.application.mgt.DiscoverableApplicationManager;
+import org.wso2.carbon.identity.organization.management.application.OrgApplicationManager;
+import org.wso2.carbon.identity.rest.api.user.application.v1.core.ApplicationService;
+
+/**
+ * Factory to return ApplicationService.
+ */
+public class ApplicationServiceFactory {
+
+    private static final ApplicationService SERVICE;
+
+    static {
+        OrgApplicationManager orgApplicationManager = ApplicationServiceHolder
+                .getOrgApplicationManager();
+        DiscoverableApplicationManager discoverableApplicationManager = ApplicationServiceHolder
+                .getDiscoverableApplicationManager();
+
+        if (orgApplicationManager == null) {
+            throw new IllegalStateException("OrgApplicationManager not available in the OSGi context.");
+        } else if (discoverableApplicationManager == null) {
+            throw new IllegalStateException("DiscoverableApplicationManager not available in the OSGi context.");
+        }
+
+        SERVICE = new ApplicationService(orgApplicationManager, discoverableApplicationManager);
+
+    }
+
+    /**
+     * Get ApplicationService instance.
+     *
+     * @return ApplicationService instance.
+     */
+    public static ApplicationService getApplicationService() {
+
+        return SERVICE;
+    }
+
+}
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/impl/MeApiServiceImpl.java
index 82380488d..211eecb0c 100644
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/application/v1/impl/MeApiServiceImpl.java
@@ -1,24 +1,26 @@
 /*
- * Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2019-2024, WSO2 LLC. (http://www.wso2.com).
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * 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.
+ * 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.rest.api.user.application.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.application.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.application.v1.core.ApplicationService;
+import org.wso2.carbon.identity.rest.api.user.application.v1.factories.ApplicationServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -27,8 +29,15 @@
  */
 public class MeApiServiceImpl implements MeApiService {
 
-    @Autowired
-    private ApplicationService applicationService;
+    private final ApplicationService applicationService;
+
+    public MeApiServiceImpl () {
+        try {
+            this.applicationService = ApplicationServiceFactory.getApplicationService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initializing ApplicationService.", e);
+        }
+    }
 
     @Override
     public Response getApplication(String applicationId) {
diff --git a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/resources/META-INF/cxf/application-user-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/resources/META-INF/cxf/application-user-v1-cxf.xml
deleted file mode 100644
index 675278ed0..000000000
--- a/components/org.wso2.carbon.identity.api.user.application/org.wso2.carbon.identity.rest.api.user.application.v1/src/main/resources/META-INF/cxf/application-user-v1-cxf.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2019, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. 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:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.springframework.org/schema/beans"
-       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.rest.api.user.application.v1.impl.MeApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.application.v1.core.ApplicationService"/>
-    <bean id="applicationHolderBean"
-          class="org.wso2.carbon.identity.api.user.application.common.ApplicationServiceHolder">
-        <property name="discoverableApplicationManager" ref="identityApplicationServiceFactoryBean"/>
-        <property name="orgApplicationManager" ref="organizationManagementServiceFactoryBean"/>
-    </bean>
-    <bean id="identityApplicationServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.application.common.factory.OSGIServiceFactory"/>
-    <bean id="organizationManagementServiceFactoryBean"
-            class="org.wso2.carbon.identity.api.user.application.common.factory.OrganizationManagementOSGIServiceFactory"/>
-</beans>