Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Spring Cleanup] Refactor oauth2 scope endpoint to remove Spring dependency #2681

Merged
merged 1 commit into from
Jan 21, 2025
Merged

[Spring Cleanup] Refactor oauth2 scope endpoint to remove Spring dependency #2681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 1 addition & 20 deletions components/org.wso2.carbon.identity.api.server.oauth.scope/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/wso2/carbon/identity/oauth/scope/endpoint/factories/ScopesApiServiceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
25 changes: 0 additions & 25 deletions ...n.identity.api.server.oauth.scope/src/main/resources/META-INF/cxf/oauth2-scope-v1-cxf.xml
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions components/org.wso2.carbon.identity.oauth.scope.endpoint/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
19 changes: 0 additions & 19 deletions components/org.wso2.carbon.identity.oauth.scope.endpoint/src/main/webapp/WEB-INF/beans.xml
View file
Open in desktop

This file was deleted.

37 changes: 20 additions & 17 deletions components/org.wso2.carbon.identity.oauth.scope.endpoint/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading