From 09c5da1e6f9e3fec0b49f7ac5f44562270f88b1a Mon Sep 17 00:00:00 2001
From: lashini <lashini@wso2.com>
Date: Fri, 24 Jan 2025 05:12:41 +0530
Subject: [PATCH 1/3] [Spring Cleanup] Remove Spring dependencies in permission
 management API

---
 .../pom.xml                                   |  7 +--
 .../common/PasswordExpiryServiceHolder.java   | 25 ++++-----
 ...swordIdentificationOSGIServiceFactory.java | 55 -------------------
 .../pom.xml                                   |  7 +--
 .../v1/PasswordExpiredUsersApi.java           | 16 +++---
 ...PasswordExpiredUsersApiServiceFactory.java | 16 ++++--
 ...swordExpiredUsersManagementApiService.java | 19 +++++--
 ...piredUsersManagementApiServiceFactory.java | 34 ++++++++++++
 .../PasswordExpiredUsersApiServiceImpl.java   | 15 ++++-
 .../expired-password-identification-cxf.xml   | 29 ----------
 10 files changed, 90 insertions(+), 133 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/common/factory/ExpiredPasswordIdentificationOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersManagementApiServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/resources/META-INF/cxf/expired-password-identification-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index b8e768be9f..0208593dce 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
   ~
   ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
@@ -57,11 +57,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.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/common/PasswordExpiryServiceHolder.java b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/common/PasswordExpiryServiceHolder.java
index 36a9f2e8fa..3a75f56c01 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/common/PasswordExpiryServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/common/PasswordExpiryServiceHolder.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.expired.password.identification.common;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.password.expiry.services.ExpiredPasswordIdentificationService;
 
 /**
@@ -25,7 +26,13 @@
  */
 public class PasswordExpiryServiceHolder {
 
-    private static ExpiredPasswordIdentificationService expiredPasswordIdentificationService;
+    private PasswordExpiryServiceHolder() {}
+
+    private static class ExpiredPasswordIdentificationServiceHolder {
+        static final ExpiredPasswordIdentificationService SERVICE =
+                (ExpiredPasswordIdentificationService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                        .getOSGiService(ExpiredPasswordIdentificationService.class, null);
+    }
 
     /**
      * Get ExpiredPasswordIdentificationService OSGi service.
@@ -33,18 +40,6 @@ public class PasswordExpiryServiceHolder {
      * @return ExpiredPassword identification Service.
      */
     public static ExpiredPasswordIdentificationService getExpiredPasswordIdentificationService() {
-
-        return expiredPasswordIdentificationService;
-    }
-
-    /**
-     * Set ExpiredPasswordIdentificationService OSGi service.
-     *
-     * @param expiredPasswordIdentificationService ExpiredPassword identification Service.
-     */
-    public static void setExpiredPasswordIdentificationService(
-            ExpiredPasswordIdentificationService expiredPasswordIdentificationService) {
-
-        PasswordExpiryServiceHolder.expiredPasswordIdentificationService = expiredPasswordIdentificationService;
+        return ExpiredPasswordIdentificationServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/common/factory/ExpiredPasswordIdentificationOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/common/factory/ExpiredPasswordIdentificationOSGIServiceFactory.java
deleted file mode 100644
index cfb865d5bd..0000000000
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/common/factory/ExpiredPasswordIdentificationOSGIServiceFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.api.expired.password.identification.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.password.expiry.services.ExpiredPasswordIdentificationService;
-
-/**
- * Factory Beans serve as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the ExpiredPasswordIdentificationService type of object inside the container.
- */
-public class ExpiredPasswordIdentificationOSGIServiceFactory
-        extends AbstractFactoryBean<ExpiredPasswordIdentificationService> {
-
-    private ExpiredPasswordIdentificationService expiredPasswordIdentificationService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected ExpiredPasswordIdentificationService createInstance() throws Exception {
-
-        if (this.expiredPasswordIdentificationService == null) {
-            ExpiredPasswordIdentificationService taskOperationService =
-                    (ExpiredPasswordIdentificationService) PrivilegedCarbonContext.
-                    getThreadLocalCarbonContext().getOSGiService(ExpiredPasswordIdentificationService.class, null);
-
-            if (taskOperationService == null) {
-                throw new Exception("Unable to retrieve expired password identification service.");
-            }
-            this.expiredPasswordIdentificationService = taskOperationService;
-        }
-        return this.expiredPasswordIdentificationService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index f36bca54da..ed3db9c005 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
   ~
   ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
@@ -107,11 +107,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.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/PasswordExpiredUsersApi.java b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/PasswordExpiredUsersApi.java
index 27cfdc1fd5..b99fd5f172 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/PasswordExpiredUsersApi.java
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/PasswordExpiredUsersApi.java
@@ -18,16 +18,10 @@
 
 package org.wso2.carbon.identity.api.expired.password.identification.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.expired.password.identification.v1.factories.PasswordExpiredUsersApiServiceFactory;
 import org.wso2.carbon.identity.api.expired.password.identification.v1.model.Error;
 import org.wso2.carbon.identity.api.expired.password.identification.v1.model.PasswordExpiredUser;
 import org.wso2.carbon.identity.api.expired.password.identification.v1.model.Unauthorized;
-import org.wso2.carbon.identity.api.expired.password.identification.v1.PasswordExpiredUsersApiService;
 
 import javax.validation.Valid;
 import javax.ws.rs.*;
@@ -41,8 +35,12 @@
 
 public class PasswordExpiredUsersApi  {
 
-    @Autowired
-    private PasswordExpiredUsersApiService delegate;
+    private final PasswordExpiredUsersApiService delegate;
+
+    public PasswordExpiredUsersApi() {
+
+        this.delegate = PasswordExpiredUsersApiServiceFactory.getPasswordExpiredUsersApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersApiServiceFactory.java b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersApiServiceFactory.java
index c31c475e15..310ecd48eb 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersApiServiceFactory.java
@@ -21,12 +21,20 @@
 import org.wso2.carbon.identity.api.expired.password.identification.v1.PasswordExpiredUsersApiService;
 import org.wso2.carbon.identity.api.expired.password.identification.v1.impl.PasswordExpiredUsersApiServiceImpl;
 
+/**
+ * Factory class for PasswordExpiredUsersApiService.
+ */
 public class PasswordExpiredUsersApiServiceFactory {
 
-   private final static PasswordExpiredUsersApiService service = new PasswordExpiredUsersApiServiceImpl();
+   private final static PasswordExpiredUsersApiService SERVICE = new PasswordExpiredUsersApiServiceImpl();
+
+   /**
+    * Get PasswordExpiredUsersApiService.
+    *
+    * @return PasswordExpiredUsersApiService.
+    */
+   public static PasswordExpiredUsersApiService getPasswordExpiredUsersApi() {
 
-   public static PasswordExpiredUsersApiService getPasswordExpiredUsersApi()
-   {
-      return service;
+      return SERVICE;
    }
 }
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/core/PasswordExpiredUsersManagementApiService.java b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/core/PasswordExpiredUsersManagementApiService.java
index a68919a965..e53af76ae9 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/core/PasswordExpiredUsersManagementApiService.java
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/core/PasswordExpiredUsersManagementApiService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -21,7 +21,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.identity.api.expired.password.identification.common.PasswordExpiryServiceHolder;
 import org.wso2.carbon.identity.api.expired.password.identification.common.util.ExpiredPasswordIdentificationConstants.ErrorMessage;
 import org.wso2.carbon.identity.api.expired.password.identification.v1.model.PasswordExpiredUser;
 import org.wso2.carbon.identity.api.server.common.error.APIError;
@@ -31,6 +30,7 @@
 import org.wso2.carbon.identity.password.expiry.exceptions.ExpiredPasswordIdentificationException;
 import org.wso2.carbon.identity.password.expiry.exceptions.ExpiredPasswordIdentificationServerException;
 import org.wso2.carbon.identity.password.expiry.models.PasswordExpiredUserModel;
+import org.wso2.carbon.identity.password.expiry.services.ExpiredPasswordIdentificationService;
 import org.wso2.carbon.identity.password.expiry.util.PasswordPolicyUtils;
 
 import java.time.LocalDate;
@@ -51,8 +51,15 @@
  */
 public class PasswordExpiredUsersManagementApiService {
 
+    private final ExpiredPasswordIdentificationService expiredPasswordIdentificationService;
     private static final Log LOG = LogFactory.getLog(PasswordExpiredUsersManagementApiService.class);
 
+    public PasswordExpiredUsersManagementApiService(
+            ExpiredPasswordIdentificationService expiredPasswordIdentificationService) {
+
+        this.expiredPasswordIdentificationService = expiredPasswordIdentificationService;
+    }
+
     /**
      * Get password expired users.
      *
@@ -71,11 +78,11 @@ public List<PasswordExpiredUser> getPasswordExpiredUsers(
             LocalDateTime expiredAfterDate = convertToDateObject(expiredAfter, DATE_EXPIRED_AFTER);
             LocalDateTime excludeAfterDate = convertToDateObject(excludeAfter, DATE_EXCLUDE_AFTER);
             if (excludeAfterDate == null) {
-                passwordExpiredUsers = PasswordExpiryServiceHolder.getExpiredPasswordIdentificationService().
-                        getPasswordExpiredUsersFromSpecificDate(expiredAfterDate, tenantDomain);
+                passwordExpiredUsers = expiredPasswordIdentificationService
+                        .getPasswordExpiredUsersFromSpecificDate(expiredAfterDate, tenantDomain);
             } else {
-                passwordExpiredUsers = PasswordExpiryServiceHolder.getExpiredPasswordIdentificationService().
-                        getPasswordExpiredUsersBetweenSpecificDates(expiredAfterDate, excludeAfterDate, tenantDomain);
+                passwordExpiredUsers = expiredPasswordIdentificationService
+                        .getPasswordExpiredUsersBetweenSpecificDates(expiredAfterDate, excludeAfterDate, tenantDomain);
             }
             return buildResponse(passwordExpiredUsers);
         } catch (ExpiredPasswordIdentificationException e) {
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersManagementApiServiceFactory.java b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersManagementApiServiceFactory.java
new file mode 100644
index 0000000000..045e66a412
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersManagementApiServiceFactory.java
@@ -0,0 +1,34 @@
+package org.wso2.carbon.identity.api.expired.password.identification.v1.factories;
+
+import org.wso2.carbon.identity.api.expired.password.identification.common.PasswordExpiryServiceHolder;
+import org.wso2.carbon.identity.api.expired.password.identification.v1.core.PasswordExpiredUsersManagementApiService;
+import org.wso2.carbon.identity.password.expiry.services.ExpiredPasswordIdentificationService;
+
+/**
+ * Factory class for PasswordExpiredUsersManagementApiService.
+ */
+public class PasswordExpiredUsersManagementApiServiceFactory {
+
+    private static final PasswordExpiredUsersManagementApiService SERVICE;
+
+    static {
+        ExpiredPasswordIdentificationService expiredPasswordIdentificationService =
+                PasswordExpiryServiceHolder.getExpiredPasswordIdentificationService();
+
+        if (expiredPasswordIdentificationService == null) {
+            throw new IllegalStateException("RolePermissionManagementService is not available from OSGi context.");
+        }
+
+        SERVICE = new PasswordExpiredUsersManagementApiService(expiredPasswordIdentificationService);
+    }
+
+    /**
+     * Get PasswordExpiredUsersManagementApiService service instance.
+     *
+     * @return PasswordExpiredUsersManagementApiService service.
+     */
+    public static PasswordExpiredUsersManagementApiService getExpiredPasswordIdentificationService() {
+
+        return SERVICE;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/impl/PasswordExpiredUsersApiServiceImpl.java b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/impl/PasswordExpiredUsersApiServiceImpl.java
index 5f6813e169..0bcddade50 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/impl/PasswordExpiredUsersApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/impl/PasswordExpiredUsersApiServiceImpl.java
@@ -18,10 +18,10 @@
 
 package org.wso2.carbon.identity.api.expired.password.identification.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.expired.password.identification.common.ContextLoader;
 import org.wso2.carbon.identity.api.expired.password.identification.v1.PasswordExpiredUsersApiService;
 import org.wso2.carbon.identity.api.expired.password.identification.v1.core.PasswordExpiredUsersManagementApiService;
+import org.wso2.carbon.identity.api.expired.password.identification.v1.factories.PasswordExpiredUsersManagementApiServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -30,8 +30,17 @@
  */
 public class PasswordExpiredUsersApiServiceImpl implements PasswordExpiredUsersApiService {
 
-    @Autowired
-    private PasswordExpiredUsersManagementApiService passwordExpiredUsersManagementApiService;
+    private final PasswordExpiredUsersManagementApiService passwordExpiredUsersManagementApiService;
+
+    public PasswordExpiredUsersApiServiceImpl() {
+
+        try {
+            this.passwordExpiredUsersManagementApiService = PasswordExpiredUsersManagementApiServiceFactory
+                    .getExpiredPasswordIdentificationService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating password expired users management service.", e);
+        }
+    }
 
     @Override
     public Response getPasswordExpiredUsers(String expiredAfter, String excludeAfter) {
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/resources/META-INF/cxf/expired-password-identification-cxf.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/resources/META-INF/cxf/expired-password-identification-cxf.xml
deleted file mode 100644
index e62cb0ffb4..0000000000
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/resources/META-INF/cxf/expired-password-identification-cxf.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.org).
-  ~
-  ~ 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.
-  -->
-
-<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.expired.password.identification.v1.core.PasswordExpiredUsersManagementApiService"/>
-    <bean class="org.wso2.carbon.identity.api.expired.password.identification.v1.impl.PasswordExpiredUsersApiServiceImpl"/>
-
-    <bean id="expiredPasswordIdentificationServiceFactoryBean" class="org.wso2.carbon.identity.api.expired.password.identification.common.factory.ExpiredPasswordIdentificationOSGIServiceFactory"/>
-
-    <bean id="expiredPasswordIdentificationServiceHolderBean" class="org.wso2.carbon.identity.api.expired.password.identification.common.PasswordExpiryServiceHolder">
-        <property name="expiredPasswordIdentificationService" ref="expiredPasswordIdentificationServiceFactoryBean"/>
-    </bean>
-</beans>

From a642e364d269ea3a93cf4c6cefee9d5627a8783c Mon Sep 17 00:00:00 2001
From: lashini <lashini@wso2.com>
Date: Fri, 24 Jan 2025 05:31:06 +0530
Subject: [PATCH 2/3] fix license headers

---
 .../pom.xml                                    |  2 +-
 .../common/PasswordExpiryServiceHolder.java    |  2 +-
 .../pom.xml                                    |  2 +-
 .../PasswordExpiredUsersApiServiceFactory.java |  2 +-
 ...xpiredUsersManagementApiServiceFactory.java | 18 ++++++++++++++++++
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
index 0208593dce..c3016fedad 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
   ~
   ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/common/PasswordExpiryServiceHolder.java b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/common/PasswordExpiryServiceHolder.java
index 3a75f56c01..c38570889b 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/common/PasswordExpiryServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.common/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/common/PasswordExpiryServiceHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
index ed3db9c005..22e4eaea44 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
+  ~ Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
   ~
   ~ WSO2 LLC. licenses this file to you under the Apache License,
   ~ Version 2.0 (the "License"); you may not use this file except
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersApiServiceFactory.java b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersApiServiceFactory.java
index 310ecd48eb..2d3a379642 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 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
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersManagementApiServiceFactory.java b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersManagementApiServiceFactory.java
index 045e66a412..e3c5df9500 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersManagementApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersManagementApiServiceFactory.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 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
+ * 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.expired.password.identification.v1.factories;
 
 import org.wso2.carbon.identity.api.expired.password.identification.common.PasswordExpiryServiceHolder;

From ceda58837700ffd837e2753f517ea86cd69c1710 Mon Sep 17 00:00:00 2001
From: lashini <lashini@wso2.com>
Date: Fri, 24 Jan 2025 05:32:30 +0530
Subject: [PATCH 3/3] fix license headers

---
 .../v1/factories/PasswordExpiredUsersApiServiceFactory.java     | 2 +-
 .../v1/core/PasswordExpiredUsersManagementApiService.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersApiServiceFactory.java b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersApiServiceFactory.java
index 2d3a379642..310ecd48eb 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/gen/java/org/wso2/carbon/identity/api/expired/password/identification/v1/factories/PasswordExpiredUsersApiServiceFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2025, WSO2 LLC. (http://www.wso2.com).
+ * 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
diff --git a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/core/PasswordExpiredUsersManagementApiService.java b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/core/PasswordExpiredUsersManagementApiService.java
index e53af76ae9..a4aac5262a 100644
--- a/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/core/PasswordExpiredUsersManagementApiService.java
+++ b/components/org.wso2.carbon.identity.api.expired.password.identification/org.wso2.carbon.identity.api.expired.password.identification.v1/src/main/java/org/wso2/carbon/identity/api/expired/password/identification/v1/core/PasswordExpiredUsersManagementApiService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023-2024, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2023, WSO2 LLC. (http://www.wso2.com).
  *
  * WSO2 LLC. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except