From 9956de8f2905d388774dc0082fe36f4d0de5fcfb Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Mon, 13 Nov 2017 16:00:10 -0600 Subject: [PATCH] LogoutBuilder->LogoutSpec Issue: gh-4822 --- .../config/web/server/ServerHttpSecurity.java | 18 +++++++++--------- ...tBuilderTests.java => LogoutSpecTests.java} | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) rename config/src/test/java/org/springframework/security/config/web/server/{LogoutBuilderTests.java => LogoutSpecTests.java} (99%) diff --git a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java index 7841094e35..b25b4250df 100644 --- a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java @@ -109,7 +109,7 @@ public class ServerHttpSecurity { private FormLoginSpec formLogin; - private LogoutBuilder logout = new LogoutBuilder(); + private LogoutSpec logout = new LogoutSpec(); private ReactiveAuthenticationManager authenticationManager; @@ -196,9 +196,9 @@ public class ServerHttpSecurity { return this.authorizeExchange; } - public LogoutBuilder logout() { + public LogoutSpec logout() { if (this.logout == null) { - this.logout = new LogoutBuilder(); + this.logout = new LogoutSpec(); } return this.logout; } @@ -732,26 +732,26 @@ public class ServerHttpSecurity { * @author Shazin Sadakath * @since 5.0 */ - public final class LogoutBuilder { + public final class LogoutSpec { private LogoutWebFilter logoutWebFilter = new LogoutWebFilter(); - public LogoutBuilder logoutHandler(ServerLogoutHandler serverLogoutHandler) { + public LogoutSpec logoutHandler(ServerLogoutHandler serverLogoutHandler) { this.logoutWebFilter.setServerLogoutHandler(serverLogoutHandler); return this; } - public LogoutBuilder logoutUrl(String logoutUrl) { + public LogoutSpec logoutUrl(String logoutUrl) { Assert.notNull(logoutUrl, "logoutUrl must not be null"); ServerWebExchangeMatcher requiresLogout = ServerWebExchangeMatchers.pathMatchers(HttpMethod.POST, logoutUrl); return requiresLogout(requiresLogout); } - public LogoutBuilder requiresLogout(ServerWebExchangeMatcher requiresLogout) { + public LogoutSpec requiresLogout(ServerWebExchangeMatcher requiresLogout) { this.logoutWebFilter.setRequiresLogout(requiresLogout); return this; } - public LogoutBuilder logoutSuccessHandler(ServerLogoutSuccessHandler handler) { + public LogoutSpec logoutSuccessHandler(ServerLogoutSuccessHandler handler) { this.logoutWebFilter.setServerLogoutSuccessHandler(handler); return this; } @@ -769,7 +769,7 @@ public class ServerHttpSecurity { http.addFilterAt(this.logoutWebFilter, SecurityWebFiltersOrder.LOGOUT); } - private LogoutBuilder() {} + private LogoutSpec() {} } private static class OrderedWebFilter implements WebFilter, Ordered { diff --git a/config/src/test/java/org/springframework/security/config/web/server/LogoutBuilderTests.java b/config/src/test/java/org/springframework/security/config/web/server/LogoutSpecTests.java similarity index 99% rename from config/src/test/java/org/springframework/security/config/web/server/LogoutBuilderTests.java rename to config/src/test/java/org/springframework/security/config/web/server/LogoutSpecTests.java index c575521b8d..bdbf124250 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/LogoutBuilderTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/LogoutSpecTests.java @@ -29,7 +29,7 @@ import org.springframework.security.test.web.reactive.server.WebTestClientBuilde * @author Shazin Sadakath * @since 5.0 */ -public class LogoutBuilderTests { +public class LogoutSpecTests { private ServerHttpSecurity http = ServerHttpSecurityConfigurationBuilder.httpWithDefaultAuthentication();