From 368d6d4dbd78e46b65f4258f98b505003507260c Mon Sep 17 00:00:00 2001
From: NipuniBhagya <nipunib@wso2.com>
Date: Sat, 26 Oct 2024 18:38:13 +0530
Subject: [PATCH] Remove Spring dependencies in user session management API

---
 .../pom.xml                                   |  9 +--
 .../common/factory/OSGIServiceFactory.java    | 52 -------------
 .../RealmServiceOSGIServiceFactory.java       | 52 -------------
 .../util/SessionManagementServiceHolder.java  | 38 +++++----
 .../pom.xml                                   |  9 +--
 .../rest/api/user/session/v1/MeApi.java       | 28 ++++---
 .../rest/api/user/session/v1/SessionsApi.java | 28 ++++---
 .../rest/api/user/session/v1/UserIdApi.java   | 28 ++++---
 .../v1/factories/MeApiServiceFactory.java     | 17 +++-
 .../factories/SessionsApiServiceFactory.java  | 31 +++++---
 .../v1/factories/UserIdApiServiceFactory.java | 17 +++-
 .../v1/core/SessionManagementService.java     | 30 +++++---
 .../SessionManagementServiceFactory.java      | 77 +++++++++++++++++++
 .../session/v1/impl/MeApiServiceImpl.java     | 18 +++--
 .../v1/impl/SessionsApiServiceImpl.java       | 32 +++++---
 .../session/v1/impl/UserIdApiServiceImpl.java | 18 +++--
 .../META-INF/cxf/session-user-v1-cxf.xml      | 34 --------
 17 files changed, 269 insertions(+), 249 deletions(-)
 delete mode 100644 components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/OSGIServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/RealmServiceOSGIServiceFactory.java
 create mode 100644 components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionManagementServiceFactory.java
 delete mode 100644 components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/resources/META-INF/cxf/session-user-v1-cxf.xml

diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/pom.xml b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/pom.xml
index 8227c4fb0..076350b03 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.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
@@ -32,10 +32,5 @@
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/OSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/OSGIServiceFactory.java
deleted file mode 100644
index a435444d6..000000000
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/OSGIServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-
-package org.wso2.carbon.identity.api.user.session.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.application.authentication.framework.UserSessionManagementService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the UserSessionManagementService type of object inside the container.
- */
-public class OSGIServiceFactory extends AbstractFactoryBean<UserSessionManagementService> {
-
-    private UserSessionManagementService userSessionManagementService;
-
-    @Override
-    public Class<?> getObjectType() {
-        return Object.class;
-    }
-
-    @Override
-    protected UserSessionManagementService createInstance() throws Exception {
-
-        if (this.userSessionManagementService == null) {
-            UserSessionManagementService userSessionManagementService = (UserSessionManagementService)
-                    PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                            .getOSGiService(UserSessionManagementService.class, null);
-            if (userSessionManagementService != null) {
-                this.userSessionManagementService = userSessionManagementService;
-            } else {
-                throw new Exception("Unable to retrieve UserSessionManagementService service.");
-            }
-        }
-        return this.userSessionManagementService;
-    }
-
-}
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/RealmServiceOSGIServiceFactory.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/RealmServiceOSGIServiceFactory.java
deleted file mode 100644
index 8b94ab88b..000000000
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/factory/RealmServiceOSGIServiceFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-
-package org.wso2.carbon.identity.api.user.session.common.factory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.user.core.service.RealmService;
-
-/**
- * Factory Beans serves as a factory for creating other beans within the IOC container. This factory bean is used to
- * instantiate the RealmService type of object inside the container.
- */
-public class RealmServiceOSGIServiceFactory extends AbstractFactoryBean<RealmService> {
-
-    private RealmService realmService;
-
-    @Override
-    public Class<?> getObjectType() {
-
-        return Object.class;
-    }
-
-    @Override
-    protected RealmService createInstance() throws Exception {
-
-        if (this.realmService == null) {
-            RealmService realmService
-                    = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                    .getOSGiService(RealmService.class, null);
-            if (realmService != null) {
-                this.realmService = realmService;
-            } else {
-                throw new Exception("Unable to retrieve RealmService.");
-            }
-        }
-        return this.realmService;
-    }
-}
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/util/SessionManagementServiceHolder.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/util/SessionManagementServiceHolder.java
index 2d2f0ea38..5c7d706bd 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/util/SessionManagementServiceHolder.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.common/src/main/java/org/wso2/carbon/identity/api/user/session/common/util/SessionManagementServiceHolder.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.session.common.util;
 
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.identity.application.authentication.framework.UserSessionManagementService;
 import org.wso2.carbon.user.core.service.RealmService;
 
@@ -26,9 +27,21 @@
  */
 public class SessionManagementServiceHolder {
 
-    private static UserSessionManagementService userSessionManagementService;
+    private SessionManagementServiceHolder() {
 
-    private static RealmService realmService;
+    }
+
+    private static class UserSessionManagementServiceHolder {
+
+        static final UserSessionManagementService SERVICE = (UserSessionManagementService) PrivilegedCarbonContext
+                .getThreadLocalCarbonContext().getOSGiService(UserSessionManagementService.class, null);
+    }
+
+    private static class RealmServiceHolder {
+
+        static final RealmService SERVICE = (RealmService) PrivilegedCarbonContext.getThreadLocalCarbonContext()
+                .getOSGiService(RealmService.class, null);
+    }
 
     /**
      * Method to get the session management osgi service.
@@ -36,20 +49,17 @@ public class SessionManagementServiceHolder {
      * @return UserSessionManagementService
      */
     public static UserSessionManagementService getUserSessionManagementService() {
-        return userSessionManagementService;
-    }
 
-    public static void setUserSessionManagementService(UserSessionManagementService userSessionManagementService) {
-        SessionManagementServiceHolder.userSessionManagementService = userSessionManagementService;
+        return UserSessionManagementServiceHolder.SERVICE;
     }
 
+    /**
+     * Method to get the realm service.
+     *
+     * @return RealmService
+     */
     public static RealmService getRealmService() {
 
-        return realmService;
-    }
-
-    public static void setRealmService(RealmService realmService) {
-
-        SessionManagementServiceHolder.realmService = realmService;
+        return RealmServiceHolder.SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/pom.xml b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/pom.xml
index abbb8326f..adcf0d781 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.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
@@ -84,11 +84,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.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/MeApi.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/MeApi.java
index bf453c435..54b4ac3e7 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/MeApi.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/MeApi.java
@@ -1,17 +1,19 @@
 /*
- * 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.session.v1;
@@ -21,8 +23,8 @@
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionsDTO;
+import org.wso2.carbon.identity.rest.api.user.session.v1.factories.MeApiServiceFactory;
 
 import javax.validation.Valid;
 import javax.ws.rs.DELETE;
@@ -37,8 +39,12 @@
 @Api(value = "/me", description = "the me API")
 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.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/SessionsApi.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/SessionsApi.java
index 551a36358..353d6c544 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/SessionsApi.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/SessionsApi.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2022-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.session.v1;
@@ -21,8 +23,8 @@
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SearchResponseDTO;
+import org.wso2.carbon.identity.rest.api.user.session.v1.factories.SessionsApiServiceFactory;
 
 import javax.validation.Valid;
 import javax.ws.rs.GET;
@@ -35,8 +37,12 @@
 @Api(value = "/sessions", description = "the sessions API")
 public class SessionsApi {
 
-    @Autowired
-    private SessionsApiService delegate;
+    private final SessionsApiService delegate;
+
+    public SessionsApi() {
+
+        this.delegate = SessionsApiServiceFactory.getSessionsApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/UserIdApi.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/UserIdApi.java
index 71e81b025..166cf1b08 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/UserIdApi.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/UserIdApi.java
@@ -1,17 +1,19 @@
 /*
- * 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.session.v1;
@@ -21,9 +23,9 @@
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionDTO;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionsDTO;
+import org.wso2.carbon.identity.rest.api.user.session.v1.factories.UserIdApiServiceFactory;
 
 import javax.validation.Valid;
 import javax.ws.rs.DELETE;
@@ -38,8 +40,12 @@
 @Api(value = "/{user-id}", description = "the {user-id} API")
 public class UserIdApi {
 
-    @Autowired
-    private UserIdApiService delegate;
+    private final UserIdApiService delegate;
+
+    public UserIdApi() {
+
+        this.delegate = UserIdApiServiceFactory.getUserIdApi();
+    }
 
     @Valid
     @GET
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/MeApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/MeApiServiceFactory.java
index b7a62b395..f1a04dd48 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/MeApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/MeApiServiceFactory.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
@@ -21,11 +21,20 @@
 import org.wso2.carbon.identity.rest.api.user.session.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.impl.MeApiServiceImpl;
 
+/**
+ * Factory class for MeApiService.
+ */
 public class MeApiServiceFactory {
 
-    private static final MeApiService service = new MeApiServiceImpl();
+    private static final 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.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionsApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionsApiServiceFactory.java
index 50ca7251b..7ee034ed3 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionsApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionsApiServiceFactory.java
@@ -1,17 +1,19 @@
 /*
- * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2022-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.session.v1.factories;
@@ -19,11 +21,20 @@
 import org.wso2.carbon.identity.rest.api.user.session.v1.SessionsApiService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.impl.SessionsApiServiceImpl;
 
+/**
+ * Factory class for SessionsApiService.
+ */
 public class SessionsApiServiceFactory {
 
-    private static final SessionsApiService service = new SessionsApiServiceImpl();
+    private static final SessionsApiService SERVICE = new SessionsApiServiceImpl();
 
+    /**
+     * Get SessionsApiService.
+     *
+     * @return SessionsApiService instance.
+     */
     public static SessionsApiService getSessionsApi() {
-        return service;
+
+        return SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/UserIdApiServiceFactory.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/UserIdApiServiceFactory.java
index be26909a3..7e89ad32e 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/UserIdApiServiceFactory.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/gen/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/UserIdApiServiceFactory.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
@@ -21,11 +21,20 @@
 import org.wso2.carbon.identity.rest.api.user.session.v1.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.impl.UserIdApiServiceImpl;
 
+/**
+ * Factory class for UserIdApiService.
+ */
 public class UserIdApiServiceFactory {
 
-    private static final UserIdApiService service = new UserIdApiServiceImpl();
+    private static final UserIdApiService SERVICE = new UserIdApiServiceImpl();
 
+    /**
+     * Get UserIdApiService.
+     *
+     * @return UserIdApiService.
+     */
     public static UserIdApiService getUserIdApi() {
-        return service;
+
+        return SERVICE;
     }
 }
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/core/SessionManagementService.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/core/SessionManagementService.java
index f236620f2..202d55f35 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/core/SessionManagementService.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/core/SessionManagementService.java
@@ -26,7 +26,7 @@
 import org.wso2.carbon.identity.api.user.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.user.common.function.UserToUniqueId;
 import org.wso2.carbon.identity.api.user.session.common.constant.SessionManagementConstants;
-import org.wso2.carbon.identity.api.user.session.common.util.SessionManagementServiceHolder;
+import org.wso2.carbon.identity.application.authentication.framework.UserSessionManagementService;
 import org.wso2.carbon.identity.application.authentication.framework.exception.UserSessionException;
 import org.wso2.carbon.identity.application.authentication.framework.exception.session.mgt.SessionManagementClientException;
 import org.wso2.carbon.identity.application.authentication.framework.exception.session.mgt.SessionManagementException;
@@ -45,6 +45,7 @@
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SearchResponseDTO;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionDTO;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionsDTO;
+import org.wso2.carbon.user.core.service.RealmService;
 
 import java.io.IOException;
 import java.net.URLEncoder;
@@ -74,6 +75,9 @@
  */
 public class SessionManagementService {
 
+    private final UserSessionManagementService userSessionManagementService;
+    private final RealmService realmService;
+
     private static final String FEDERATED_USER_DOMAIN = "FEDERATED";
     private static final String IS_FEDERATED_USER = "isFederatedUser";
     private static final String IDP_NAME = "idpName";
@@ -81,6 +85,13 @@ public class SessionManagementService {
     private static final String SESSIONS_SEARCH_ENDPOINT = "/v1/sessions";
     private static final Integer SESSIONS_SEARCH_DEFAULT_LIMIT = 20;
 
+    public SessionManagementService(UserSessionManagementService userSessionManagementService,
+                                    RealmService realmService) {
+
+        this.userSessionManagementService = userSessionManagementService;
+        this.realmService = realmService;
+    }
+
     /**
      * Get all the active sessions of a given user.
      *
@@ -154,8 +165,7 @@ public SessionsDTO getSessionsByUserId(String userId, Integer limit, Integer off
         try {
             if (!StringUtils.isBlank(userId)) {
                 sessions = new SessionsDTO();
-                sessionsForUser = SessionManagementServiceHolder.getUserSessionManagementService()
-                        .getSessionsByUserId(userId);
+                sessionsForUser = userSessionManagementService.getSessionsByUserId(userId);
                 sessions.setUserId(userId);
                 sessions.setSessions(buildSessionDTOs(sessionsForUser));
             }
@@ -184,8 +194,7 @@ public Optional<SessionDTO> getSessionBySessionId(String userId, String sessionI
                 String message = "Session ID is not provided to perform session management tasks.";
                 throw new SessionManagementClientException(ERROR_CODE_INVALID_SESSION, message);
             }
-            return SessionManagementServiceHolder.getUserSessionManagementService()
-                    .getSessionBySessionId(userId, sessionId)
+            return userSessionManagementService.getSessionBySessionId(userId, sessionId)
                     .map(new UserSessionToExternal());
         } catch (SessionManagementException e) {
             throw handleSessionManagementException(e);
@@ -212,8 +221,8 @@ public SearchResponseDTO getSessions(String tenantDomain, String filter, Integer
             String sortOrder = since != null ? SessionMgtConstants.ASC : SessionMgtConstants.DESC;
             SearchResponseDTO response = new SearchResponseDTO();
 
-            List<UserSession> results = SessionManagementServiceHolder.getUserSessionManagementService()
-                    .getSessions(tenantDomain, filterNodes, limit + 1, sortOrder);
+            List<UserSession> results = userSessionManagementService.getSessions(tenantDomain, filterNodes,
+                    limit + 1, sortOrder);
 
             if (!results.isEmpty()) {
                 boolean hasMoreItems = results.size() > limit;
@@ -260,8 +269,7 @@ public void terminateSessionBySessionId(String userId, String sessionId) {
 
         try {
             if (userId != null && sessionId != null) {
-                SessionManagementServiceHolder.getUserSessionManagementService().terminateSessionBySessionId(userId,
-                        sessionId);
+                userSessionManagementService.terminateSessionBySessionId(userId, sessionId);
             } else {
                 throw handleForbiddenAction();
             }
@@ -283,7 +291,7 @@ public void terminateSessionsByUserId(String userId) {
 
         try {
             if (userId != null) {
-                SessionManagementServiceHolder.getUserSessionManagementService().terminateSessionsByUserId(userId);
+                userSessionManagementService.terminateSessionsByUserId(userId);
             }
         } catch (SessionManagementException e) {
             throw handleSessionManagementException(e);
@@ -365,7 +373,7 @@ private APIError handleForbiddenAction() {
 
     private String getUserIdFromUser(User user) {
 
-        return new UserToUniqueId().apply(SessionManagementServiceHolder.getRealmService(), user);
+        return new UserToUniqueId().apply(realmService, user);
     }
 
     private String getFederatedUserIdFromUser(User user) {
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionManagementServiceFactory.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionManagementServiceFactory.java
new file mode 100644
index 000000000..4ae3d1db0
--- /dev/null
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/factories/SessionManagementServiceFactory.java
@@ -0,0 +1,77 @@
+/*
+ * 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.session.v1.factories;
+
+import org.wso2.carbon.identity.api.user.session.common.util.SessionManagementServiceHolder;
+import org.wso2.carbon.identity.application.authentication.framework.UserSessionManagementService;
+import org.wso2.carbon.identity.rest.api.user.session.v1.core.SessionManagementService;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * Factory class for SessionManagementService.
+ */
+public class SessionManagementServiceFactory {
+
+    private SessionManagementServiceFactory() {
+
+    }
+
+    private static class SessionManagementServicesHolder {
+
+        private static final SessionManagementService SERVICE = createServiceInstance();
+    }
+
+    private static SessionManagementService createServiceInstance() {
+
+        UserSessionManagementService userSessionManagementService = getUserSessionManagementService();
+        RealmService realmService = getRealmService();
+
+        return new SessionManagementService(userSessionManagementService, realmService);
+    }
+
+    /**
+     * Method to get SessionManagementService instance.
+     *
+     * @return SessionManagementService
+     */
+    public static SessionManagementService getSessionManagementService() {
+
+        return SessionManagementServicesHolder.SERVICE;
+    }
+
+    private static UserSessionManagementService getUserSessionManagementService() {
+
+        UserSessionManagementService service = SessionManagementServiceHolder.getUserSessionManagementService();
+        if (service == null) {
+            throw new IllegalStateException("UserSessionManagementService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+
+    private static RealmService getRealmService() {
+
+        RealmService service = SessionManagementServiceHolder.getRealmService();
+        if (service == null) {
+            throw new IllegalStateException("RealmService is not available from OSGi context.");
+        }
+
+        return service;
+    }
+}
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/MeApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/MeApiServiceImpl.java
index 4ba397987..253e9f9a1 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/MeApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/MeApiServiceImpl.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,10 +18,10 @@
 
 package org.wso2.carbon.identity.rest.api.user.session.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.rest.api.user.session.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.core.SessionManagementService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionsDTO;
+import org.wso2.carbon.identity.rest.api.user.session.v1.factories.SessionManagementServiceFactory;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -33,8 +33,16 @@
  */
 public class MeApiServiceImpl extends MeApiService {
 
-    @Autowired
-    private SessionManagementService sessionManagementService;
+    private final SessionManagementService sessionManagementService;
+
+    public MeApiServiceImpl() {
+
+        try {
+            this.sessionManagementService = SessionManagementServiceFactory.getSessionManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating the SessionManagementService.", e);
+        }
+    }
 
     @Override
     public Response getSessionsOfLoggedInUser(Integer limit, Integer offset, String filter, String sort) {
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/SessionsApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/SessionsApiServiceImpl.java
index 2d59ca517..fe148cd0e 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/SessionsApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/SessionsApiServiceImpl.java
@@ -1,26 +1,28 @@
 /*
- * Copyright (c) 2022, WSO2 LLC. (http://www.wso2.com).
+ * Copyright (c) 2022-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.session.v1.impl;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.session.v1.SessionsApiService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.core.SessionManagementService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SearchResponseDTO;
+import org.wso2.carbon.identity.rest.api.user.session.v1.factories.SessionManagementServiceFactory;
 
 import javax.ws.rs.core.Response;
 
@@ -29,8 +31,16 @@
  */
 public class SessionsApiServiceImpl extends SessionsApiService {
 
-    @Autowired
-    private SessionManagementService sessionManagementService;
+    private final SessionManagementService sessionManagementService;
+
+    public SessionsApiServiceImpl() {
+
+        try {
+            this.sessionManagementService = SessionManagementServiceFactory.getSessionManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating the SessionManagementService.", e);
+        }
+    }
 
     @Override
     public Response getSessions(String filter, Integer limit, Long since, Long until) {
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/UserIdApiServiceImpl.java b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/UserIdApiServiceImpl.java
index 082804f11..e6c0819d1 100644
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/UserIdApiServiceImpl.java
+++ b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/UserIdApiServiceImpl.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
@@ -21,7 +21,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.identity.api.user.common.Util;
 import org.wso2.carbon.identity.api.user.session.common.util.SessionManagementServiceHolder;
@@ -30,6 +29,7 @@
 import org.wso2.carbon.identity.rest.api.user.session.v1.core.SessionManagementService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionDTO;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionsDTO;
+import org.wso2.carbon.identity.rest.api.user.session.v1.factories.SessionManagementServiceFactory;
 import org.wso2.carbon.user.api.UserRealm;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.core.common.AbstractUserStoreManager;
@@ -45,8 +45,16 @@ public class UserIdApiServiceImpl extends UserIdApiService {
 
     private static final Log log = LogFactory.getLog(UserIdApiServiceImpl.class);
 
-    @Autowired
-    private SessionManagementService sessionManagementService;
+    private final SessionManagementService sessionManagementService;
+
+    public UserIdApiServiceImpl() {
+
+        try {
+            this.sessionManagementService = SessionManagementServiceFactory.getSessionManagementService();
+        } catch (IllegalStateException e) {
+            throw new RuntimeException("Error occurred while initiating the SessionManagementService.", e);
+        }
+    }
 
     @Override
     public Response getSessionBySessionId(String userId, String sessionId) {
diff --git a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/resources/META-INF/cxf/session-user-v1-cxf.xml b/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/resources/META-INF/cxf/session-user-v1-cxf.xml
deleted file mode 100644
index b2c6414be..000000000
--- a/components/org.wso2.carbon.identity.api.user.session/org.wso2.carbon.identity.api.user.session.v1/src/main/resources/META-INF/cxf/session-user-v1-cxf.xml
+++ /dev/null
@@ -1,34 +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.session.v1.core.SessionManagementService"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.session.v1.impl.UserIdApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.session.v1.impl.MeApiServiceImpl"/>
-    <bean class="org.wso2.carbon.identity.rest.api.user.session.v1.impl.SessionsApiServiceImpl"/>
-    <bean id="UserSessionServiceHolderBean" class="org.wso2.carbon.identity.api.user.session.common.util.SessionManagementServiceHolder">
-        <property name="userSessionManagementService" ref="userSessionManagementServiceFactoryBean"/>
-        <property name="realmService" ref="RealmServiceOSGIServiceFactoryBean"/>
-    </bean>
-    <bean id="userSessionManagementServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.session.common.factory.OSGIServiceFactory"/>
-    <bean id="RealmServiceOSGIServiceFactoryBean"
-          class="org.wso2.carbon.identity.api.user.session.common.factory.RealmServiceOSGIServiceFactory"/>
-</beans>