From e3d16e1fd2147c38f91bd768db7fb6733bc9e1e4 Mon Sep 17 00:00:00 2001
From: NipuniBhagya <nipunib@wso2.com>
Date: Fri, 11 Oct 2024 13:59:55 +0530
Subject: [PATCH 1/2] Remove Spring dependencies in the notification sender API

---
 .../pom.xml                                   |  9 +--
 .../NotificationSenderServiceHolder.java      | 26 ++++-----
 ...erManagementServiceOSGiServiceFactory.java | 57 -------------------
 .../pom.xml                                   |  9 +--
 .../sender/v1/NotificationSendersApi.java     | 40 +++++++------
 .../NotificationSendersApiServiceFactory.java | 41 +++++++------
 .../NotificationSenderManagementService.java  | 41 +++++++------
 ...icationSenderManagementServiceFactory.java | 52 +++++++++++++++++
 .../NotificationSendersApiServiceImpl.java    | 18 ++++--
 .../cxf/notification-sender-server-v1-cxf.xml | 27 ---------
 10 files changed, 147 insertions(+), 173 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/common/factory/NotificationSenderManagementServiceOSGiServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/factories/NotificationSenderManagementServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/resources/META-INF/cxf/notification-sender-server-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
index 4106595ce2..97c782d2d4 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.org).
   ~
-  ~ 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
@@ -47,11 +47,6 @@
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.configuration.mgt.core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.wso2.carbon.analytics-common</groupId>
             <artifactId>org.wso2.carbon.event.publisher.core</artifactId>
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/common/NotificationSenderServiceHolder.java b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/common/NotificationSenderServiceHolder.java
index 2363ffada8..0feb6c2f74 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/common/NotificationSenderServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/common/NotificationSenderServiceHolder.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-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.server.notification.sender.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.notification.sender.tenant.config.NotificationSenderManagementService;
 
 /**
@@ -25,7 +26,13 @@
  */
 public class NotificationSenderServiceHolder {
 
-    private static NotificationSenderManagementService notificationSenderManagementService;
+    private NotificationSenderServiceHolder() {}
+
+    private static class NotificationSenderManagementServiceHolder {
+        static final NotificationSenderManagementService SERVICE =
+                (NotificationSenderManagementService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(NotificationSenderManagementService.class, null);
+    }
 
     /**
      * Get Notification Sender Manager OSGi service.
@@ -34,17 +41,6 @@ public class NotificationSenderServiceHolder {
      */
     public static NotificationSenderManagementService getNotificationSenderManagementService() {
 
-        return notificationSenderManagementService;
-    }
-
-    /**
-     * Set Notification Sender Manager OSGi service.
-     *
-     * @param notificationSenderConfigManager Configuration Manager.
-     */
-    public static void setNotificationSenderManagementService(NotificationSenderManagementService
-                                                                      notificationSenderConfigManager) {
-
-        NotificationSenderServiceHolder.notificationSenderManagementService = notificationSenderConfigManager;
+        return NotificationSenderManagementServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/common/factory/NotificationSenderManagementServiceOSGiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/common/factory/NotificationSenderManagementServiceOSGiServiceFactory.java
deleted file mode 100644
index 002112257e..0000000000
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.common/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/common/factory/NotificationSenderManagementServiceOSGiServiceFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2020, 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.server.notification.sender.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.notification.sender.tenant.config.NotificationSenderManagementService;
-
-/**
- * Factory Beans serve as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the ConfigurationManager type of object inside the container.
- */
-public class NotificationSenderManagementServiceOSGiServiceFactory extends
-        AbstractFactoryBean<NotificationSenderManagementService> {
-
-    private NotificationSenderManagementService notificationSenderManagementService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected NotificationSenderManagementService createInstance() throws Exception {
-
-        if (this.notificationSenderManagementService == null) {
-            NotificationSenderManagementService taskOperationService =
-                    (NotificationSenderManagementService) PrivilegedCarbonContext
-                            .getThreadLocalCarbonContext()
-                            .getOSGiService(NotificationSenderManagementService.class, null);
-
-            if (taskOperationService != null) {
-                this.notificationSenderManagementService = taskOperationService;
-            } else {
-                throw new Exception("Unable to retrieve ConfigurationManager service.");
-            }
-        }
-        return this.notificationSenderManagementService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
index 1241ce1019..2be42020a2 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/pom.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ Copyright (c) 2020-2024, WSO2 LLC. (http://www.wso2.org).
   ~
-  ~ 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
@@ -105,11 +105,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.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/gen/java/org/wso2/carbon/identity/api/server/notification/sender/v1/NotificationSendersApi.java b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/gen/java/org/wso2/carbon/identity/api/server/notification/sender/v1/NotificationSendersApi.java
index a38a9fbc13..cc2d677adc 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/gen/java/org/wso2/carbon/identity/api/server/notification/sender/v1/NotificationSendersApi.java
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/gen/java/org/wso2/carbon/identity/api/server/notification/sender/v1/NotificationSendersApi.java
@@ -1,27 +1,29 @@
 /*
-* Copyright (c) 2020, 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) 2020-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.notification.sender.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.notification.sender.v1.factories.NotificationSendersApiServiceFactory;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.model.EmailSender;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.model.EmailSenderAdd;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.model.EmailSenderUpdateRequest;
@@ -29,7 +31,6 @@
 import org.wso2.carbon.identity.api.server.notification.sender.v1.model.SMSSender;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.model.SMSSenderAdd;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.model.SMSSenderUpdateRequest;
-import org.wso2.carbon.identity.api.server.notification.sender.v1.NotificationSendersApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -43,8 +44,11 @@
 
 public class NotificationSendersApi  {
 
-    @Autowired
-    private NotificationSendersApiService delegate;
+    private final NotificationSendersApiService delegate;
+
+    public NotificationSendersApi() {
+        this.delegate = NotificationSendersApiServiceFactory.getNotificationSendersApi();
+    }
 
     @Valid
     @POST
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/gen/java/org/wso2/carbon/identity/api/server/notification/sender/v1/factories/NotificationSendersApiServiceFactory.java b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/gen/java/org/wso2/carbon/identity/api/server/notification/sender/v1/factories/NotificationSendersApiServiceFactory.java
index ea7f7300d6..248e0fb911 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/gen/java/org/wso2/carbon/identity/api/server/notification/sender/v1/factories/NotificationSendersApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/gen/java/org/wso2/carbon/identity/api/server/notification/sender/v1/factories/NotificationSendersApiServiceFactory.java
@@ -1,30 +1,39 @@
 /*
-* Copyright (c) 2020, 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) 2020-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.notification.sender.v1.factories;
 
 import org.wso2.carbon.identity.api.server.notification.sender.v1.NotificationSendersApiService;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.impl.NotificationSendersApiServiceImpl;
 
+/**
+ * Factory class for NotificationSendersApiService.
+ */
 public class NotificationSendersApiServiceFactory {
 
-   private final static NotificationSendersApiService service = new NotificationSendersApiServiceImpl();
+   private final static NotificationSendersApiService SERVICE = new NotificationSendersApiServiceImpl();
 
+   /**
+    * Get NotificationSendersApiService service
+    * @return NotificationSendersApiService service
+    */
    public static NotificationSendersApiService getNotificationSendersApi()
    {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/core/NotificationSenderManagementService.java b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/core/NotificationSenderManagementService.java
index 0a96d2f489..1840a1050a 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/core/NotificationSenderManagementService.java
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/core/NotificationSenderManagementService.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-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
@@ -22,7 +22,6 @@
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.api.server.common.error.APIError;
 import org.wso2.carbon.identity.api.server.common.error.ErrorResponse;
-import org.wso2.carbon.identity.api.server.notification.sender.common.NotificationSenderServiceHolder;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.model.EmailSender;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.model.EmailSenderAdd;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.model.EmailSenderUpdateRequest;
@@ -49,8 +48,17 @@
  */
 public class NotificationSenderManagementService {
 
+    private final org.wso2.carbon.identity.notification.sender.tenant.config.NotificationSenderManagementService
+            notificationSenderManagementService;
     private static final Log log = LogFactory.getLog(NotificationSenderManagementService.class);
 
+    public NotificationSenderManagementService(
+            org.wso2.carbon.identity.notification.sender.tenant.config.NotificationSenderManagementService
+                                                       notificationSenderManagementService) {
+
+        this.notificationSenderManagementService = notificationSenderManagementService;
+    }
+
     /**
      * Create an email sender resource with a resource file.
      *
@@ -61,8 +69,7 @@ public EmailSender addEmailSender(EmailSenderAdd emailSenderAdd) {
 
         EmailSenderDTO dto = buildEmailSenderDTO(emailSenderAdd);
         try {
-            EmailSenderDTO emailSenderDTO = NotificationSenderServiceHolder.getNotificationSenderManagementService()
-                    .addEmailSender(dto);
+            EmailSenderDTO emailSenderDTO = notificationSenderManagementService.addEmailSender(dto);
             return buildEmailSenderFromDTO(emailSenderDTO);
         } catch (NotificationSenderManagementException e) {
             throw handleException(e);
@@ -79,8 +86,7 @@ public SMSSender addSMSSender(SMSSenderAdd smsSenderAdd) {
 
         SMSSenderDTO dto = buildSMSSenderDTO(smsSenderAdd);
         try {
-            SMSSenderDTO smsSenderDTO = NotificationSenderServiceHolder.getNotificationSenderManagementService()
-                    .addSMSSender(dto);
+            SMSSenderDTO smsSenderDTO = notificationSenderManagementService.addSMSSender(dto);
             return buildSMSSenderFromDTO(smsSenderDTO);
         } catch (NotificationSenderManagementException e) {
             throw handleException(e);
@@ -95,8 +101,7 @@ public SMSSender addSMSSender(SMSSenderAdd smsSenderAdd) {
     public void deleteNotificationSender(String notificationSenderName) {
 
         try {
-            NotificationSenderServiceHolder.getNotificationSenderManagementService()
-                    .deleteNotificationSender(notificationSenderName);
+            notificationSenderManagementService.deleteNotificationSender(notificationSenderName);
         } catch (NotificationSenderManagementException e) {
                 throw handleException(e);
         }
@@ -111,8 +116,7 @@ public void deleteNotificationSender(String notificationSenderName) {
     public EmailSender getEmailSender(String senderName) {
 
         try {
-            EmailSenderDTO emailSenderDTO = NotificationSenderServiceHolder.getNotificationSenderManagementService()
-                    .getEmailSender(senderName);
+            EmailSenderDTO emailSenderDTO = notificationSenderManagementService.getEmailSender(senderName);
             return buildEmailSenderFromDTO(emailSenderDTO);
         } catch (NotificationSenderManagementException e) {
             throw handleException(e);
@@ -128,8 +132,7 @@ public EmailSender getEmailSender(String senderName) {
     public SMSSender getSMSSender(String senderName) {
 
         try {
-            SMSSenderDTO smsSenderDTO = NotificationSenderServiceHolder.getNotificationSenderManagementService()
-                    .getSMSSender(senderName, false);
+            SMSSenderDTO smsSenderDTO = notificationSenderManagementService.getSMSSender(senderName, false);
             return buildSMSSenderFromDTO(smsSenderDTO);
         } catch (NotificationSenderManagementException e) {
             throw handleException(e);
@@ -144,8 +147,7 @@ public SMSSender getSMSSender(String senderName) {
     public List<EmailSender> getEmailSenders() {
 
         try {
-            List<EmailSenderDTO> emailSenders = NotificationSenderServiceHolder.getNotificationSenderManagementService()
-                    .getEmailSenders();
+            List<EmailSenderDTO> emailSenders = notificationSenderManagementService.getEmailSenders();
             return emailSenders.stream().map(this::buildEmailSenderFromDTO).collect(Collectors.toList());
         } catch (NotificationSenderManagementException e) {
             throw handleException(e);
@@ -160,8 +162,7 @@ public List<EmailSender> getEmailSenders() {
     public List<SMSSender> getSMSSenders() {
 
         try {
-            List<SMSSenderDTO> smsSenders = NotificationSenderServiceHolder.getNotificationSenderManagementService()
-                    .getSMSSenders(false);
+            List<SMSSenderDTO> smsSenders = notificationSenderManagementService.getSMSSenders(false);
             return smsSenders.stream().map(this::buildSMSSenderFromDTO).collect(Collectors.toList());
         } catch (NotificationSenderManagementException e) {
             throw handleException(e);
@@ -179,8 +180,7 @@ public EmailSender updateEmailSender(String senderName, EmailSenderUpdateRequest
 
         EmailSenderDTO dto = buildEmailSenderDTO(senderName, emailSenderUpdateRequest);
         try {
-            EmailSenderDTO emailSenderDTO = NotificationSenderServiceHolder.getNotificationSenderManagementService()
-                    .updateEmailSender(dto);
+            EmailSenderDTO emailSenderDTO = notificationSenderManagementService.updateEmailSender(dto);
             return buildEmailSenderFromDTO(emailSenderDTO);
         } catch (NotificationSenderManagementException e) {
             throw handleException(e);
@@ -198,8 +198,7 @@ public SMSSender updateSMSSender(String senderName, SMSSenderUpdateRequest smsSe
 
         SMSSenderDTO dto = buildSMSSenderDTO(senderName, smsSenderUpdateRequest);
         try {
-            SMSSenderDTO smsSenderDTO = NotificationSenderServiceHolder.getNotificationSenderManagementService()
-                    .updateSMSSender(dto);
+            SMSSenderDTO smsSenderDTO = notificationSenderManagementService.updateSMSSender(dto);
             return buildSMSSenderFromDTO(smsSenderDTO);
         } catch (NotificationSenderManagementException e) {
             throw handleException(e);
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/factories/NotificationSenderManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/factories/NotificationSenderManagementServiceFactory.java
new file mode 100644
index 0000000000..619548fc36
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/factories/NotificationSenderManagementServiceFactory.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ *
+ * WSO2 LLC. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.identity.api.server.notification.sender.v1.factories;
+
+import org.wso2.carbon.identity.api.server.notification.sender.common.NotificationSenderServiceHolder;
+import org.wso2.carbon.identity.api.server.notification.sender.v1.core.NotificationSenderManagementService;
+
+/**
+ * Factory class for NotificationSenderManagementService.
+ */
+public class NotificationSenderManagementServiceFactory {
+
+    private static final NotificationSenderManagementService SERVICE;
+
+    static {
+        org.wso2.carbon.identity.notification.sender.tenant.config.NotificationSenderManagementService
+                notificationSenderManagementService = NotificationSenderServiceHolder
+                        .getNotificationSenderManagementService();
+
+        if (notificationSenderManagementService == null) {
+            throw new IllegalStateException("NotificationSenderManagementService is not available from OSGi context.");
+        }
+
+        SERVICE = new NotificationSenderManagementService(notificationSenderManagementService);
+    }
+
+    /**
+     * Get NotificationSenderManagementService service.
+     *
+     * @return NotificationSenderManagementService service
+     */
+    public static NotificationSenderManagementService getNotificationSenderManagementService() {
+        return SERVICE;
+    }
+
+}
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/impl/NotificationSendersApiServiceImpl.java b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/impl/NotificationSendersApiServiceImpl.java
index ce2dac4692..0090e39ae0 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/impl/NotificationSendersApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/impl/NotificationSendersApiServiceImpl.java
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2020-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
@@ -19,7 +19,6 @@
 package org.wso2.carbon.identity.api.server.notification.sender.v1.impl;
 
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.base.MultitenantConstants;
 
 import org.wso2.carbon.identity.api.server.common.ContextLoader;
@@ -27,6 +26,7 @@
 import org.wso2.carbon.identity.api.server.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.NotificationSendersApiService;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.core.NotificationSenderManagementService;
+import org.wso2.carbon.identity.api.server.notification.sender.v1.factories.NotificationSenderManagementServiceFactory;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.model.EmailSender;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.model.EmailSenderAdd;
 import org.wso2.carbon.identity.api.server.notification.sender.v1.model.EmailSenderUpdateRequest;
@@ -54,8 +54,16 @@
  */
 public class NotificationSendersApiServiceImpl implements NotificationSendersApiService {
 
-    @Autowired
-    private NotificationSenderManagementService notificationSenderManagementService;
+    private final NotificationSenderManagementService notificationSenderManagementService;
+
+    public NotificationSendersApiServiceImpl() {
+        try {
+            this.notificationSenderManagementService = NotificationSenderManagementServiceFactory
+                    .getNotificationSenderManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating notification sender service.", e);
+        }
+    }
 
     @Override
     public Response createEmailSender(EmailSenderAdd emailSenderAdd) {
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/resources/META-INF/cxf/notification-sender-server-v1-cxf.xml b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/resources/META-INF/cxf/notification-sender-server-v1-cxf.xml
deleted file mode 100644
index 8df5db93ff..0000000000
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/resources/META-INF/cxf/notification-sender-server-v1-cxf.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-  ~ Copyright (c) 2020, 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="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.notification.sender.v1.core.NotificationSenderManagementService"/>
-    <bean class="org.wso2.carbon.identity.api.server.notification.sender.v1.impl.NotificationSendersApiServiceImpl"/>
-    <bean id="notificationSenderManagementServiceFactoryBean" class="org.wso2.carbon.identity.api.server.notification.sender.common.factory.NotificationSenderManagementServiceOSGiServiceFactory"/>
-    <bean id="notificationSenderServiceImplDataHolderBean" class="org.wso2.carbon.identity.api.server.notification.sender.common.NotificationSenderServiceHolder">
-        <property name="notificationSenderManagementService" ref="notificationSenderManagementServiceFactoryBean"/>
-    </bean>
-</beans>

From f652c5fca731852108cc56d17e98c9e9188373c6 Mon Sep 17 00:00:00 2001
From: NipuniBhagya <nipunib@wso2.com>
Date: Tue, 15 Oct 2024 19:17:47 +0530
Subject: [PATCH 2/2] Resolve PR comments

---
 .../server/notification/sender/v1/NotificationSendersApi.java    | 1 +
 .../v1/factories/NotificationSenderManagementServiceFactory.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/gen/java/org/wso2/carbon/identity/api/server/notification/sender/v1/NotificationSendersApi.java b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/gen/java/org/wso2/carbon/identity/api/server/notification/sender/v1/NotificationSendersApi.java
index cc2d677adc..c0c6b48609 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/gen/java/org/wso2/carbon/identity/api/server/notification/sender/v1/NotificationSendersApi.java
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/gen/java/org/wso2/carbon/identity/api/server/notification/sender/v1/NotificationSendersApi.java
@@ -47,6 +47,7 @@ public class NotificationSendersApi  {
     private final NotificationSendersApiService delegate;
 
     public NotificationSendersApi() {
+
         this.delegate = NotificationSendersApiServiceFactory.getNotificationSendersApi();
     }
 
diff --git a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/factories/NotificationSenderManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/factories/NotificationSenderManagementServiceFactory.java
index 619548fc36..8aafbf9733 100644
--- a/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/factories/NotificationSenderManagementServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.server.notification.sender/org.wso2.carbon.identity.api.server.notification.sender.v1/src/main/java/org/wso2/carbon/identity/api/server/notification/sender/v1/factories/NotificationSenderManagementServiceFactory.java
@@ -46,6 +46,7 @@ public class NotificationSenderManagementServiceFactory {
      * @return NotificationSenderManagementService service
      */
     public static NotificationSenderManagementService getNotificationSenderManagementService() {
+
         return SERVICE;
     }