From 6b71ee49e6a99e41d23add83fe4364659298eed2 Mon Sep 17 00:00:00 2001 From: digithuman Date: Mon, 2 Jan 2023 11:52:51 +0800 Subject: [PATCH 1/2] jakarta.servlet replace javax.servlet. 1. javax.servlet 2.5 to jakarta.servlet 6.0.0 2. maven-war-plugin 2.4 to 3.3.2 3. test add spring-web 6.0.3 , spring-core 3.0.3 to 6.0.3 4. cxf 2.2.10 to 4.0.0 5. spring-mock 2.08 to spring-test 6.0.3 6. easy-mock 3.0 to 5.1.0 7. jetty 7.1.5.v20100705 to 11.0.13 --- demos/client-demo/pom.xml | 12 ++++----- .../apache/oltu/oauth2/client/demo/Utils.java | 8 +++--- .../demo/controller/AuthzController.java | 11 ++++---- .../demo/controller/RedirectController.java | 8 +++--- .../controller/RegistrationController.java | 7 ++--- .../demo/controller/ResourceController.java | 4 +-- .../demo/controller/TokenController.java | 9 ++++--- .../as/request/AbstractOAuthTokenRequest.java | 2 +- .../oauth2/as/request/OAuthAuthzRequest.java | 2 +- .../oltu/oauth2/as/request/OAuthRequest.java | 4 +-- .../oauth2/as/request/OAuthTokenRequest.java | 2 +- .../OAuthUnauthenticatedTokenRequest.java | 5 +--- .../oauth2/as/response/OAuthASResponse.java | 2 +- .../validator/AuthorizationCodeValidator.java | 2 +- .../validator/ClientCredentialValidator.java | 2 +- .../as/validator/CodeTokenValidator.java | 2 +- .../oauth2/as/validator/CodeValidator.java | 2 +- .../as/validator/PasswordValidator.java | 2 +- .../as/validator/RefreshTokenValidator.java | 2 +- .../oauth2/as/validator/TokenValidator.java | 2 +- ...thenticatedAuthorizationCodeValidator.java | 4 +-- .../UnauthenticatedPasswordValidator.java | 2 +- .../UnauthenticatedRefreshTokenValidator.java | 4 +-- .../oltu/oauth2/as/MD5GeneratorTest.java | 4 +-- .../oltu/oauth2/as/OAuthIssuerImplTest.java | 4 +-- .../oltu/oauth2/as/OAuthRequestTest.java | 17 +++++++----- .../as/OAuthUnauthenticatedRequestTest.java | 12 ++++----- .../oauth2/as/OauthMockRequestBuilder.java | 8 +++--- .../oauth2/as/UUIDValueGeneratorTest.java | 3 +-- .../as/response/OAuthASResponseTest.java | 2 +- .../as/validator/TokenValidatorTest.java | 15 +++++------ .../oauth2/client/URLConnectionClient.java | 5 ++-- .../response/OAuthAccessTokenResponse.java | 6 ++--- .../client/response/OAuthAuthzResponse.java | 4 +-- .../client/response/OAuthClientResponse.java | 8 +++--- .../response/OAuthClientResponseFactory.java | 11 ++++---- .../response/OAuthResourceResponse.java | 10 +++---- .../OAuthAuthorizationResponseImplTest.java | 22 +++++++-------- .../OAuthJSONAccessTokenResponseTest.java | 1 - .../response/OAuthResourceResponseTest.java | 16 +++++------ .../oltu/oauth2/client/utils/TestUtils.java | 2 +- .../oltu/oauth2/common/utils/OAuthUtils.java | 4 +-- .../common/validators/AbstractValidator.java | 3 ++- .../common/validators/OAuthValidator.java | 2 +- .../oauth2/common/utils/OAuthUtilsTest.java | 27 +++++++++++++------ .../validators/AbstractValidatorImpl.java | 3 +-- .../validators/AbstractValidatorTest.java | 13 +++++---- .../JSONHttpServletRequestWrapper.java | 9 ++++--- .../OAuthServerRegistrationRequest.java | 2 -- .../OAuthServerRegistrationRequestTest.java | 1 + oauth-2.0/integration-tests/pom.xml | 4 +++ .../AccessTokenPasswordCredentialsTest.java | 6 ++--- .../ClientRegistrationOAuthTest.java | 1 - .../integration/ClientRegistrationTest.java | 4 +-- .../integration/ClientResourceOAuthTest.java | 1 - .../integration/ClientServerOAuthTest.java | 1 - .../integration/EndUserAuthorizationTest.java | 14 +++++----- .../integration/endpoints/AuthzEndpoint.java | 16 +++++------ .../endpoints/RegistrationEndpoint.java | 18 ++++++------- .../endpoints/ResourceBodyEndpoint.java | 16 +++++------ .../endpoints/ResourceHeaderEndpoint.java | 14 +++++----- .../endpoints/ResourceQueryEndpoint.java | 14 +++++----- .../integration/endpoints/TokenEndpoint.java | 17 ++++++------ .../UnauthenticatedTokenEndpoint.java | 18 ++++++------- .../integration/server/ResourceServlet.java | 11 ++++---- .../src/test/resources/oauth-beans.xml | 6 ++--- oauth-2.0/jwt/pom.xml | 2 +- .../jwt/request/JWTBearerValidator.java | 2 +- .../oauth2/jwt/request/JWTOAuthRequest.java | 2 +- oauth-2.0/pom.xml | 27 ++++++++++--------- .../oltu/oauth2/rsfilter/OAuthFilter.java | 20 +++++++++----- .../oltu/oauth2/rsfilter/OAuthRSProvider.java | 2 +- .../oltu/oauth2/rsfilter/OAuthUtils.java | 5 ++-- .../apache/oltu/oauth2/rs/ResourceServer.java | 4 +-- .../extractor/BearerBodyTokenExtractor.java | 2 +- .../extractor/BearerHeaderTokenExtractor.java | 2 +- .../extractor/BearerQueryTokenExtractor.java | 2 +- .../oauth2/rs/extractor/TokenExtractor.java | 2 +- .../request/OAuthAccessResourceRequest.java | 4 ++- .../validator/BearerBodyOAuthValidator.java | 2 +- .../validator/BearerHeaderOAuthValidator.java | 3 ++- .../validator/BearerQueryOAuthValidator.java | 2 +- .../rs/OAuthAccessResourceRequestTest.java | 8 ++++-- .../rs/extractor/BodyTokenExtractorTest.java | 15 ++++++----- .../extractor/HeaderTokenExtractorTest.java | 15 ++++++----- .../rs/extractor/QueryTokenExtractorTest.java | 13 +++++---- .../rs/validator/BodyOAuthValidatorTest.java | 15 ++++++----- .../validator/HeaderOAuthValidatorTest.java | 15 +++++++---- .../rs/validator/QueryOAuthValidatorTest.java | 15 +++++++---- oauth-2.0/test-utils/pom.xml | 5 ++++ parent/pom.xml | 2 +- 91 files changed, 354 insertions(+), 307 deletions(-) diff --git a/demos/client-demo/pom.xml b/demos/client-demo/pom.xml index 9b0d0f31..88ba1a81 100644 --- a/demos/client-demo/pom.xml +++ b/demos/client-demo/pom.xml @@ -34,7 +34,7 @@ 1.0.4-SNAPSHOT 0.0.1-SNAPSHOT 3.2.18.RELEASE - 2.5 + 6.0.0 1.7.25 @@ -125,7 +125,6 @@ - org.tuckey urlrewritefilter @@ -133,11 +132,12 @@ runtime + - javax.servlet - servlet-api - ${servlet-api.version} - provided + jakarta.servlet + jakarta.servlet-api + ${servlet-api.version} + provided - + + diff --git a/oauth-2.0/jwt/pom.xml b/oauth-2.0/jwt/pom.xml index c90a78e2..3225a456 100644 --- a/oauth-2.0/jwt/pom.xml +++ b/oauth-2.0/jwt/pom.xml @@ -51,7 +51,7 @@ org.apache.oltu.oauth2 org.apache.oltu.oauth2.authzserver - 1.0.0 + 1.0.3-SNAPSHOT diff --git a/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/request/JWTBearerValidator.java b/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/request/JWTBearerValidator.java index d1d3234b..54f854d8 100644 --- a/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/request/JWTBearerValidator.java +++ b/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/request/JWTBearerValidator.java @@ -16,7 +16,7 @@ */ package org.apache.oltu.oauth2.jwt.request; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.validators.AbstractValidator; diff --git a/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/request/JWTOAuthRequest.java b/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/request/JWTOAuthRequest.java index ad6f955e..35c72580 100644 --- a/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/request/JWTOAuthRequest.java +++ b/oauth-2.0/jwt/src/main/java/org/apache/oltu/oauth2/jwt/request/JWTOAuthRequest.java @@ -16,7 +16,7 @@ */ package org.apache.oltu.oauth2.jwt.request; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.oltu.oauth2.as.request.AbstractOAuthTokenRequest; import org.apache.oltu.oauth2.common.OAuth; diff --git a/oauth-2.0/pom.xml b/oauth-2.0/pom.xml index 71be11cd..5de3a7fc 100644 --- a/oauth-2.0/pom.xml +++ b/oauth-2.0/pom.xml @@ -76,12 +76,12 @@ org.apache.oltu.oauth2*;version=${project.version} - 2.2.10 - 3.0.3.RELEASE - 2.0.8 - 3.0 - 2.5 - 7.1.5.v20100705 + 4.0.0 + 6.0.3 + 6.0.3 + 5.1.0 + 6.0.0 + 11.0.13 2.5 @@ -124,10 +124,11 @@ org.springframework - spring-mock + spring-test ${spring-mock.version} test + org.easymock @@ -135,13 +136,15 @@ ${easy-mock.version} test - + + - javax.servlet - servlet-api - ${servlet-api.version} - provided + jakarta.servlet + jakarta.servlet-api + ${servlet-api.version} + provided + diff --git a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthFilter.java b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthFilter.java index 4cdd1bf3..9aea2b1a 100644 --- a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthFilter.java +++ b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthFilter.java @@ -21,6 +21,19 @@ package org.apache.oltu.oauth2.rsfilter; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; +import java.security.Principal; + import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.error.OAuthError; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; @@ -30,13 +43,6 @@ import org.apache.oltu.oauth2.rs.request.OAuthAccessResourceRequest; import org.apache.oltu.oauth2.rs.response.OAuthRSResponse; -import javax.servlet.*; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.security.Principal; - /** * * diff --git a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthRSProvider.java b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthRSProvider.java index bb3eb6a7..27884263 100644 --- a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthRSProvider.java +++ b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthRSProvider.java @@ -21,7 +21,7 @@ package org.apache.oltu.oauth2.rsfilter; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; diff --git a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthUtils.java b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthUtils.java index 55060b02..cf797260 100644 --- a/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthUtils.java +++ b/oauth-2.0/resourceserver-filter/src/main/java/org/apache/oltu/oauth2/rsfilter/OAuthUtils.java @@ -21,9 +21,8 @@ package org.apache.oltu.oauth2.rsfilter; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; /** * diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/ResourceServer.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/ResourceServer.java index b21239ae..7e8d91e1 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/ResourceServer.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/ResourceServer.java @@ -16,6 +16,8 @@ */ package org.apache.oltu.oauth2.rs; +import jakarta.servlet.http.HttpServletRequest; + import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.ArrayList; @@ -23,8 +25,6 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import org.apache.oltu.oauth2.common.exception.OAuthSystemException; import org.apache.oltu.oauth2.common.message.types.ParameterStyle; import org.apache.oltu.oauth2.common.utils.OAuthUtils; diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerBodyTokenExtractor.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerBodyTokenExtractor.java index 5bd47336..8e880342 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerBodyTokenExtractor.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerBodyTokenExtractor.java @@ -21,7 +21,7 @@ package org.apache.oltu.oauth2.rs.extractor; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.oltu.oauth2.common.OAuth; diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerHeaderTokenExtractor.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerHeaderTokenExtractor.java index 27ee4191..39639507 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerHeaderTokenExtractor.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerHeaderTokenExtractor.java @@ -21,7 +21,7 @@ package org.apache.oltu.oauth2.rs.extractor; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.utils.OAuthUtils; diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerQueryTokenExtractor.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerQueryTokenExtractor.java index 65f48185..c92c32ae 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerQueryTokenExtractor.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/BearerQueryTokenExtractor.java @@ -23,7 +23,7 @@ import static org.apache.oltu.oauth2.rs.ResourceServer.getQueryParameterValue; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.oltu.oauth2.common.OAuth; diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/TokenExtractor.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/TokenExtractor.java index dd98b49b..cad95269 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/TokenExtractor.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/extractor/TokenExtractor.java @@ -21,7 +21,7 @@ package org.apache.oltu.oauth2.rs.extractor; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; /** * diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/request/OAuthAccessResourceRequest.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/request/OAuthAccessResourceRequest.java index fd1aaa0e..37f9550e 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/request/OAuthAccessResourceRequest.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/request/OAuthAccessResourceRequest.java @@ -22,9 +22,11 @@ package org.apache.oltu.oauth2.rs.request; +import jakarta.servlet.http.HttpServletRequest; + import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; + import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.error.OAuthError; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerBodyOAuthValidator.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerBodyOAuthValidator.java index 706c03ab..57184bde 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerBodyOAuthValidator.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerBodyOAuthValidator.java @@ -21,7 +21,7 @@ package org.apache.oltu.oauth2.rs.validator; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.error.OAuthError; diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerHeaderOAuthValidator.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerHeaderOAuthValidator.java index 5be2d1a3..de4207ea 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerHeaderOAuthValidator.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerHeaderOAuthValidator.java @@ -21,8 +21,9 @@ package org.apache.oltu.oauth2.rs.validator; +import jakarta.servlet.http.HttpServletRequest; + import java.util.Map; -import javax.servlet.http.HttpServletRequest; import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.error.OAuthError; diff --git a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerQueryOAuthValidator.java b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerQueryOAuthValidator.java index cb5200ac..1d0f3bab 100644 --- a/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerQueryOAuthValidator.java +++ b/oauth-2.0/resourceserver/src/main/java/org/apache/oltu/oauth2/rs/validator/BearerQueryOAuthValidator.java @@ -23,7 +23,7 @@ import static org.apache.oltu.oauth2.rs.ResourceServer.getQueryParameterValues; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.error.OAuthError; diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/OAuthAccessResourceRequestTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/OAuthAccessResourceRequestTest.java index 5dd4b3df..4f3be46f 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/OAuthAccessResourceRequestTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/OAuthAccessResourceRequestTest.java @@ -21,10 +21,14 @@ package org.apache.oltu.oauth2.rs; -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.reset; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.fail; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.error.OAuthError; diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/BodyTokenExtractorTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/BodyTokenExtractorTest.java index 213b7721..c47690d5 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/BodyTokenExtractorTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/BodyTokenExtractorTest.java @@ -21,15 +21,18 @@ package org.apache.oltu.oauth2.rs.extractor; -import org.apache.oltu.oauth2.common.OAuth; -import org.junit.Test; - -import javax.servlet.http.HttpServletRequest; - -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import jakarta.servlet.http.HttpServletRequest; + +import org.apache.oltu.oauth2.common.OAuth; +import org.junit.Test; + public class BodyTokenExtractorTest { @Test diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/HeaderTokenExtractorTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/HeaderTokenExtractorTest.java index 045b617b..bdbaf529 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/HeaderTokenExtractorTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/HeaderTokenExtractorTest.java @@ -21,15 +21,18 @@ package org.apache.oltu.oauth2.rs.extractor; -import org.apache.oltu.oauth2.common.OAuth; -import org.junit.Test; - -import javax.servlet.http.HttpServletRequest; - -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import jakarta.servlet.http.HttpServletRequest; + +import org.apache.oltu.oauth2.common.OAuth; +import org.junit.Test; + public class HeaderTokenExtractorTest { @Test diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/QueryTokenExtractorTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/QueryTokenExtractorTest.java index efdf1134..46149f06 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/QueryTokenExtractorTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/extractor/QueryTokenExtractorTest.java @@ -21,14 +21,17 @@ package org.apache.oltu.oauth2.rs.extractor; -import org.junit.Test; - -import javax.servlet.http.HttpServletRequest; - -import static org.easymock.EasyMock.*; +import static org.easymock.EasyMock.createStrictMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import jakarta.servlet.http.HttpServletRequest; + +import org.junit.Test; + public class QueryTokenExtractorTest { @Test diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/BodyOAuthValidatorTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/BodyOAuthValidatorTest.java index d4bcf9ab..d0fe1d22 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/BodyOAuthValidatorTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/BodyOAuthValidatorTest.java @@ -21,17 +21,20 @@ package org.apache.oltu.oauth2.rs.validator; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + +import jakarta.servlet.http.HttpServletRequest; + import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.error.OAuthError; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import org.junit.Test; -import javax.servlet.http.HttpServletRequest; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - public class BodyOAuthValidatorTest { @Test diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/HeaderOAuthValidatorTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/HeaderOAuthValidatorTest.java index 0e9f8b2d..3fc14e77 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/HeaderOAuthValidatorTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/HeaderOAuthValidatorTest.java @@ -21,17 +21,22 @@ package org.apache.oltu.oauth2.rs.validator; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import jakarta.servlet.http.HttpServletRequest; + import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.error.OAuthError; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import org.apache.oltu.oauth2.common.utils.OAuthUtils; import org.junit.Test; -import javax.servlet.http.HttpServletRequest; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; - public class HeaderOAuthValidatorTest { diff --git a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/QueryOAuthValidatorTest.java b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/QueryOAuthValidatorTest.java index 4432c5d1..2f1f8ba4 100644 --- a/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/QueryOAuthValidatorTest.java +++ b/oauth-2.0/resourceserver/src/test/java/org/apache/oltu/oauth2/rs/validator/QueryOAuthValidatorTest.java @@ -21,17 +21,22 @@ package org.apache.oltu.oauth2.rs.validator; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.easymock.EasyMock.verify; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +import jakarta.servlet.http.HttpServletRequest; + import org.apache.oltu.oauth2.common.OAuth; import org.apache.oltu.oauth2.common.error.OAuthError; import org.apache.oltu.oauth2.common.exception.OAuthProblemException; import org.apache.oltu.oauth2.common.utils.OAuthUtils; import org.junit.Test; -import javax.servlet.http.HttpServletRequest; - -import static org.easymock.EasyMock.*; -import static org.junit.Assert.*; - public class QueryOAuthValidatorTest { @Test diff --git a/oauth-2.0/test-utils/pom.xml b/oauth-2.0/test-utils/pom.xml index 888a7b80..d7654978 100644 --- a/oauth-2.0/test-utils/pom.xml +++ b/oauth-2.0/test-utils/pom.xml @@ -34,6 +34,11 @@ spring-core ${org.springframework.version} + + org.springframework + spring-web + ${org.springframework.version} + diff --git a/parent/pom.xml b/parent/pom.xml index f3f8f224..84673a08 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -436,7 +436,7 @@ org.apache.maven.plugins maven-war-plugin - 2.4 + 3.3.2 From dd3d6e1fae4c828529084b12bf27b286ab1654f4 Mon Sep 17 00:00:00 2001 From: digithuman Date: Mon, 2 Jan 2023 12:04:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?spring-test=20cxf=20=E5=B7=B2=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oauth-2.0/integration-tests/pom.xml | 2 +- .../integration/ClientResourceOAuthTest.java | 10 ++++----- .../integration/ClientServerOAuthTest.java | 22 +++++++++---------- .../integration/JUnit4SpringContextTests.java | 2 ++ 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/oauth-2.0/integration-tests/pom.xml b/oauth-2.0/integration-tests/pom.xml index e4b609de..c97641d6 100644 --- a/oauth-2.0/integration-tests/pom.xml +++ b/oauth-2.0/integration-tests/pom.xml @@ -29,7 +29,7 @@ org.apache.oltu.oauth2.integration-tests - true + false diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientResourceOAuthTest.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientResourceOAuthTest.java index a83833ad..31be4a09 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientResourceOAuthTest.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientResourceOAuthTest.java @@ -39,16 +39,16 @@ public abstract class ClientResourceOAuthTest extends ClientServerOAuthTest { public static void initService() throws Exception { ClientServerOAuthTest.initService(); - JAXRSServerFactoryBean sf3 = (JAXRSServerFactoryBean)ctx.getBean("resourceServer"); - s3 = sf3.create(); +// JAXRSServerFactoryBean sf3 = (JAXRSServerFactoryBean)ctx.getBean("resourceServer"); +// s3 = sf3.create(); } @AfterClass public static void stopService() throws Exception { - if (s3 != null) { - s3.stop(); - } +// if (s3 != null) { +// s3.stop(); +// } ClientServerOAuthTest.stopService(); } } diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientServerOAuthTest.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientServerOAuthTest.java index 9d78702b..77cb135d 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientServerOAuthTest.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/ClientServerOAuthTest.java @@ -38,23 +38,23 @@ public abstract class ClientServerOAuthTest extends JUnit4SpringContextTests { @BeforeClass public static void initService() throws Exception { - JAXRSServerFactoryBean sf = (JAXRSServerFactoryBean)ctx.getBean("oauthServer"); - s = sf.create(); - - JAXRSServerFactoryBean sf2 = (JAXRSServerFactoryBean)ctx.getBean("oauthClient"); - s2 = sf2.create(); +// JAXRSServerFactoryBean sf = (JAXRSServerFactoryBean)ctx.getBean("oauthServer"); +// s = sf.create(); +// +// JAXRSServerFactoryBean sf2 = (JAXRSServerFactoryBean)ctx.getBean("oauthClient"); +// s2 = sf2.create(); } @AfterClass public static void stopService() throws Exception { - if (s != null) { - s.stop(); - } - if (s2 != null) { - s2.stop(); - } +// if (s != null) { +// s.stop(); +// } +// if (s2 != null) { +// s2.stop(); +// } } diff --git a/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/JUnit4SpringContextTests.java b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/JUnit4SpringContextTests.java index f5c7f030..2c2afe2b 100644 --- a/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/JUnit4SpringContextTests.java +++ b/oauth-2.0/integration-tests/src/test/java/org/apache/oltu/oauth2/integration/JUnit4SpringContextTests.java @@ -36,6 +36,8 @@ public class JUnit4SpringContextTests extends Assert { @BeforeClass public static void initialize() { + if (null==ctx) { ctx = new ClassPathXmlApplicationContext(new String[] {"classpath:oauth-beans.xml"}); + } } }