From 86d70a03cc901c2df3f5ed7cb352d354ec11ac52 Mon Sep 17 00:00:00 2001
From: drumonii <drumonii@users.noreply.github.com>
Date: Fri, 25 Oct 2019 21:02:37 -0400
Subject: [PATCH] Use the nested builder support in HttpSecurity DSL of
 WebSecurityConfig

---
 .../config/WebSecurityConfig.java             | 46 +++++++++++--------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/backend/src/main/java/com/drumonii/loltrollbuild/config/WebSecurityConfig.java b/backend/src/main/java/com/drumonii/loltrollbuild/config/WebSecurityConfig.java
index 99fd055c6..29bbd8739 100644
--- a/backend/src/main/java/com/drumonii/loltrollbuild/config/WebSecurityConfig.java
+++ b/backend/src/main/java/com/drumonii/loltrollbuild/config/WebSecurityConfig.java
@@ -43,26 +43,32 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 	protected void configure(HttpSecurity http) throws Exception {
 		// @formatter:off
 		http
-			.authorizeRequests()
-				.requestMatchers(EndpointRequest.toAnyEndpoint()).hasRole(UserRole.ADMIN)
-			.and()
-			.formLogin()
-				.loginPage("/admin/login")
-				.loginProcessingUrl(apiPath + "/admin/login")
-				.successHandler(authenticationSuccessHandler())
-				.failureHandler(authenticationFailureHandler())
-				.permitAll()
-			.and()
-			.logout()
-				.logoutUrl(apiPath + "/admin/logout")
-				.logoutSuccessHandler(logoutSuccessHandler())
-				.permitAll()
-			.and()
-			.csrf()
-				.csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
-			.and()
-				.exceptionHandling()
-				.authenticationEntryPoint(authenticationEntryPoint());
+			.authorizeRequests(authorizeRequests ->
+				authorizeRequests
+						.requestMatchers(EndpointRequest.toAnyEndpoint()).hasRole(UserRole.ADMIN)
+			)
+			.formLogin(formLogin ->
+				formLogin
+						.loginPage("/admin/login")
+						.loginProcessingUrl(apiPath + "/admin/login")
+						.successHandler(authenticationSuccessHandler())
+						.failureHandler(authenticationFailureHandler())
+						.permitAll()
+			)
+			.logout(logout ->
+				logout
+						.logoutUrl(apiPath + "/admin/logout")
+						.logoutSuccessHandler(logoutSuccessHandler())
+						.permitAll()
+			)
+			.csrf(csrf ->
+				csrf
+						.csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
+			)
+			.exceptionHandling(exceptionHandling ->
+				exceptionHandling
+						.authenticationEntryPoint(authenticationEntryPoint())
+			);
 		// @formatter:on
 	}