From a45df2c80210f67e34b02e9016035308b9d4e427 Mon Sep 17 00:00:00 2001 From: Josh Cummings Date: Tue, 19 Mar 2019 08:15:36 -0600 Subject: [PATCH] Move OIDC Reactive Packaging --- .../security/config/web/server/OAuth2LoginTests.java | 2 +- .../OidcClientInitiatedServerLogoutSuccessHandler.java | 2 +- .../OidcClientInitiatedServerLogoutSuccessHandlerTests.java | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) rename oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/{web/server/oidc => oidc/web/server}/logout/OidcClientInitiatedServerLogoutSuccessHandler.java (98%) rename oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/{web/server/oidc => oidc/web/server}/logout/OidcClientInitiatedServerLogoutSuccessHandlerTests.java (97%) diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java index 81d94c3436..bf14eda9f2 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java @@ -46,7 +46,7 @@ import org.springframework.security.oauth2.client.authentication.OAuth2LoginAuth import org.springframework.security.oauth2.client.endpoint.OAuth2AuthorizationCodeGrantRequest; import org.springframework.security.oauth2.client.endpoint.ReactiveOAuth2AccessTokenResponseClient; import org.springframework.security.oauth2.client.oidc.authentication.OidcAuthorizationCodeReactiveAuthenticationManager; -import org.springframework.security.oauth2.client.web.server.oidc.logout.OidcClientInitiatedServerLogoutSuccessHandler; +import org.springframework.security.oauth2.client.oidc.web.server.logout.OidcClientInitiatedServerLogoutSuccessHandler; import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest; import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.InMemoryReactiveClientRegistrationRepository; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/oidc/logout/OidcClientInitiatedServerLogoutSuccessHandler.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandler.java similarity index 98% rename from oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/oidc/logout/OidcClientInitiatedServerLogoutSuccessHandler.java rename to oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandler.java index 6f77c5f49f..6bc467cd3f 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/oidc/logout/OidcClientInitiatedServerLogoutSuccessHandler.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.oauth2.client.web.server.oidc.logout; +package org.springframework.security.oauth2.client.oidc.web.server.logout; import java.net.URI; import java.nio.charset.StandardCharsets; diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/oidc/logout/OidcClientInitiatedServerLogoutSuccessHandlerTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandlerTests.java similarity index 97% rename from oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/oidc/logout/OidcClientInitiatedServerLogoutSuccessHandlerTests.java rename to oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandlerTests.java index c891a15893..a9bfcc4800 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/server/oidc/logout/OidcClientInitiatedServerLogoutSuccessHandlerTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/web/server/logout/OidcClientInitiatedServerLogoutSuccessHandlerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.security.oauth2.client.web.server.oidc.logout; +package org.springframework.security.oauth2.client.oidc.web.server.logout; import java.net.URI; import java.util.Collections; @@ -43,6 +43,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +/** + * Tests for {@link OidcClientInitiatedServerLogoutSuccessHandler} + */ public class OidcClientInitiatedServerLogoutSuccessHandlerTests { ClientRegistration registration = TestClientRegistrations .clientRegistration()