Merge pull request #2681 from lashinijay/master-revamp-scope-endpoint

[Spring Cleanup] Refactor oauth2 scope endpoint to remove Spring dependency
wso2-extensions · Jan 21, 2025 · 7782ea7 · 7782ea7
2 parents fece352 + db5584d
commit 7782ea7
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 102 deletions.
diff --git a/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml b/components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~  Copyright (c) 2021, WSO2 LLC. (http://www.wso2.com).
+  ~  Copyright (c) 2021-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
@@ -81,25 +81,6 @@
             <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>

diff --git a/...java/org/wso2/carbon/identity/oauth/scope/endpoint/factories/ScopesApiServiceFactory.java b/...java/org/wso2/carbon/identity/oauth/scope/endpoint/factories/ScopesApiServiceFactory.java
@@ -5,9 +5,9 @@
 
 public class ScopesApiServiceFactory {
 
-    private final static ScopesApiService service = new ScopesApiServiceImpl();
+    private static final ScopesApiService SERVICE = new ScopesApiServiceImpl();
 
     public static ScopesApiService getScopesApi() {
-        return service;
+        return SERVICE;
     }
 }
diff --git a/...n.identity.api.server.oauth.scope/src/main/resources/META-INF/cxf/oauth2-scope-v1-cxf.xml b/...n.identity.api.server.oauth.scope/src/main/resources/META-INF/cxf/oauth2-scope-v1-cxf.xml
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
@@ -74,25 +74,6 @@
             <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-            <scope>provided</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>

diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/src/main/webapp/WEB-INF/beans.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/src/main/webapp/WEB-INF/beans.xml
diff --git a/components/org.wso2.carbon.identity.oauth.scope.endpoint/src/main/webapp/WEB-INF/web.xml b/components/org.wso2.carbon.identity.oauth.scope.endpoint/src/main/webapp/WEB-INF/web.xml
@@ -9,11 +9,6 @@
     <display-name>WSO2 Identity Server Scope Endpoint</display-name>
     <description>WSO2 Identity Server Scope Endpoint</description>
 
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>WEB-INF/beans.xml</param-value>
-    </context-param>
-
     <filter>
         <filter-name>HttpHeaderSecurityFilter</filter-name>
         <filter-class>org.apache.catalina.filters.HttpHeaderSecurityFilter</filter-class>
@@ -54,24 +49,32 @@
         <url-pattern>*</url-pattern>
     </filter-mapping>
 
-    <listener>
-        <listener-class>
-            org.springframework.web.context.ContextLoaderListener
-        </listener-class>
-    </listener>
-
+    <!--  Servlet instance for /identity/oauth2/v1.0 -->
+    <servlet-mapping>
+        <servlet-name>IdentityOAuth2V1ApiServlet</servlet-name>
+        <url-pattern>/identity/oauth2/v1.0/*</url-pattern>
+    </servlet-mapping>
     <servlet>
-        <servlet-name>CXFServlet</servlet-name>
+        <servlet-name>IdentityOAuth2V1ApiServlet</servlet-name>
         <servlet-class>
-            org.apache.cxf.transport.servlet.CXFServlet
+            org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
         </servlet-class>
         <load-on-startup>1</load-on-startup>
+        <init-param>
+            <param-name>jaxrs.serviceClasses</param-name>
+            <param-value>
+                org.wso2.carbon.identity.oauth.scope.endpoint.ScopesApi
+            </param-value>
+        </init-param>
+        <init-param>
+            <param-name>jaxrs.providers</param-name>
+            <param-value>
+                com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider,
+                org.wso2.carbon.identity.oauth.endpoint.exmapper.JsonProcessingExceptionMapper,
+            </param-value>
+        </init-param>
     </servlet>
 
-    <servlet-mapping>
-        <servlet-name>CXFServlet</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
     <session-config>
         <session-timeout>60</session-timeout>
     </session-config>