Merge branch '6.0.x' into 6.1.x

Closes gh-13883

config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.java

@@ -74,8 +74,8 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests {
 		assertThat(authoritiesPopulator).hasFieldOrPropertyWithValue("groupRoleAttribute", "cn");
 		assertThat(authoritiesPopulator).hasFieldOrPropertyWithValue("groupSearchBase", "");
 		assertThat(authoritiesPopulator).hasFieldOrPropertyWithValue("groupSearchFilter", "(uniqueMember={0})");
-		assertThat(authoritiesPopulator).extracting("searchControls").hasFieldOrPropertyWithValue("searchScope",
-				SearchControls.ONELEVEL_SCOPE);
+		assertThat(authoritiesPopulator).extracting("searchControls")
+			.hasFieldOrPropertyWithValue("searchScope", SearchControls.ONELEVEL_SCOPE);
 		assertThat(ReflectionTestUtils.getField(getAuthoritiesMapper(provider), "prefix")).isEqualTo("ROLE_");
 	}
 
@@ -85,7 +85,7 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests {
 		LdapAuthenticationProvider provider = ldapProvider();
 
 		assertThat(ReflectionTestUtils.getField(getAuthoritiesPopulator(provider), "groupRoleAttribute"))
-				.isEqualTo("group");
+			.isEqualTo("group");
 	}
 
 	@Test
@@ -94,7 +94,7 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests {
 		LdapAuthenticationProvider provider = ldapProvider();
 
 		assertThat(ReflectionTestUtils.getField(getAuthoritiesPopulator(provider), "groupSearchFilter"))
-				.isEqualTo("ou=groupName");
+			.isEqualTo("ou=groupName");
 	}
 
 	@Test
@@ -103,7 +103,8 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests {
 		LdapAuthenticationProvider provider = ldapProvider();
 
 		assertThat(ReflectionTestUtils.getField(getAuthoritiesPopulator(provider), "searchControls"))
-				.extracting("searchScope").isEqualTo(SearchControls.SUBTREE_SCOPE);
+			.extracting("searchScope")
+			.isEqualTo(SearchControls.SUBTREE_SCOPE);
 	}
 
 	@Test
@@ -119,8 +120,8 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests {
 		this.spring.register(BindAuthenticationConfig.class).autowire();
 
 		this.mockMvc.perform(formLogin().user("bob").password("bobspassword"))
-				.andExpect(authenticated().withUsername("bob")
-						.withAuthorities(Collections.singleton(new SimpleGrantedAuthority("ROLE_DEVELOPERS"))));
+			.andExpect(authenticated().withUsername("bob")
+				.withAuthorities(Collections.singleton(new SimpleGrantedAuthority("ROLE_DEVELOPERS"))));
 	}
 
 	// SEC-2472
@@ -129,13 +130,14 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests {
 		this.spring.register(PasswordEncoderConfig.class).autowire();
 
 		this.mockMvc.perform(formLogin().user("bcrypt").password("password"))
-				.andExpect(authenticated().withUsername("bcrypt")
-						.withAuthorities(Collections.singleton(new SimpleGrantedAuthority("ROLE_DEVELOPERS"))));
+			.andExpect(authenticated().withUsername("bcrypt")
+				.withAuthorities(Collections.singleton(new SimpleGrantedAuthority("ROLE_DEVELOPERS"))));
 	}
 
 	private LdapAuthenticationProvider ldapProvider() {
 		return ((List<LdapAuthenticationProvider>) ReflectionTestUtils.getField(this.authenticationManager,
-				"providers")).get(0);
+				"providers"))
+			.get(0);
 	}
 
 	private LdapAuthoritiesPopulator getAuthoritiesPopulator(LdapAuthenticationProvider provider) {

config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderConfigurerTests.java

@@ -51,7 +51,7 @@ public class LdapAuthenticationProviderConfigurerTests {
 		this.spring.register(MultiLdapAuthenticationProvidersConfig.class).autowire();
 
 		this.mockMvc.perform(formLogin().user("bob").password("bobspassword"))
-				.andExpect(authenticated().withUsername("bob"));
+			.andExpect(authenticated().withUsername("bob"));
 	}
 
 	@Test

config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java

@@ -122,7 +122,7 @@ public class JwtITests {
 	@Test
 	public void routeWhenAuthenticationBearerThenAuthorized() {
 		MimeType authenticationMimeType = MimeTypeUtils
-				.parseMimeType(WellKnownMimeType.MESSAGE_RSOCKET_AUTHENTICATION.getString());
+			.parseMimeType(WellKnownMimeType.MESSAGE_RSOCKET_AUTHENTICATION.getString());
 		BearerTokenMetadata credentials = new BearerTokenMetadata("token");
 		given(this.decoder.decode(any())).willReturn(Mono.just(jwt()));
 		// @formatter:off
@@ -137,8 +137,11 @@ public class JwtITests {
 	}
 
 	private Jwt jwt() {
-		return TestJwts.jwt().claim(IdTokenClaimNames.ISS, "https://issuer.example.com")
-				.claim(IdTokenClaimNames.SUB, "rob").claim(IdTokenClaimNames.AUD, Arrays.asList("client-id")).build();
+		return TestJwts.jwt()
+			.claim(IdTokenClaimNames.ISS, "https://issuer.example.com")
+			.claim(IdTokenClaimNames.SUB, "rob")
+			.claim(IdTokenClaimNames.AUD, Arrays.asList("client-id"))
+			.build();
 	}
 
 	private RSocketRequester.Builder requester() {
@@ -169,7 +172,7 @@ public class JwtITests {
 		@Bean
 		PayloadSocketAcceptorInterceptor rsocketInterceptor(RSocketSecurity rsocket) {
 			rsocket.authorizePayload((authorize) -> authorize.anyRequest().authenticated().anyExchange().permitAll())
-					.jwt(Customizer.withDefaults());
+				.jwt(Customizer.withDefaults());
 			return rsocket.build();
 		}
 

config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java

@@ -195,7 +195,7 @@ public class RSocketMessageHandlerITests {
 		String data = "a";
 		assertThatExceptionOfType(ApplicationErrorException.class).isThrownBy(
 				() -> this.requester.route("secure.hello").data(data).retrieveFlux(String.class).collectList().block())
-				.withMessageContaining("Access Denied");
+			.withMessageContaining("Access Denied");
 		assertThat(this.controller.payloads).isEmpty();
 	}
 

config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java

@@ -117,7 +117,7 @@ public class SimpleAuthenticationITests {
 	@Test
 	public void retrieveMonoWhenAuthorizedThenGranted() {
 		MimeType authenticationMimeType = MimeTypeUtils
-				.parseMimeType(WellKnownMimeType.MESSAGE_RSOCKET_AUTHENTICATION.getString());
+			.parseMimeType(WellKnownMimeType.MESSAGE_RSOCKET_AUTHENTICATION.getString());
 		UsernamePasswordMetadata credentials = new UsernamePasswordMetadata("rob", "password");
 		// @formatter:off
 		this.requester = RSocketRequester.builder()
@@ -161,7 +161,7 @@ public class SimpleAuthenticationITests {
 		@Bean
 		PayloadSocketAcceptorInterceptor rsocketInterceptor(RSocketSecurity rsocket) {
 			rsocket.authorizePayload((authorize) -> authorize.anyRequest().authenticated().anyExchange().permitAll())
-					.simpleAuthentication(Customizer.withDefaults());
+				.simpleAuthentication(Customizer.withDefaults());
 			return rsocket.build();
 		}
 

config/src/integration-test/java/org/springframework/security/config/ldap/EmbeddedLdapServerContextSourceFactoryBeanITests.java

@@ -48,7 +48,7 @@ public class EmbeddedLdapServerContextSourceFactoryBeanITests {
 		this.spring.register(FromEmbeddedLdapServerConfig.class).autowire();
 
 		this.mockMvc.perform(formLogin().user("bob").password("bobspassword"))
-				.andExpect(authenticated().withUsername("bob"));
+			.andExpect(authenticated().withUsername("bob"));
 	}
 
 	@Test
@@ -56,7 +56,7 @@ public class EmbeddedLdapServerContextSourceFactoryBeanITests {
 		this.spring.register(PortZeroConfig.class).autowire();
 
 		this.mockMvc.perform(formLogin().user("bob").password("bobspassword"))
-				.andExpect(authenticated().withUsername("bob"));
+			.andExpect(authenticated().withUsername("bob"));
 	}
 
 	@Test
@@ -71,15 +71,16 @@ public class EmbeddedLdapServerContextSourceFactoryBeanITests {
 		this.spring.register(CustomManagerDnConfig.class).autowire();
 
 		this.mockMvc.perform(formLogin().user("bob").password("bobspassword"))
-				.andExpect(authenticated().withUsername("bob"));
+			.andExpect(authenticated().withUsername("bob"));
 	}
 
 	@Test
 	public void contextSourceFactoryBeanWhenManagerDnAndNoPasswordThenException() {
 		assertThatExceptionOfType(UnsatisfiedDependencyException.class)
-				.isThrownBy(() -> this.spring.register(CustomManagerDnNoPasswordConfig.class).autowire())
-				.havingRootCause().isInstanceOf(IllegalStateException.class)
-				.withMessageContaining("managerPassword is required if managerDn is supplied");
+			.isThrownBy(() -> this.spring.register(CustomManagerDnNoPasswordConfig.class).autowire())
+			.havingRootCause()
+			.isInstanceOf(IllegalStateException.class)
+			.withMessageContaining("managerPassword is required if managerDn is supplied");
 	}
 
 	@Configuration
@@ -107,7 +108,7 @@ public class EmbeddedLdapServerContextSourceFactoryBeanITests {
 		@Bean
 		EmbeddedLdapServerContextSourceFactoryBean contextSourceFactoryBean() {
 			EmbeddedLdapServerContextSourceFactoryBean factoryBean = EmbeddedLdapServerContextSourceFactoryBean
-					.fromEmbeddedLdapServer();
+				.fromEmbeddedLdapServer();
 			factoryBean.setPort(0);
 			return factoryBean;
 		}
@@ -128,7 +129,7 @@ public class EmbeddedLdapServerContextSourceFactoryBeanITests {
 		@Bean
 		EmbeddedLdapServerContextSourceFactoryBean contextSourceFactoryBean() {
 			EmbeddedLdapServerContextSourceFactoryBean factoryBean = EmbeddedLdapServerContextSourceFactoryBean
-					.fromEmbeddedLdapServer();
+				.fromEmbeddedLdapServer();
 			factoryBean.setLdif("classpath*:test-server2.xldif");
 			factoryBean.setRoot("dc=monkeymachine,dc=co,dc=uk");
 			return factoryBean;
@@ -150,7 +151,7 @@ public class EmbeddedLdapServerContextSourceFactoryBeanITests {
 		@Bean
 		EmbeddedLdapServerContextSourceFactoryBean contextSourceFactoryBean() {
 			EmbeddedLdapServerContextSourceFactoryBean factoryBean = EmbeddedLdapServerContextSourceFactoryBean
-					.fromEmbeddedLdapServer();
+				.fromEmbeddedLdapServer();
 			factoryBean.setManagerDn("uid=admin,ou=system");
 			factoryBean.setManagerPassword("secret");
 			return factoryBean;
@@ -173,7 +174,7 @@ public class EmbeddedLdapServerContextSourceFactoryBeanITests {
 		@Bean
 		EmbeddedLdapServerContextSourceFactoryBean contextSourceFactoryBean() {
 			EmbeddedLdapServerContextSourceFactoryBean factoryBean = EmbeddedLdapServerContextSourceFactoryBean
-					.fromEmbeddedLdapServer();
+				.fromEmbeddedLdapServer();
 			factoryBean.setManagerDn("uid=admin,ou=system");
 			return factoryBean;
 		}

config/src/integration-test/java/org/springframework/security/config/ldap/LdapBindAuthenticationManagerFactoryITests.java

@@ -66,7 +66,7 @@ public class LdapBindAuthenticationManagerFactoryITests {
 		this.spring.register(FromContextSourceConfig.class).autowire();
 
 		this.mockMvc.perform(formLogin().user("bob").password("bobspassword"))
-				.andExpect(authenticated().withUsername("bob"));
+			.andExpect(authenticated().withUsername("bob"));
 	}
 
 	@Test
@@ -81,19 +81,21 @@ public class LdapBindAuthenticationManagerFactoryITests {
 
 		this.spring.register(CustomAuthoritiesPopulatorConfig.class).autowire();
 
-		this.mockMvc.perform(formLogin().user("bob").password("bobspassword")).andExpect(
-				authenticated().withAuthorities(Collections.singleton(new SimpleGrantedAuthority("ROLE_EXTRA"))));
+		this.mockMvc.perform(formLogin().user("bob").password("bobspassword"))
+			.andExpect(
+					authenticated().withAuthorities(Collections.singleton(new SimpleGrantedAuthority("ROLE_EXTRA"))));
 	}
 
 	@Test
 	public void authenticationManagerFactoryWhenCustomAuthoritiesMapperThenUsed() throws Exception {
 		CustomAuthoritiesMapperConfig.AUTHORITIES_MAPPER = ((authorities) -> AuthorityUtils
-				.createAuthorityList("ROLE_CUSTOM"));
+			.createAuthorityList("ROLE_CUSTOM"));
 
 		this.spring.register(CustomAuthoritiesMapperConfig.class).autowire();
 
-		this.mockMvc.perform(formLogin().user("bob").password("bobspassword")).andExpect(
-				authenticated().withAuthorities(Collections.singleton(new SimpleGrantedAuthority("ROLE_CUSTOM"))));
+		this.mockMvc.perform(formLogin().user("bob").password("bobspassword"))
+			.andExpect(
+					authenticated().withAuthorities(Collections.singleton(new SimpleGrantedAuthority("ROLE_CUSTOM"))));
 	}
 
 	@Test
@@ -113,7 +115,7 @@ public class LdapBindAuthenticationManagerFactoryITests {
 		this.spring.register(CustomUserDetailsContextMapperConfig.class).autowire();
 
 		this.mockMvc.perform(formLogin().user("bob").password("bobspassword"))
-				.andExpect(authenticated().withUsername("other"));
+			.andExpect(authenticated().withUsername("other"));
 	}
 
 	@Test
@@ -121,7 +123,7 @@ public class LdapBindAuthenticationManagerFactoryITests {
 		this.spring.register(CustomUserDnPatternsConfig.class).autowire();
 
 		this.mockMvc.perform(formLogin().user("bob").password("bobspassword"))
-				.andExpect(authenticated().withUsername("bob"));
+			.andExpect(authenticated().withUsername("bob"));
 	}
 
 	@Test
@@ -129,7 +131,7 @@ public class LdapBindAuthenticationManagerFactoryITests {
 		this.spring.register(CustomUserSearchConfig.class).autowire();
 
 		this.mockMvc.perform(formLogin().user("bob").password("bobspassword"))
-				.andExpect(authenticated().withUsername("bob"));
+			.andExpect(authenticated().withUsername("bob"));
 	}
 
 	@Configuration

config/src/integration-test/java/org/springframework/security/config/ldap/LdapPasswordComparisonAuthenticationManagerFactoryITests.java

@@ -50,7 +50,7 @@ public class LdapPasswordComparisonAuthenticationManagerFactoryITests {
 		this.spring.register(CustomPasswordEncoderConfig.class).autowire();
 
 		this.mockMvc.perform(formLogin().user("bcrypt").password("password"))
-				.andExpect(authenticated().withUsername("bcrypt"));
+			.andExpect(authenticated().withUsername("bcrypt"));
 	}
 
 	@Test

config/src/integration-test/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParserTests.java

@@ -56,7 +56,7 @@ public class LdapProviderBeanDefinitionParserTests {
 		AuthenticationManager authenticationManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER,
 				AuthenticationManager.class);
 		Authentication auth = authenticationManager
-				.authenticate(UsernamePasswordAuthenticationToken.unauthenticated("ben", "benspassword"));
+			.authenticate(UsernamePasswordAuthenticationToken.unauthenticated("ben", "benspassword"));
 		UserDetails ben = (UserDetails) auth.getPrincipal();
 		assertThat(ben.getAuthorities()).hasSize(3);
 	}
@@ -71,7 +71,7 @@ public class LdapProviderBeanDefinitionParserTests {
 		ProviderManager providerManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, ProviderManager.class);
 		assertThat(providerManager.getProviders()).hasSize(2);
 		assertThat(providerManager.getProviders()).extracting("authoritiesPopulator.groupSearchFilter")
-				.containsExactly("member={0}", "uniqueMember={0}");
+			.containsExactly("member={0}", "uniqueMember={0}");
 	}
 
 	@Test
@@ -89,7 +89,7 @@ public class LdapProviderBeanDefinitionParserTests {
 		AuthenticationManager authenticationManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER,
 				AuthenticationManager.class);
 		Authentication auth = authenticationManager
-				.authenticate(UsernamePasswordAuthenticationToken.unauthenticated("ben", "benspassword"));
+			.authenticate(UsernamePasswordAuthenticationToken.unauthenticated("ben", "benspassword"));
 
 		assertThat(auth).isNotNull();
 	}
@@ -105,7 +105,7 @@ public class LdapProviderBeanDefinitionParserTests {
 		AuthenticationManager authenticationManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER,
 				AuthenticationManager.class);
 		Authentication auth = authenticationManager
-				.authenticate(UsernamePasswordAuthenticationToken.unauthenticated("ben", "ben"));
+			.authenticate(UsernamePasswordAuthenticationToken.unauthenticated("ben", "ben"));
 
 		assertThat(auth).isNotNull();
 	}
@@ -122,7 +122,7 @@ public class LdapProviderBeanDefinitionParserTests {
 		AuthenticationManager authenticationManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER,
 				AuthenticationManager.class);
 		Authentication auth = authenticationManager
-				.authenticate(UsernamePasswordAuthenticationToken.unauthenticated("bcrypt", "password"));
+			.authenticate(UsernamePasswordAuthenticationToken.unauthenticated("bcrypt", "password"));
 
 		assertThat(auth).isNotNull();
 	}
@@ -137,8 +137,8 @@ public class LdapProviderBeanDefinitionParserTests {
 
 		ProviderManager providerManager = this.appCtx.getBean(BeanIds.AUTHENTICATION_MANAGER, ProviderManager.class);
 		assertThat(providerManager.getProviders()).hasSize(1);
-		assertThat(providerManager.getProviders()).extracting("userDetailsContextMapper").allSatisfy(
-				(contextMapper) -> assertThat(contextMapper).isInstanceOf(InetOrgPersonContextMapper.class));
+		assertThat(providerManager.getProviders()).extracting("userDetailsContextMapper")
+			.allSatisfy((contextMapper) -> assertThat(contextMapper).isInstanceOf(InetOrgPersonContextMapper.class));
 	}
 
 	@Test
@@ -155,10 +155,10 @@ public class LdapProviderBeanDefinitionParserTests {
 
 		AuthenticationProvider authenticationProvider = providerManager.getProviders().get(0);
 		assertThat(authenticationProvider).extracting("authenticator.userDnFormat")
-				.satisfies((messageFormats) -> assertThat(messageFormats)
-						.isEqualTo(new MessageFormat[] { new MessageFormat("uid={0},ou=people") }));
+			.satisfies((messageFormats) -> assertThat(messageFormats)
+				.isEqualTo(new MessageFormat[] { new MessageFormat("uid={0},ou=people") }));
 		assertThat(authenticationProvider).extracting("authoritiesPopulator.groupSearchFilter")
-				.satisfies((searchFilter) -> assertThat(searchFilter).isEqualTo("member={0}"));
+			.satisfies((searchFilter) -> assertThat(searchFilter).isEqualTo("member={0}"));
 	}
 
 }

config/src/integration-test/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParserTests.java

@@ -52,7 +52,7 @@ public class LdapServerBeanDefinitionParserTests {
 		this.appCtx = new InMemoryXmlApplicationContext("<ldap-server ldif='classpath:test-server.ldif' port='0'/>");
 
 		DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) this.appCtx
-				.getBean(BeanIds.CONTEXT_SOURCE);
+			.getBean(BeanIds.CONTEXT_SOURCE);
 
 		// Check data is loaded
 		LdapTemplate template = new LdapTemplate(contextSource);
@@ -71,7 +71,7 @@ public class LdapServerBeanDefinitionParserTests {
 		this.appCtx.getBean(BeanIds.CONTEXT_SOURCE);
 
 		DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) this.appCtx
-				.getBean("blah");
+			.getBean("blah");
 
 		// Check data is loaded as before
 		LdapTemplate template = new LdapTemplate(contextSource);
@@ -83,7 +83,7 @@ public class LdapServerBeanDefinitionParserTests {
 		this.appCtx = new InMemoryXmlApplicationContext(
 				"<ldap-server ldif='classpath*:test-server2.xldif' root='dc=monkeymachine,dc=co,dc=uk' port='0'/>");
 		DefaultSpringSecurityContextSource contextSource = (DefaultSpringSecurityContextSource) this.appCtx
-				.getBean(BeanIds.CONTEXT_SOURCE);
+			.getBean(BeanIds.CONTEXT_SOURCE);
 
 		LdapTemplate template = new LdapTemplate(contextSource);
 		template.lookup("uid=pg,ou=gorillas");

config/src/integration-test/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParserTests.java

@@ -58,17 +58,17 @@ public class LdapUserServiceBeanDefinitionParserTests {
 	@Test
 	public void beanClassNamesAreCorrect() {
 		assertThat(FilterBasedLdapUserSearch.class.getName())
-				.isEqualTo(LdapUserServiceBeanDefinitionParser.LDAP_SEARCH_CLASS);
+			.isEqualTo(LdapUserServiceBeanDefinitionParser.LDAP_SEARCH_CLASS);
 		assertThat(PersonContextMapper.class.getName())
-				.isEqualTo(LdapUserServiceBeanDefinitionParser.PERSON_MAPPER_CLASS);
+			.isEqualTo(LdapUserServiceBeanDefinitionParser.PERSON_MAPPER_CLASS);
 		assertThat(InetOrgPersonContextMapper.class.getName())
-				.isEqualTo(LdapUserServiceBeanDefinitionParser.INET_ORG_PERSON_MAPPER_CLASS);
+			.isEqualTo(LdapUserServiceBeanDefinitionParser.INET_ORG_PERSON_MAPPER_CLASS);
 		assertThat(LdapUserDetailsMapper.class.getName())
-				.isEqualTo(LdapUserServiceBeanDefinitionParser.LDAP_USER_MAPPER_CLASS);
+			.isEqualTo(LdapUserServiceBeanDefinitionParser.LDAP_USER_MAPPER_CLASS);
 		assertThat(DefaultLdapAuthoritiesPopulator.class.getName())
-				.isEqualTo(LdapUserServiceBeanDefinitionParser.LDAP_AUTHORITIES_POPULATOR_CLASS);
+			.isEqualTo(LdapUserServiceBeanDefinitionParser.LDAP_AUTHORITIES_POPULATOR_CLASS);
 		assertThat(new LdapUserServiceBeanDefinitionParser().getBeanClassName(mock(Element.class)))
-				.isEqualTo(LdapUserDetailsService.class.getName());
+			.isEqualTo(LdapUserDetailsService.class.getName());
 	}
 
 	@Test

config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java

@@ -85,17 +85,19 @@ public final class SecurityNamespaceHandler implements NamespaceHandler {
 		String version = pkg.getImplementationVersion();
 		this.logger.info("Spring Security 'config' module version is " + version);
 		if (version.compareTo(coreVersion) != 0) {
-			this.logger.error(
-					"You are running with different versions of the Spring Security 'core' and 'config' modules");
+			this.logger
+				.error("You are running with different versions of the Spring Security 'core' and 'config' modules");
 		}
 	}
 
 	@Override
 	public BeanDefinition parse(Element element, ParserContext pc) {
 		if (!namespaceMatchesVersion(element)) {
-			pc.getReaderContext().fatal("You cannot use a spring-security-2.0.xsd or spring-security-3.0.xsd or "
-					+ "spring-security-3.1.xsd schema or spring-security-3.2.xsd schema or spring-security-4.0.xsd schema "
-					+ "with Spring Security 6.1. Please update your schema declarations to the 6.1 schema.", element);
+			pc.getReaderContext()
+				.fatal("You cannot use a spring-security-2.0.xsd or spring-security-3.0.xsd or "
+						+ "spring-security-3.1.xsd schema or spring-security-3.2.xsd schema or spring-security-4.0.xsd schema "
+						+ "with Spring Security 6.1. Please update your schema declarations to the 6.1 schema.",
+						element);
 		}
 		String name = pc.getDelegate().getLocalName(element);
 		BeanDefinitionParser parser = this.parsers.get(name);
@@ -140,8 +142,9 @@ public final class SecurityNamespaceHandler implements NamespaceHandler {
 	}
 
 	private void reportUnsupportedNodeType(String name, ParserContext pc, Node node) {
-		pc.getReaderContext().fatal("Security namespace does not support decoration of "
-				+ ((node instanceof Element) ? "element" : "attribute") + " [" + name + "]", node);
+		pc.getReaderContext()
+			.fatal("Security namespace does not support decoration of "
+					+ ((node instanceof Element) ? "element" : "attribute") + " [" + name + "]", node);
 	}
 
 	private void reportMissingWebClasses(String nodeName, ParserContext pc, Node node) {

config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java

@@ -176,7 +176,7 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
 	private <C extends SecurityConfigurer<O, B>> void add(C configurer) {
 		Assert.notNull(configurer, "configurer cannot be null");
 		Class<? extends SecurityConfigurer<O, B>> clazz = (Class<? extends SecurityConfigurer<O, B>>) configurer
-				.getClass();
+			.getClass();
 		synchronized (this.configurers) {
 			if (this.buildState.isConfigured()) {
 				throw new IllegalStateException("Cannot apply " + configurer + " to already built object");

config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java

@@ -184,8 +184,9 @@ public class AuthenticationConfiguration {
 			return Collections.emptyList();
 		}
 		for (String beanName : beanNamesForType) {
-			if (((ConfigurableApplicationContext) this.applicationContext).getBeanFactory().getBeanDefinition(beanName)
-					.isPrimary()) {
+			if (((ConfigurableApplicationContext) this.applicationContext).getBeanFactory()
+				.getBeanDefinition(beanName)
+				.isPrimary()) {
 				list.add(beanName);
 			}
 		}
@@ -218,7 +219,7 @@ public class AuthenticationConfiguration {
 		@Override
 		public void init(AuthenticationManagerBuilder auth) {
 			Map<String, Object> beansWithAnnotation = this.context
-					.getBeansWithAnnotation(EnableGlobalAuthentication.class);
+				.getBeansWithAnnotation(EnableGlobalAuthentication.class);
 			if (logger.isTraceEnabled()) {
 				logger.trace(LogMessage.format("Eagerly initializing %s", beansWithAnnotation));
 			}

config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthentication.java

@@ -97,7 +97,6 @@ import org.springframework.security.config.annotation.web.servlet.configuration.
  * @see EnableWebMvcSecurity
  * @see EnableWebSecurity
  * @see EnableGlobalMethodSecurity
- *
  * @author Rob Winch
  *
  */

config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java

@@ -67,7 +67,7 @@ class InitializeAuthenticationProviderBeanManagerConfigurer extends GlobalAuthen
 		 */
 		private <T> T getBeanOrNull(Class<T> type) {
 			String[] beanNames = InitializeAuthenticationProviderBeanManagerConfigurer.this.context
-					.getBeanNamesForType(type);
+				.getBeanNamesForType(type);
 			if (beanNames.length != 1) {
 				return null;
 			}

config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurer.java

@@ -401,7 +401,7 @@ public class LdapAuthenticationProviderConfigurer<B extends ProviderManagerBuild
 	 */
 	public PasswordCompareConfigurer passwordCompare() {
 		return new PasswordCompareConfigurer().passwordAttribute("password")
-				.passwordEncoder(NoOpPasswordEncoder.getInstance());
+			.passwordEncoder(NoOpPasswordEncoder.getInstance());
 	}
 
 	/**

config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableMethodSecurity.java

@@ -32,6 +32,7 @@ import org.springframework.security.access.prepost.PreFilter;
 
 /**
  * Enables Spring Security Method Security.
+ *
  * @author Evgeniy Cheban
  * @author Josh Cummings
  * @since 5.6

config/src/main/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurity.java

@@ -28,7 +28,6 @@ import org.springframework.core.Ordered;
 import org.springframework.security.authorization.ReactiveAuthorizationManager;
 
 /**
- *
  * @author Rob Winch
  * @since 5.0
  */

config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java

@@ -108,7 +108,7 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit
 	};
 
 	private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-			.getContextHolderStrategy();
+		.getContextHolderStrategy();
 
 	private DefaultMethodSecurityExpressionHandler defaultMethodExpressionHandler = new DefaultMethodSecurityExpressionHandler();
 
@@ -320,7 +320,7 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit
 	protected AuthenticationManager authenticationManager() throws Exception {
 		if (this.authenticationManager == null) {
 			DefaultAuthenticationEventPublisher eventPublisher = this.objectPostProcessor
-					.postProcess(new DefaultAuthenticationEventPublisher());
+				.postProcess(new DefaultAuthenticationEventPublisher());
 			this.auth = new AuthenticationManagerBuilder(this.objectPostProcessor);
 			this.auth.authenticationEventPublisher(eventPublisher);
 			configure(this.auth);
@@ -375,7 +375,7 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit
 		if (isJsr250Enabled) {
 			GrantedAuthorityDefaults grantedAuthorityDefaults = getSingleBeanOrNull(GrantedAuthorityDefaults.class);
 			Jsr250MethodSecurityMetadataSource jsr250MethodSecurityMetadataSource = this.context
-					.getBean(Jsr250MethodSecurityMetadataSource.class);
+				.getBean(Jsr250MethodSecurityMetadataSource.class);
 			if (grantedAuthorityDefaults != null) {
 				jsr250MethodSecurityMetadataSource.setDefaultRolePrefix(grantedAuthorityDefaults.getRolePrefix());
 			}
@@ -403,7 +403,7 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit
 	@Override
 	public final void setImportMetadata(AnnotationMetadata importMetadata) {
 		Map<String, Object> annotationAttributes = importMetadata
-				.getAnnotationAttributes(EnableGlobalMethodSecurity.class.getName());
+			.getAnnotationAttributes(EnableGlobalMethodSecurity.class.getName());
 		this.enableMethodSecurity = AnnotationAttributes.fromMap(annotationAttributes);
 	}
 

config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java

@@ -51,7 +51,7 @@ final class GlobalMethodSecuritySelector implements ImportSelector {
 		Class<?> importingClass = ClassUtils.resolveClassName(importingClassMetadata.getClassName(),
 				ClassUtils.getDefaultClassLoader());
 		boolean skipMethodSecurityConfiguration = GlobalMethodSecurityConfiguration.class
-				.isAssignableFrom(importingClass);
+			.isAssignableFrom(importingClass);
 		AdviceMode mode = attributes.getEnum("mode");
 		boolean isProxy = AdviceMode.PROXY == mode;
 		String autoProxyClassName = isProxy ? AutoProxyRegistrar.class.getName()

config/src/main/java/org/springframework/security/config/annotation/method/configuration/Jsr250MethodSecurityConfiguration.java

@@ -53,11 +53,11 @@ final class Jsr250MethodSecurityConfiguration {
 		Jsr250AuthorizationManager jsr250 = new Jsr250AuthorizationManager();
 		defaultsProvider.ifAvailable((d) -> jsr250.setRolePrefix(d.getRolePrefix()));
 		SecurityContextHolderStrategy strategy = strategyProvider
-				.getIfAvailable(SecurityContextHolder::getContextHolderStrategy);
+			.getIfAvailable(SecurityContextHolder::getContextHolderStrategy);
 		AuthorizationManager<MethodInvocation> manager = new DeferringObservationAuthorizationManager<>(
 				registryProvider, jsr250);
 		AuthorizationManagerBeforeMethodInterceptor interceptor = AuthorizationManagerBeforeMethodInterceptor
-				.jsr250(manager);
+			.jsr250(manager);
 		interceptor.setSecurityContextHolderStrategy(strategy);
 		return interceptor;
 	}

config/src/main/java/org/springframework/security/config/annotation/method/configuration/MethodSecurityMetadataSourceAdvisorRegistrar.java

@@ -45,13 +45,13 @@ class MethodSecurityMetadataSourceAdvisorRegistrar implements ImportBeanDefiniti
 	@Override
 	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
 		BeanDefinitionBuilder advisor = BeanDefinitionBuilder
-				.rootBeanDefinition(MethodSecurityMetadataSourceAdvisor.class);
+			.rootBeanDefinition(MethodSecurityMetadataSourceAdvisor.class);
 		advisor.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 		advisor.addConstructorArgValue("methodSecurityInterceptor");
 		advisor.addConstructorArgReference("methodSecurityMetadataSource");
 		advisor.addConstructorArgValue("methodSecurityMetadataSource");
 		MultiValueMap<String, Object> attributes = importingClassMetadata
-				.getAllAnnotationAttributes(EnableGlobalMethodSecurity.class.getName());
+			.getAllAnnotationAttributes(EnableGlobalMethodSecurity.class.getName());
 		Integer order = (Integer) attributes.getFirst("order");
 		if (order != null) {
 			advisor.addPropertyValue("order", order);

config/src/main/java/org/springframework/security/config/annotation/method/configuration/PrePostMethodSecurityConfiguration.java

@@ -83,7 +83,7 @@ final class PrePostMethodSecurityConfiguration {
 		manager.setExpressionHandler(
 				new DeferringMethodSecurityExpressionHandler(expressionHandlerProvider, defaultsProvider, context));
 		AuthorizationManagerBeforeMethodInterceptor preAuthorize = AuthorizationManagerBeforeMethodInterceptor
-				.preAuthorize(manager(manager, registryProvider));
+			.preAuthorize(manager(manager, registryProvider));
 		strategyProvider.ifAvailable(preAuthorize::setSecurityContextHolderStrategy);
 		eventPublisherProvider.ifAvailable(preAuthorize::setAuthorizationEventPublisher);
 		return preAuthorize;
@@ -101,7 +101,7 @@ final class PrePostMethodSecurityConfiguration {
 		manager.setExpressionHandler(
 				new DeferringMethodSecurityExpressionHandler(expressionHandlerProvider, defaultsProvider, context));
 		AuthorizationManagerAfterMethodInterceptor postAuthorize = AuthorizationManagerAfterMethodInterceptor
-				.postAuthorize(manager(manager, registryProvider));
+			.postAuthorize(manager(manager, registryProvider));
 		strategyProvider.ifAvailable(postAuthorize::setSecurityContextHolderStrategy);
 		eventPublisherProvider.ifAvailable(postAuthorize::setAuthorizationEventPublisher);
 		return postAuthorize;
@@ -141,7 +141,7 @@ final class PrePostMethodSecurityConfiguration {
 				ObjectProvider<MethodSecurityExpressionHandler> expressionHandlerProvider,
 				ObjectProvider<GrantedAuthorityDefaults> defaultsProvider, ApplicationContext applicationContext) {
 			this.expressionHandler = SingletonSupplier.of(() -> expressionHandlerProvider
-					.getIfAvailable(() -> defaultExpressionHandler(defaultsProvider, applicationContext)));
+				.getIfAvailable(() -> defaultExpressionHandler(defaultsProvider, applicationContext)));
 		}
 
 		@Override

config/src/main/java/org/springframework/security/config/annotation/method/configuration/ReactiveMethodSecurityConfiguration.java

@@ -91,7 +91,7 @@ class ReactiveMethodSecurityConfiguration implements ImportAware {
 	@Override
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		this.advisorOrder = (int) importMetadata.getAnnotationAttributes(EnableReactiveMethodSecurity.class.getName())
-				.get("order");
+			.get("order");
 	}
 
 	@Autowired(required = false)

config/src/main/java/org/springframework/security/config/annotation/method/configuration/ReactiveMethodSecuritySelector.java

@@ -42,7 +42,8 @@ class ReactiveMethodSecuritySelector implements ImportSelector {
 			return new String[0];
 		}
 		EnableReactiveMethodSecurity annotation = importMetadata.getAnnotations()
-				.get(EnableReactiveMethodSecurity.class).synthesize();
+			.get(EnableReactiveMethodSecurity.class)
+			.synthesize();
 		List<String> imports = new ArrayList<>(Arrays.asList(this.autoProxy.selectImports(importMetadata)));
 		if (annotation.useAuthorizationManager()) {
 			imports.add(ReactiveAuthorizationManagerMethodSecurityConfiguration.class.getName());

config/src/main/java/org/springframework/security/config/annotation/method/configuration/SecuredMethodSecurityConfiguration.java

@@ -51,11 +51,11 @@ final class SecuredMethodSecurityConfiguration {
 			ObjectProvider<ObservationRegistry> registryProvider) {
 		SecuredAuthorizationManager secured = new SecuredAuthorizationManager();
 		SecurityContextHolderStrategy strategy = strategyProvider
-				.getIfAvailable(SecurityContextHolder::getContextHolderStrategy);
+			.getIfAvailable(SecurityContextHolder::getContextHolderStrategy);
 		AuthorizationManager<MethodInvocation> manager = new DeferringObservationAuthorizationManager<>(
 				registryProvider, secured);
 		AuthorizationManagerBeforeMethodInterceptor interceptor = AuthorizationManagerBeforeMethodInterceptor
-				.secured(manager);
+			.secured(manager);
 		interceptor.setSecurityContextHolderStrategy(strategy);
 		return interceptor;
 	}

config/src/main/java/org/springframework/security/config/annotation/rsocket/RSocketSecurity.java

@@ -353,7 +353,7 @@ public class RSocketSecurity {
 	public class AuthorizePayloadsSpec {
 
 		private PayloadExchangeMatcherReactiveAuthorizationManager.Builder authzBuilder = PayloadExchangeMatcherReactiveAuthorizationManager
-				.builder();
+			.builder();
 
 		public Access setup() {
 			return matcher(PayloadExchangeMatchers.setup());
@@ -429,7 +429,7 @@ public class RSocketSecurity {
 			public AuthorizePayloadsSpec access(
 					ReactiveAuthorizationManager<PayloadExchangeAuthorizationContext> authorization) {
 				AuthorizePayloadsSpec.this.authzBuilder
-						.add(new PayloadExchangeMatcherEntry<>(this.matcher, authorization));
+					.add(new PayloadExchangeMatcherEntry<>(this.matcher, authorization));
 				return AuthorizePayloadsSpec.this;
 			}
 

config/src/main/java/org/springframework/security/config/annotation/rsocket/SecuritySocketAcceptorInterceptorConfiguration.java

@@ -37,7 +37,7 @@ class SecuritySocketAcceptorInterceptorConfiguration {
 			ObjectProvider<PayloadSocketAcceptorInterceptor> rsocketInterceptor,
 			ObjectProvider<RSocketSecurity> rsocketSecurity) {
 		PayloadSocketAcceptorInterceptor delegate = rsocketInterceptor
-				.getIfAvailable(() -> defaultInterceptor(rsocketSecurity));
+			.getIfAvailable(() -> defaultInterceptor(rsocketSecurity));
 		return new SecuritySocketAcceptorInterceptor(delegate);
 	}
 

config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java

@@ -213,7 +213,7 @@ public abstract class AbstractRequestMatcherRegistry<C> {
 	private Map<String, ? extends ServletRegistration> mappableServletRegistrations(ServletContext servletContext) {
 		Map<String, ServletRegistration> mappable = new LinkedHashMap<>();
 		for (Map.Entry<String, ? extends ServletRegistration> entry : servletContext.getServletRegistrations()
-				.entrySet()) {
+			.entrySet()) {
 			if (!entry.getValue().getMappings().isEmpty()) {
 				mappable.put(entry.getKey(), entry.getValue());
 			}

config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java

@@ -1233,7 +1233,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
 			throws Exception {
 		ApplicationContext context = getContext();
 		authorizeRequestsCustomizer
-				.customize(getOrApply(new ExpressionUrlAuthorizationConfigurer<>(context)).getRegistry());
+			.customize(getOrApply(new ExpressionUrlAuthorizationConfigurer<>(context)).getRegistry());
 		return HttpSecurity.this;
 	}
 
@@ -1463,7 +1463,7 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
 			throws Exception {
 		ApplicationContext context = getContext();
 		authorizeHttpRequestsCustomizer
-				.customize(getOrApply(new AuthorizeHttpRequestsConfigurer<>(context)).getRegistry());
+			.customize(getOrApply(new AuthorizeHttpRequestsConfigurer<>(context)).getRegistry());
 		return HttpSecurity.this;
 	}
 

config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java

@@ -291,13 +291,13 @@ public final class WebSecurity extends AbstractConfiguredSecurityBuilder<Filter,
 			SecurityFilterChain securityFilterChain = new DefaultSecurityFilterChain(ignoredRequest);
 			securityFilterChains.add(securityFilterChain);
 			requestMatcherPrivilegeEvaluatorsEntries
-					.add(getRequestMatcherPrivilegeEvaluatorsEntry(securityFilterChain));
+				.add(getRequestMatcherPrivilegeEvaluatorsEntry(securityFilterChain));
 		}
 		for (SecurityBuilder<? extends SecurityFilterChain> securityFilterChainBuilder : this.securityFilterChainBuilders) {
 			SecurityFilterChain securityFilterChain = securityFilterChainBuilder.build();
 			securityFilterChains.add(securityFilterChain);
 			requestMatcherPrivilegeEvaluatorsEntries
-					.add(getRequestMatcherPrivilegeEvaluatorsEntry(securityFilterChain));
+				.add(getRequestMatcherPrivilegeEvaluatorsEntry(securityFilterChain));
 		}
 		if (this.privilegeEvaluator == null) {
 			this.privilegeEvaluator = new RequestMatcherDelegatingWebInvocationPrivilegeEvaluator(
@@ -346,7 +346,7 @@ public final class WebSecurity extends AbstractConfiguredSecurityBuilder<Filter,
 			}
 			if (filter instanceof AuthorizationFilter) {
 				AuthorizationManager<HttpServletRequest> authorizationManager = ((AuthorizationFilter) filter)
-						.getAuthorizationManager();
+					.getAuthorizationManager();
 				AuthorizationManagerWebInvocationPrivilegeEvaluator evaluator = new AuthorizationManagerWebInvocationPrivilegeEvaluator(
 						authorizationManager);
 				evaluator.setServletContext(this.servletContext);
@@ -366,7 +366,7 @@ public final class WebSecurity extends AbstractConfiguredSecurityBuilder<Filter,
 		}
 		try {
 			this.defaultWebSecurityExpressionHandler
-					.setPermissionEvaluator(applicationContext.getBean(PermissionEvaluator.class));
+				.setPermissionEvaluator(applicationContext.getBean(PermissionEvaluator.class));
 		}
 		catch (NoSuchBeanDefinitionException ex) {
 		}

config/src/main/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurity.java

@@ -75,7 +75,6 @@ import org.springframework.security.web.SecurityFilterChain;
  * </pre>
  *
  * @see WebSecurityConfigurer
- *
  * @author Rob Winch
  * @since 3.2
  */

config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java

@@ -70,7 +70,7 @@ class HttpSecurityConfiguration {
 	private ApplicationContext context;
 
 	private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-			.getContextHolderStrategy();
+		.getContextHolderStrategy();
 
 	private ContentNegotiationStrategy contentNegotiationStrategy = new HeaderContentNegotiationStrategy();
 
@@ -142,7 +142,7 @@ class HttpSecurityConfiguration {
 	private void applyDefaultConfigurers(HttpSecurity http) throws Exception {
 		ClassLoader classLoader = this.context.getClassLoader();
 		List<AbstractHttpConfigurer> defaultHttpConfigurers = SpringFactoriesLoader
-				.loadFactories(AbstractHttpConfigurer.class, classLoader);
+			.loadFactories(AbstractHttpConfigurer.class, classLoader);
 		for (AbstractHttpConfigurer configurer : defaultHttpConfigurers) {
 			http.apply(configurer);
 		}

config/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2ImportSelector.java

@@ -48,11 +48,11 @@ final class OAuth2ImportSelector implements ImportSelector {
 		Set<String> imports = new LinkedHashSet<>();
 		ClassLoader classLoader = getClass().getClassLoader();
 		boolean oauth2ClientPresent = ClassUtils
-				.isPresent("org.springframework.security.oauth2.client.registration.ClientRegistration", classLoader);
+			.isPresent("org.springframework.security.oauth2.client.registration.ClientRegistration", classLoader);
 		boolean webfluxPresent = ClassUtils
-				.isPresent("org.springframework.web.reactive.function.client.ExchangeFilterFunction", classLoader);
+			.isPresent("org.springframework.web.reactive.function.client.ExchangeFilterFunction", classLoader);
 		boolean oauth2ResourceServerPresent = ClassUtils
-				.isPresent("org.springframework.security.oauth2.server.resource.BearerTokenError", classLoader);
+			.isPresent("org.springframework.security.oauth2.server.resource.BearerTokenError", classLoader);
 		if (oauth2ClientPresent) {
 			imports.add("org.springframework.security.config.annotation.web.configuration.OAuth2ClientConfiguration");
 		}

config/src/main/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfiguration.java

@@ -65,7 +65,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 class SecurityReactorContextConfiguration {
 
 	private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-			.getContextHolderStrategy();
+		.getContextHolderStrategy();
 
 	@Bean
 	SecurityReactorContextSubscriberRegistrar securityReactorContextSubscriberRegistrar() {
@@ -87,7 +87,7 @@ class SecurityReactorContextConfiguration {
 		private final Map<Object, Supplier<Object>> CONTEXT_ATTRIBUTE_VALUE_LOADERS = new HashMap<>();
 
 		private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-				.getContextHolderStrategy();
+			.getContextHolderStrategy();
 
 		SecurityReactorContextSubscriberRegistrar() {
 			this.CONTEXT_ATTRIBUTE_VALUE_LOADERS.put(HttpServletRequest.class,
@@ -100,7 +100,7 @@ class SecurityReactorContextConfiguration {
 		@Override
 		public void afterPropertiesSet() throws Exception {
 			Function<? super Publisher<Object>, ? extends Publisher<Object>> lifter = Operators
-					.liftPublisher((pub, sub) -> createSubscriberIfNecessary(sub));
+				.liftPublisher((pub, sub) -> createSubscriberIfNecessary(sub));
 			Hooks.onLastOperator(SECURITY_REACTOR_CONTEXT_OPERATOR_KEY, lifter::apply);
 		}
 

config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java

@@ -39,8 +39,8 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
  * Used to add a {@link RequestDataValueProcessor} for Spring MVC and Spring Security CSRF
  * integration. This configuration is added whenever {@link EnableWebMvc} is added by
  * <a href="
- * {@docRoot}/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.html">SpringWebMvcImportSelector</a>
- * and the DispatcherServlet is present on the classpath. It also adds the
+ * {@docRoot}/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.html">SpringWebMvcImportSelector</a> and
+ * the DispatcherServlet is present on the classpath. It also adds the
  * {@link AuthenticationPrincipalArgumentResolver} as a
  * {@link HandlerMethodArgumentResolver}.
  *
@@ -53,7 +53,7 @@ class WebMvcSecurityConfiguration implements WebMvcConfigurer, ApplicationContex
 	private BeanResolver beanResolver;
 
 	private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-			.getContextHolderStrategy();
+		.getContextHolderStrategy();
 
 	@Override
 	@SuppressWarnings("deprecation")
@@ -63,7 +63,7 @@ class WebMvcSecurityConfiguration implements WebMvcConfigurer, ApplicationContex
 		authenticationPrincipalResolver.setSecurityContextHolderStrategy(this.securityContextHolderStrategy);
 		argumentResolvers.add(authenticationPrincipalResolver);
 		argumentResolvers
-				.add(new org.springframework.security.web.bind.support.AuthenticationPrincipalArgumentResolver());
+			.add(new org.springframework.security.web.bind.support.AuthenticationPrincipalArgumentResolver());
 		CurrentSecurityContextArgumentResolver currentSecurityContextArgumentResolver = new CurrentSecurityContextArgumentResolver();
 		currentSecurityContextArgumentResolver.setBeanResolver(this.beanResolver);
 		currentSecurityContextArgumentResolver.setSecurityContextHolderStrategy(this.securityContextHolderStrategy);

config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java

@@ -150,7 +150,8 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa
 			this.webSecurity.debug(this.debugEnabled);
 		}
 		List<SecurityConfigurer<Filter, WebSecurity>> webSecurityConfigurers = new AutowiredWebSecurityConfigurersIgnoreParents(
-				beanFactory).getWebSecurityConfigurers();
+				beanFactory)
+			.getWebSecurityConfigurers();
 		webSecurityConfigurers.sort(AnnotationAwareOrderComparator.INSTANCE);
 		Integer previousOrder = null;
 		Object previousConfig = null;
@@ -187,7 +188,7 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa
 	@Override
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		Map<String, Object> enableWebSecurityAttrMap = importMetadata
-				.getAnnotationAttributes(EnableWebSecurity.class.getName());
+			.getAnnotationAttributes(EnableWebSecurity.class.getName());
 		AnnotationAttributes enableWebSecurityAttrs = AnnotationAttributes.fromMap(enableWebSecurityAttrMap);
 		this.debugEnabled = enableWebSecurityAttrs.getBoolean("debug");
 		if (this.webSecurity != null) {

config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractAuthenticationFilterConfigurer.java

@@ -283,7 +283,7 @@ public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecur
 			this.authFilter.setAuthenticationDetailsSource(this.authenticationDetailsSource);
 		}
 		SessionAuthenticationStrategy sessionAuthenticationStrategy = http
-				.getSharedObject(SessionAuthenticationStrategy.class);
+			.getSharedObject(SessionAuthenticationStrategy.class);
 		if (sessionAuthenticationStrategy != null) {
 			this.authFilter.setSessionAuthenticationStrategy(sessionAuthenticationStrategy);
 		}
@@ -294,7 +294,7 @@ public abstract class AbstractAuthenticationFilterConfigurer<B extends HttpSecur
 		SecurityContextConfigurer securityContextConfigurer = http.getConfigurer(SecurityContextConfigurer.class);
 		if (securityContextConfigurer != null && securityContextConfigurer.isRequireExplicitSave()) {
 			SecurityContextRepository securityContextRepository = securityContextConfigurer
-					.getSecurityContextRepository();
+				.getSecurityContextRepository();
 			this.authFilter.setSecurityContextRepository(securityContextRepository);
 		}
 		this.authFilter.setSecurityContextHolderStrategy(getSecurityContextHolderStrategy());

config/src/main/java/org/springframework/security/config/annotation/web/configurers/AuthorizeHttpRequestsConfigurer.java

@@ -132,7 +132,7 @@ public final class AuthorizeHttpRequestsConfigurer<H extends HttpSecurityBuilder
 			extends AbstractRequestMatcherRegistry<AuthorizedUrl> {
 
 		private final RequestMatcherDelegatingAuthorizationManager.Builder managerBuilder = RequestMatcherDelegatingAuthorizationManager
-				.builder();
+			.builder();
 
 		private List<RequestMatcher> unmappedMatchers;
 

config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java

@@ -174,7 +174,7 @@ public final class ExpressionUrlAuthorizationConfigurer<H extends HttpSecurityBu
 			String[] grantedAuthorityDefaultsBeanNames = context.getBeanNamesForType(GrantedAuthorityDefaults.class);
 			if (grantedAuthorityDefaultsBeanNames.length == 1) {
 				GrantedAuthorityDefaults grantedAuthorityDefaults = context
-						.getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class);
+					.getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class);
 				defaultHandler.setDefaultRolePrefix(grantedAuthorityDefaults.getRolePrefix());
 			}
 			String[] permissionEvaluatorBeanNames = context.getBeanNamesForType(PermissionEvaluator.class);
@@ -294,7 +294,7 @@ public final class ExpressionUrlAuthorizationConfigurer<H extends HttpSecurityBu
 		 */
 		public ExpressionInterceptUrlRegistry hasRole(String role) {
 			return access(ExpressionUrlAuthorizationConfigurer
-					.hasRole(ExpressionUrlAuthorizationConfigurer.this.rolePrefix, role));
+				.hasRole(ExpressionUrlAuthorizationConfigurer.this.rolePrefix, role));
 		}
 
 		/**
@@ -308,7 +308,7 @@ public final class ExpressionUrlAuthorizationConfigurer<H extends HttpSecurityBu
 		 */
 		public ExpressionInterceptUrlRegistry hasAnyRole(String... roles) {
 			return access(ExpressionUrlAuthorizationConfigurer
-					.hasAnyRole(ExpressionUrlAuthorizationConfigurer.this.rolePrefix, roles));
+				.hasAnyRole(ExpressionUrlAuthorizationConfigurer.this.rolePrefix, roles));
 		}
 
 		/**

config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java

@@ -260,7 +260,7 @@ public final class FormLoginConfigurer<H extends HttpSecurityBuilder<H>> extends
 	 */
 	private void initDefaultLoginFilter(H http) {
 		DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http
-				.getSharedObject(DefaultLoginPageGeneratingFilter.class);
+			.getSharedObject(DefaultLoginPageGeneratingFilter.class);
 		if (loginPageGeneratingFilter != null && !isCustomLoginPage()) {
 			loginPageGeneratingFilter.setFormLoginEnabled(true);
 			loginPageGeneratingFilter.setUsernameParameter(getUsernameParameter());

config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java

@@ -192,8 +192,8 @@ public final class JeeConfigurer<H extends HttpSecurityBuilder<H>> extends Abstr
 		PreAuthenticatedAuthenticationProvider authenticationProvider = new PreAuthenticatedAuthenticationProvider();
 		authenticationProvider.setPreAuthenticatedUserDetailsService(getUserDetailsService());
 		authenticationProvider = postProcess(authenticationProvider);
-		http.authenticationProvider(authenticationProvider).setSharedObject(AuthenticationEntryPoint.class,
-				new Http403ForbiddenEntryPoint());
+		http.authenticationProvider(authenticationProvider)
+			.setSharedObject(AuthenticationEntryPoint.class, new Http403ForbiddenEntryPoint());
 	}
 
 	@Override
@@ -214,9 +214,9 @@ public final class JeeConfigurer<H extends HttpSecurityBuilder<H>> extends Abstr
 			this.j2eePreAuthenticatedProcessingFilter = new J2eePreAuthenticatedProcessingFilter();
 			this.j2eePreAuthenticatedProcessingFilter.setAuthenticationManager(authenticationManager);
 			this.j2eePreAuthenticatedProcessingFilter
-					.setAuthenticationDetailsSource(createWebAuthenticationDetailsSource());
+				.setAuthenticationDetailsSource(createWebAuthenticationDetailsSource());
 			this.j2eePreAuthenticatedProcessingFilter
-					.setSecurityContextHolderStrategy(getSecurityContextHolderStrategy());
+				.setSecurityContextHolderStrategy(getSecurityContextHolderStrategy());
 			this.j2eePreAuthenticatedProcessingFilter = postProcess(this.j2eePreAuthenticatedProcessingFilter);
 		}
 

config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java

@@ -280,7 +280,7 @@ public final class LogoutConfigurer<H extends HttpSecurityBuilder<H>>
 			PermitAllSupport.permitAll(http, this.getLogoutRequestMatcher(http));
 		}
 		DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http
-				.getSharedObject(DefaultLoginPageGeneratingFilter.class);
+			.getSharedObject(DefaultLoginPageGeneratingFilter.class);
 		if (loginPageGeneratingFilter != null && !isCustomLogoutSuccess()) {
 			loginPageGeneratingFilter.setLogoutSuccessUrl(getLogoutSuccessUrl());
 		}

config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java

@@ -47,7 +47,7 @@ final class PermitAllSupport {
 	static void permitAll(HttpSecurityBuilder<? extends HttpSecurityBuilder<?>> http,
 			RequestMatcher... requestMatchers) {
 		ExpressionUrlAuthorizationConfigurer<?> configurer = http
-				.getConfigurer(ExpressionUrlAuthorizationConfigurer.class);
+			.getConfigurer(ExpressionUrlAuthorizationConfigurer.class);
 		AuthorizeHttpRequestsConfigurer<?> httpConfigurer = http.getConfigurer(AuthorizeHttpRequestsConfigurer.class);
 
 		boolean oneConfigurerPresent = configurer == null ^ httpConfigurer == null;
@@ -58,8 +58,9 @@ final class PermitAllSupport {
 		for (RequestMatcher matcher : requestMatchers) {
 			if (matcher != null) {
 				if (configurer != null) {
-					configurer.getRegistry().addMapping(0, new UrlMapping(matcher,
-							SecurityConfig.createList(ExpressionUrlAuthorizationConfigurer.permitAll)));
+					configurer.getRegistry()
+						.addMapping(0, new UrlMapping(matcher,
+								SecurityConfig.createList(ExpressionUrlAuthorizationConfigurer.permitAll)));
 				}
 				else {
 					httpConfigurer.addFirst(matcher, AuthorizeHttpRequestsConfigurer.permitAllAuthorizationManager);

config/src/main/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurer.java

@@ -292,7 +292,7 @@ public final class RememberMeConfigurer<H extends HttpSecurityBuilder<H>>
 		SecurityContextConfigurer<?> securityContextConfigurer = http.getConfigurer(SecurityContextConfigurer.class);
 		if (securityContextConfigurer != null && securityContextConfigurer.isRequireExplicitSave()) {
 			SecurityContextRepository securityContextRepository = securityContextConfigurer
-					.getSecurityContextRepository();
+				.getSecurityContextRepository();
 			rememberMeFilter.setSecurityContextRepository(securityContextRepository);
 		}
 		rememberMeFilter.setSecurityContextHolderStrategy(getSecurityContextHolderStrategy());
@@ -325,7 +325,7 @@ public final class RememberMeConfigurer<H extends HttpSecurityBuilder<H>>
 	 */
 	private void initDefaultLoginFilter(H http) {
 		DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http
-				.getSharedObject(DefaultLoginPageGeneratingFilter.class);
+			.getSharedObject(DefaultLoginPageGeneratingFilter.class);
 		if (loginPageGeneratingFilter != null) {
 			loginPageGeneratingFilter.setRememberMeParameter(getRememberMeParameter());
 		}

config/src/main/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurer.java

@@ -96,7 +96,7 @@ public final class SecurityContextConfigurer<H extends HttpSecurityBuilder<H>>
 
 	SecurityContextRepository getSecurityContextRepository() {
 		SecurityContextRepository securityContextRepository = getBuilder()
-				.getSharedObject(SecurityContextRepository.class);
+			.getSharedObject(SecurityContextRepository.class);
 		if (securityContextRepository == null) {
 			securityContextRepository = new DelegatingSecurityContextRepository(
 					new RequestAttributeSecurityContextRepository(), new HttpSessionSecurityContextRepository());

config/src/main/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurer.java

@@ -95,7 +95,7 @@ public final class ServletApiConfigurer<H extends HttpSecurityBuilder<H>>
 			String[] grantedAuthorityDefaultsBeanNames = context.getBeanNamesForType(GrantedAuthorityDefaults.class);
 			if (grantedAuthorityDefaultsBeanNames.length == 1) {
 				GrantedAuthorityDefaults grantedAuthorityDefaults = context
-						.getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class);
+					.getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class);
 				this.securityContextRequestFilter.setRolePrefix(grantedAuthorityDefaults.getRolePrefix());
 			}
 			this.securityContextRequestFilter.setSecurityContextHolderStrategy(getSecurityContextHolderStrategy());

config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java

@@ -210,7 +210,7 @@ public final class SessionManagementConfigurer<H extends HttpSecurityBuilder<H>>
 	public SessionManagementConfigurer<H> sessionAuthenticationErrorUrl(String sessionAuthenticationErrorUrl) {
 		this.sessionAuthenticationErrorUrl = sessionAuthenticationErrorUrl;
 		this.propertiesThatRequireImplicitAuthentication
-				.add("sessionAuthenticationErrorUrl = " + sessionAuthenticationErrorUrl);
+			.add("sessionAuthenticationErrorUrl = " + sessionAuthenticationErrorUrl);
 		return this;
 	}
 
@@ -227,7 +227,7 @@ public final class SessionManagementConfigurer<H extends HttpSecurityBuilder<H>>
 			AuthenticationFailureHandler sessionAuthenticationFailureHandler) {
 		this.sessionAuthenticationFailureHandler = sessionAuthenticationFailureHandler;
 		this.propertiesThatRequireImplicitAuthentication
-				.add("sessionAuthenticationFailureHandler = " + sessionAuthenticationFailureHandler);
+			.add("sessionAuthenticationFailureHandler = " + sessionAuthenticationFailureHandler);
 		return this;
 	}
 
@@ -286,7 +286,7 @@ public final class SessionManagementConfigurer<H extends HttpSecurityBuilder<H>>
 			SessionAuthenticationStrategy sessionAuthenticationStrategy) {
 		this.providedSessionAuthenticationStrategy = sessionAuthenticationStrategy;
 		this.propertiesThatRequireImplicitAuthentication
-				.add("sessionAuthenticationStrategy = " + sessionAuthenticationStrategy);
+			.add("sessionAuthenticationStrategy = " + sessionAuthenticationStrategy);
 		return this;
 	}
 
@@ -415,7 +415,7 @@ public final class SessionManagementConfigurer<H extends HttpSecurityBuilder<H>>
 
 	private boolean shouldRequireExplicitAuthenticationStrategy() {
 		boolean defaultRequireExplicitAuthenticationStrategy = this.propertiesThatRequireImplicitAuthentication
-				.isEmpty();
+			.isEmpty();
 		if (this.requireExplicitAuthenticationStrategy == null) {
 			// explicit is not set, use default
 			return defaultRequireExplicitAuthenticationStrategy;

config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java

@@ -173,8 +173,8 @@ public final class X509Configurer<H extends HttpSecurityBuilder<H>>
 	public void init(H http) {
 		PreAuthenticatedAuthenticationProvider authenticationProvider = new PreAuthenticatedAuthenticationProvider();
 		authenticationProvider.setPreAuthenticatedUserDetailsService(getAuthenticationUserDetailsService(http));
-		http.authenticationProvider(authenticationProvider).setSharedObject(AuthenticationEntryPoint.class,
-				new Http403ForbiddenEntryPoint());
+		http.authenticationProvider(authenticationProvider)
+			.setSharedObject(AuthenticationEntryPoint.class, new Http403ForbiddenEntryPoint());
 	}
 
 	@Override

config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurer.java

@@ -265,7 +265,7 @@ public final class OAuth2ClientConfigurer<B extends HttpSecurityBuilder<B>>
 					resolver);
 			if (this.authorizationRequestRepository != null) {
 				authorizationRequestRedirectFilter
-						.setAuthorizationRequestRepository(this.authorizationRequestRepository);
+					.setAuthorizationRequestRepository(this.authorizationRequestRepository);
 			}
 			if (this.authorizationRedirectStrategy != null) {
 				authorizationRequestRedirectFilter.setAuthorizationRedirectStrategy(this.authorizationRedirectStrategy);
@@ -282,7 +282,7 @@ public final class OAuth2ClientConfigurer<B extends HttpSecurityBuilder<B>>
 				return this.authorizationRequestResolver;
 			}
 			ClientRegistrationRepository clientRegistrationRepository = OAuth2ClientConfigurerUtils
-					.getClientRegistrationRepository(getBuilder());
+				.getClientRegistrationRepository(getBuilder());
 			return new DefaultOAuth2AuthorizationRequestResolver(clientRegistrationRepository,
 					OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI);
 		}

config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerUtils.java

@@ -43,7 +43,7 @@ final class OAuth2ClientConfigurerUtils {
 
 	static <B extends HttpSecurityBuilder<B>> ClientRegistrationRepository getClientRegistrationRepository(B builder) {
 		ClientRegistrationRepository clientRegistrationRepository = builder
-				.getSharedObject(ClientRegistrationRepository.class);
+			.getSharedObject(ClientRegistrationRepository.class);
 		if (clientRegistrationRepository == null) {
 			clientRegistrationRepository = getClientRegistrationRepositoryBean(builder);
 			builder.setSharedObject(ClientRegistrationRepository.class, clientRegistrationRepository);
@@ -59,7 +59,7 @@ final class OAuth2ClientConfigurerUtils {
 	static <B extends HttpSecurityBuilder<B>> OAuth2AuthorizedClientRepository getAuthorizedClientRepository(
 			B builder) {
 		OAuth2AuthorizedClientRepository authorizedClientRepository = builder
-				.getSharedObject(OAuth2AuthorizedClientRepository.class);
+			.getSharedObject(OAuth2AuthorizedClientRepository.class);
 		if (authorizedClientRepository == null) {
 			authorizedClientRepository = getAuthorizedClientRepositoryBean(builder);
 			if (authorizedClientRepository == null) {
@@ -74,8 +74,8 @@ final class OAuth2ClientConfigurerUtils {
 	private static <B extends HttpSecurityBuilder<B>> OAuth2AuthorizedClientRepository getAuthorizedClientRepositoryBean(
 			B builder) {
 		Map<String, OAuth2AuthorizedClientRepository> authorizedClientRepositoryMap = BeanFactoryUtils
-				.beansOfTypeIncludingAncestors(builder.getSharedObject(ApplicationContext.class),
-						OAuth2AuthorizedClientRepository.class);
+			.beansOfTypeIncludingAncestors(builder.getSharedObject(ApplicationContext.class),
+					OAuth2AuthorizedClientRepository.class);
 		if (authorizedClientRepositoryMap.size() > 1) {
 			throw new NoUniqueBeanDefinitionException(OAuth2AuthorizedClientRepository.class,
 					authorizedClientRepositoryMap.size(),
@@ -100,8 +100,8 @@ final class OAuth2ClientConfigurerUtils {
 	private static <B extends HttpSecurityBuilder<B>> OAuth2AuthorizedClientService getAuthorizedClientServiceBean(
 			B builder) {
 		Map<String, OAuth2AuthorizedClientService> authorizedClientServiceMap = BeanFactoryUtils
-				.beansOfTypeIncludingAncestors(builder.getSharedObject(ApplicationContext.class),
-						OAuth2AuthorizedClientService.class);
+			.beansOfTypeIncludingAncestors(builder.getSharedObject(ApplicationContext.class),
+					OAuth2AuthorizedClientService.class);
 		if (authorizedClientServiceMap.size() > 1) {
 			throw new NoUniqueBeanDefinitionException(OAuth2AuthorizedClientService.class,
 					authorizedClientServiceMap.size(),

config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2LoginConfigurer.java

@@ -343,7 +343,7 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
 		}
 		http.authenticationProvider(this.postProcess(oauth2LoginAuthenticationProvider));
 		boolean oidcAuthenticationProviderEnabled = ClassUtils
-				.isPresent("org.springframework.security.oauth2.jwt.JwtDecoder", this.getClass().getClassLoader());
+			.isPresent("org.springframework.security.oauth2.jwt.JwtDecoder", this.getClass().getClassLoader());
 		if (oidcAuthenticationProviderEnabled) {
 			OAuth2UserService<OidcUserRequest, OidcUser> oidcUserService = getOidcUserService();
 			OidcAuthorizationCodeAuthenticationProvider oidcAuthorizationCodeAuthenticationProvider = new OidcAuthorizationCodeAuthenticationProvider(
@@ -381,11 +381,11 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
 		}
 		if (this.authorizationEndpointConfig.authorizationRequestRepository != null) {
 			authorizationRequestFilter
-					.setAuthorizationRequestRepository(this.authorizationEndpointConfig.authorizationRequestRepository);
+				.setAuthorizationRequestRepository(this.authorizationEndpointConfig.authorizationRequestRepository);
 		}
 		if (this.authorizationEndpointConfig.authorizationRedirectStrategy != null) {
 			authorizationRequestFilter
-					.setAuthorizationRedirectStrategy(this.authorizationEndpointConfig.authorizationRedirectStrategy);
+				.setAuthorizationRedirectStrategy(this.authorizationEndpointConfig.authorizationRedirectStrategy);
 		}
 		RequestCache requestCache = http.getSharedObject(RequestCache.class);
 		if (requestCache != null) {
@@ -398,7 +398,7 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
 		}
 		if (this.authorizationEndpointConfig.authorizationRequestRepository != null) {
 			authenticationFilter
-					.setAuthorizationRequestRepository(this.authorizationEndpointConfig.authorizationRequestRepository);
+				.setAuthorizationRequestRepository(this.authorizationEndpointConfig.authorizationRequestRepository);
 		}
 		super.configure(http);
 	}
@@ -416,15 +416,16 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
 			throw new NoUniqueBeanDefinitionException(type, names);
 		}
 		if (names.length == 1) {
-			return (JwtDecoderFactory<ClientRegistration>) this.getBuilder().getSharedObject(ApplicationContext.class)
-					.getBean(names[0]);
+			return (JwtDecoderFactory<ClientRegistration>) this.getBuilder()
+				.getSharedObject(ApplicationContext.class)
+				.getBean(names[0]);
 		}
 		return null;
 	}
 
 	private GrantedAuthoritiesMapper getGrantedAuthoritiesMapper() {
 		GrantedAuthoritiesMapper grantedAuthoritiesMapper = this.getBuilder()
-				.getSharedObject(GrantedAuthoritiesMapper.class);
+			.getSharedObject(GrantedAuthoritiesMapper.class);
 		if (grantedAuthoritiesMapper == null) {
 			grantedAuthoritiesMapper = this.getGrantedAuthoritiesMapperBean();
 			if (grantedAuthoritiesMapper != null) {
@@ -436,8 +437,8 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
 
 	private GrantedAuthoritiesMapper getGrantedAuthoritiesMapperBean() {
 		Map<String, GrantedAuthoritiesMapper> grantedAuthoritiesMapperMap = BeanFactoryUtils
-				.beansOfTypeIncludingAncestors(this.getBuilder().getSharedObject(ApplicationContext.class),
-						GrantedAuthoritiesMapper.class);
+			.beansOfTypeIncludingAncestors(this.getBuilder().getSharedObject(ApplicationContext.class),
+					GrantedAuthoritiesMapper.class);
 		return (!grantedAuthoritiesMapperMap.isEmpty() ? grantedAuthoritiesMapperMap.values().iterator().next() : null);
 	}
 
@@ -474,7 +475,7 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
 
 	private void initDefaultLoginFilter(B http) {
 		DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http
-				.getSharedObject(DefaultLoginPageGeneratingFilter.class);
+			.getSharedObject(DefaultLoginPageGeneratingFilter.class);
 		if (loginPageGeneratingFilter == null || this.isCustomLoginPage()) {
 			return;
 		}
@@ -488,7 +489,7 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
 	private Map<String, String> getLoginLinks() {
 		Iterable<ClientRegistration> clientRegistrations = null;
 		ClientRegistrationRepository clientRegistrationRepository = OAuth2ClientConfigurerUtils
-				.getClientRegistrationRepository(this.getBuilder());
+			.getClientRegistrationRepository(this.getBuilder());
 		ResolvableType type = ResolvableType.forInstance(clientRegistrationRepository).as(Iterable.class);
 		if (type != ResolvableType.NONE && ClientRegistration.class.isAssignableFrom(type.resolveGenerics()[0])) {
 			clientRegistrations = (Iterable<ClientRegistration>) clientRegistrationRepository;
@@ -528,13 +529,13 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
 
 	private RequestMatcher getFormLoginNotEnabledRequestMatcher(B http) {
 		DefaultLoginPageGeneratingFilter defaultLoginPageGeneratingFilter = http
-				.getSharedObject(DefaultLoginPageGeneratingFilter.class);
+			.getSharedObject(DefaultLoginPageGeneratingFilter.class);
 		Field formLoginEnabledField = (defaultLoginPageGeneratingFilter != null)
 				? ReflectionUtils.findField(DefaultLoginPageGeneratingFilter.class, "formLoginEnabled") : null;
 		if (formLoginEnabledField != null) {
 			ReflectionUtils.makeAccessible(formLoginEnabledField);
 			return (request) -> Boolean.FALSE
-					.equals(ReflectionUtils.getField(formLoginEnabledField, defaultLoginPageGeneratingFilter));
+				.equals(ReflectionUtils.getField(formLoginEnabledField, defaultLoginPageGeneratingFilter));
 		}
 		return AnyRequestMatcher.INSTANCE;
 	}
@@ -740,8 +741,8 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
 		 */
 		public UserInfoEndpointConfig userAuthoritiesMapper(GrantedAuthoritiesMapper userAuthoritiesMapper) {
 			Assert.notNull(userAuthoritiesMapper, "userAuthoritiesMapper cannot be null");
-			OAuth2LoginConfigurer.this.getBuilder().setSharedObject(GrantedAuthoritiesMapper.class,
-					userAuthoritiesMapper);
+			OAuth2LoginConfigurer.this.getBuilder()
+				.setSharedObject(GrantedAuthoritiesMapper.class, userAuthoritiesMapper);
 			return this;
 		}
 
@@ -764,7 +765,7 @@ public final class OAuth2LoginConfigurer<B extends HttpSecurityBuilder<B>>
 		public Authentication authenticate(Authentication authentication) throws AuthenticationException {
 			OAuth2LoginAuthenticationToken authorizationCodeAuthentication = (OAuth2LoginAuthenticationToken) authentication;
 			OAuth2AuthorizationRequest authorizationRequest = authorizationCodeAuthentication.getAuthorizationExchange()
-					.getAuthorizationRequest();
+				.getAuthorizationRequest();
 			if (authorizationRequest.getScopes().contains(OidcScopes.OPENID)) {
 				// Section 3.1.2.1 Authentication Request -
 				// https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest scope

config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java

@@ -313,7 +313,7 @@ public final class OAuth2ResourceServerConfigurer<H extends HttpSecurityBuilder<
 		ExceptionHandlingConfigurer<H> exceptionHandling = http.getConfigurer(ExceptionHandlingConfigurer.class);
 		if (exceptionHandling != null) {
 			ContentNegotiationStrategy contentNegotiationStrategy = http
-					.getSharedObject(ContentNegotiationStrategy.class);
+				.getSharedObject(ContentNegotiationStrategy.class);
 			if (contentNegotiationStrategy == null) {
 				contentNegotiationStrategy = new HeaderContentNegotiationStrategy();
 			}

config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurer.java

@@ -335,7 +335,7 @@ public final class Saml2LoginConfigurer<B extends HttpSecurityBuilder<B>>
 		OpenSaml4AuthenticationRequestResolver openSaml4AuthenticationRequestResolver = new OpenSaml4AuthenticationRequestResolver(
 				relyingPartyRegistrationRepository(http));
 		openSaml4AuthenticationRequestResolver
-				.setRequestMatcher(new AntPathRequestMatcher(this.authenticationRequestUri));
+			.setRequestMatcher(new AntPathRequestMatcher(this.authenticationRequestUri));
 		return openSaml4AuthenticationRequestResolver;
 	}
 
@@ -375,7 +375,7 @@ public final class Saml2LoginConfigurer<B extends HttpSecurityBuilder<B>>
 
 	private void initDefaultLoginFilter(B http) {
 		DefaultLoginPageGeneratingFilter loginPageGeneratingFilter = http
-				.getSharedObject(DefaultLoginPageGeneratingFilter.class);
+			.getSharedObject(DefaultLoginPageGeneratingFilter.class);
 		if (loginPageGeneratingFilter == null || this.isCustomLoginPage()) {
 			return;
 		}

config/src/main/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LogoutConfigurer.java

@@ -301,7 +301,7 @@ public final class Saml2LogoutConfigurer<H extends HttpSecurityBuilder<H>>
 	private Saml2RelyingPartyInitiatedLogoutSuccessHandler createSaml2LogoutRequestSuccessHandler(
 			RelyingPartyRegistrationRepository registrations) {
 		Saml2LogoutRequestResolver logoutRequestResolver = this.logoutRequestConfigurer
-				.logoutRequestResolver(registrations);
+			.logoutRequestResolver(registrations);
 		return new Saml2RelyingPartyInitiatedLogoutSuccessHandler(logoutRequestResolver);
 	}
 

config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java

@@ -235,7 +235,7 @@ public class MessageSecurityMetadataSourceRegistry {
 			matcherToExpression.put(entry.getKey().build(), entry.getValue());
 		}
 		return ExpressionBasedMessageSecurityMetadataSourceFactory
-				.createExpressionMessageMetadataSource(matcherToExpression, this.expressionHandler);
+			.createExpressionMessageMetadataSource(matcherToExpression, this.expressionHandler);
 	}
 
 	/**

config/src/main/java/org/springframework/security/config/annotation/web/reactive/ReactiveOAuth2ClientImportSelector.java

@@ -124,7 +124,12 @@ final class ReactiveOAuth2ClientImportSelector implements ImportSelector {
 			ReactiveOAuth2AuthorizedClientManager authorizedClientManager = null;
 			if (this.authorizedClientRepository != null && this.clientRegistrationRepository != null) {
 				ReactiveOAuth2AuthorizedClientProvider authorizedClientProvider = ReactiveOAuth2AuthorizedClientProviderBuilder
-						.builder().authorizationCode().refreshToken().clientCredentials().password().build();
+					.builder()
+					.authorizationCode()
+					.refreshToken()
+					.clientCredentials()
+					.password()
+					.build();
 				DefaultReactiveOAuth2AuthorizedClientManager defaultReactiveOAuth2AuthorizedClientManager = new DefaultReactiveOAuth2AuthorizedClientManager(
 						this.clientRegistrationRepository, getAuthorizedClientRepository());
 				defaultReactiveOAuth2AuthorizedClientManager.setAuthorizedClientProvider(authorizedClientProvider);

config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java

@@ -138,7 +138,7 @@ class WebFluxSecurityConfiguration {
 		static boolean shouldConfigure(ApplicationContext context) {
 			ClassLoader loader = context.getClassLoader();
 			Class<?> reactiveClientRegistrationRepositoryClass = ClassUtils
-					.resolveClassName(REACTIVE_CLIENT_REGISTRATION_REPOSITORY_CLASSNAME, loader);
+				.resolveClassName(REACTIVE_CLIENT_REGISTRATION_REPOSITORY_CLASSNAME, loader);
 			return context.getBeanNamesForType(reactiveClientRegistrationRepositoryClass).length == 1;
 		}
 

config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/EnableWebMvcSecurity.java

@@ -28,6 +28,7 @@ import org.springframework.security.config.annotation.authentication.configurati
 /**
  * Add this annotation to an {@code @Configuration} class to have the Spring Security
  * configuration integrate with Spring MVC.
+ *
  * @deprecated Use EnableWebSecurity instead which will automatically add the Spring MVC
  * related Security items.
  * @author Rob Winch

config/src/main/java/org/springframework/security/config/annotation/web/servlet/configuration/WebMvcSecurityConfiguration.java

@@ -32,8 +32,8 @@ import org.springframework.web.servlet.support.RequestDataValueProcessor;
  * Used to add a {@link RequestDataValueProcessor} for Spring MVC and Spring Security CSRF
  * integration. This configuration is added whenever {@link EnableWebMvc} is added by
  * <a href="
- * {@docRoot}/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.html">SpringWebMvcImportSelector</a>
- * and the DispatcherServlet is present on the classpath. It also adds the
+ * {@docRoot}/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.html">SpringWebMvcImportSelector</a> and
+ * the DispatcherServlet is present on the classpath. It also adds the
  * {@link AuthenticationPrincipalArgumentResolver} as a
  * {@link HandlerMethodArgumentResolver}.
  *
@@ -51,7 +51,7 @@ public class WebMvcSecurityConfiguration implements WebMvcConfigurer {
 	public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
 		argumentResolvers.add(new AuthenticationPrincipalArgumentResolver());
 		argumentResolvers
-				.add(new org.springframework.security.web.bind.support.AuthenticationPrincipalArgumentResolver());
+			.add(new org.springframework.security.web.bind.support.AuthenticationPrincipalArgumentResolver());
 	}
 
 	@Bean

config/src/main/java/org/springframework/security/config/annotation/web/socket/MessageMatcherAuthorizationManagerConfiguration.java

@@ -29,10 +29,11 @@ final class MessageMatcherAuthorizationManagerConfiguration {
 	@Scope("prototype")
 	MessageMatcherDelegatingAuthorizationManager.Builder messageAuthorizationManagerBuilder(
 			ApplicationContext context) {
-		return MessageMatcherDelegatingAuthorizationManager.builder().simpDestPathMatcher(
-				() -> (context.getBeanNamesForType(SimpAnnotationMethodMessageHandler.class).length > 0)
-						? context.getBean(SimpAnnotationMethodMessageHandler.class).getPathMatcher()
-						: new AntPathMatcher());
+		return MessageMatcherDelegatingAuthorizationManager.builder()
+			.simpDestPathMatcher(
+					() -> (context.getBeanNamesForType(SimpAnnotationMethodMessageHandler.class).length > 0)
+							? context.getBean(SimpAnnotationMethodMessageHandler.class).getPathMatcher()
+							: new AntPathMatcher());
 	}
 
 }

config/src/main/java/org/springframework/security/config/annotation/web/socket/WebSocketMessageBrokerSecurityConfiguration.java

@@ -64,10 +64,13 @@ final class WebSocketMessageBrokerSecurityConfiguration
 	private MessageMatcherDelegatingAuthorizationManager b;
 
 	private static final AuthorizationManager<Message<?>> ANY_MESSAGE_AUTHENTICATED = MessageMatcherDelegatingAuthorizationManager
-			.builder().anyMessage().authenticated().build();
+		.builder()
+		.anyMessage()
+		.authenticated()
+		.build();
 
 	private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-			.getContextHolderStrategy();
+		.getContextHolderStrategy();
 
 	private final SecurityContextChannelInterceptor securityContextChannelInterceptor = new SecurityContextChannelInterceptor();
 

config/src/main/java/org/springframework/security/config/aot/hint/OAuth2LoginRuntimeHints.java

@@ -31,8 +31,9 @@ class OAuth2LoginRuntimeHints implements RuntimeHintsRegistrar {
 
 	@Override
 	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-		hints.reflection().registerTypeIfPresent(classLoader, "org.springframework.security.oauth2.jwt.JwtDecoder",
-				MemberCategory.INVOKE_PUBLIC_METHODS);
+		hints.reflection()
+			.registerTypeIfPresent(classLoader, "org.springframework.security.oauth2.jwt.JwtDecoder",
+					MemberCategory.INVOKE_PUBLIC_METHODS);
 	}
 
 }

config/src/main/java/org/springframework/security/config/authentication/AbstractUserDetailsServiceBeanDefinitionParser.java

@@ -55,12 +55,12 @@ public abstract class AbstractUserDetailsServiceBeanDefinitionParser implements
 		// Register a caching version of the user service if there's a cache-ref
 		if (StringUtils.hasText(cacheRef)) {
 			BeanDefinitionBuilder cachingUSBuilder = BeanDefinitionBuilder
-					.rootBeanDefinition(CachingUserDetailsService.class);
+				.rootBeanDefinition(CachingUserDetailsService.class);
 			cachingUSBuilder.addConstructorArgReference(beanId);
 			cachingUSBuilder.addPropertyValue("userCache", new RuntimeBeanReference(cacheRef));
 			BeanDefinition cachingUserService = cachingUSBuilder.getBeanDefinition();
 			parserContext
-					.registerBeanComponent(new BeanComponentDefinition(cachingUserService, beanId + CACHING_SUFFIX));
+				.registerBeanComponent(new BeanComponentDefinition(cachingUserService, beanId + CACHING_SUFFIX));
 		}
 		return null;
 	}

config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java

@@ -64,8 +64,8 @@ public class AuthenticationManagerBeanDefinitionParser implements BeanDefinition
 		String id = element.getAttribute("id");
 		if (!StringUtils.hasText(id)) {
 			if (pc.getRegistry().containsBeanDefinition(BeanIds.AUTHENTICATION_MANAGER)) {
-				pc.getReaderContext().warning("Overriding globally registered AuthenticationManager",
-						pc.extractSource(element));
+				pc.getReaderContext()
+					.warning("Overriding globally registered AuthenticationManager", pc.extractSource(element));
 			}
 			id = BeanIds.AUTHENTICATION_MANAGER;
 		}
@@ -124,14 +124,16 @@ public class AuthenticationManagerBeanDefinitionParser implements BeanDefinition
 			return new RuntimeBeanReference(providerId);
 		}
 		if (providerElement.getAttributes().getLength() > 1) {
-			pc.getReaderContext().error("authentication-provider element cannot be used with other attributes "
-					+ "when using 'ref' attribute", pc.extractSource(element));
+			pc.getReaderContext()
+				.error("authentication-provider element cannot be used with other attributes "
+						+ "when using 'ref' attribute", pc.extractSource(element));
 		}
 		NodeList providerChildren = providerElement.getChildNodes();
 		for (int i = 0; i < providerChildren.getLength(); i++) {
 			if (providerChildren.item(i) instanceof Element) {
-				pc.getReaderContext().error("authentication-provider element cannot have child elements when used "
-						+ "with 'ref' attribute", pc.extractSource(element));
+				pc.getReaderContext()
+					.error("authentication-provider element cannot have child elements when used "
+							+ "with 'ref' attribute", pc.extractSource(element));
 			}
 		}
 		return new RuntimeBeanReference(ref);

config/src/main/java/org/springframework/security/config/authentication/AuthenticationProviderBeanDefinitionParser.java

@@ -60,9 +60,9 @@ public class AuthenticationProviderBeanDefinitionParser implements BeanDefinitio
 		if (StringUtils.hasText(ref)) {
 			if (userServiceElt != null) {
 				pc.getReaderContext()
-						.error("The " + ATT_USER_DETAILS_REF + " attribute cannot be used in combination with child"
-								+ "elements '" + Elements.USER_SERVICE + "', '" + Elements.JDBC_USER_SERVICE + "' or '"
-								+ Elements.LDAP_USER_SERVICE + "'", element);
+					.error("The " + ATT_USER_DETAILS_REF + " attribute cannot be used in combination with child"
+							+ "elements '" + Elements.USER_SERVICE + "', '" + Elements.JDBC_USER_SERVICE + "' or '"
+							+ Elements.LDAP_USER_SERVICE + "'", element);
 			}
 			authProvider.getPropertyValues().add("userDetailsService", new RuntimeBeanReference(ref));
 		}

config/src/main/java/org/springframework/security/config/authentication/JdbcUserServiceBeanDefinitionParser.java

@@ -46,8 +46,9 @@ public class JdbcUserServiceBeanDefinitionParser extends AbstractUserDetailsServ
 			builder.addPropertyReference("dataSource", dataSource);
 		}
 		else {
-			parserContext.getReaderContext().error(ATT_DATA_SOURCE + " is required for " + Elements.JDBC_USER_SERVICE,
-					parserContext.extractSource(element));
+			parserContext.getReaderContext()
+				.error(ATT_DATA_SOURCE + " is required for " + Elements.JDBC_USER_SERVICE,
+						parserContext.extractSource(element));
 		}
 		String usersQuery = element.getAttribute(ATT_USERS_BY_USERNAME_QUERY);
 		String authoritiesQuery = element.getAttribute(ATT_AUTHORITIES_BY_USERNAME_QUERY);

config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java

@@ -299,11 +299,12 @@ final class AuthenticationConfigBuilder {
 			formFilter.getPropertyValues().addPropertyValue("allowSessionCreation", this.allowSessionCreation);
 			formFilter.getPropertyValues().addPropertyValue("authenticationManager", authManager);
 			if (authenticationFilterSecurityContextRepositoryRef != null) {
-				formFilter.getPropertyValues().addPropertyValue("securityContextRepository",
-						authenticationFilterSecurityContextRepositoryRef);
+				formFilter.getPropertyValues()
+					.addPropertyValue("securityContextRepository", authenticationFilterSecurityContextRepositoryRef);
 			}
-			formFilter.getPropertyValues().addPropertyValue("securityContextHolderStrategy",
-					authenticationFilterSecurityContextHolderStrategyRef);
+			formFilter.getPropertyValues()
+				.addPropertyValue("securityContextHolderStrategy",
+						authenticationFilterSecurityContextHolderStrategyRef);
 			// Id is required by login page filter
 			this.formFilterId = this.pc.getReaderContext().generateBeanName(formFilter);
 			this.pc.registerBeanComponent(new BeanComponentDefinition(formFilter, this.formFilterId));
@@ -337,8 +338,8 @@ final class AuthenticationConfigBuilder {
 		registerDefaultAuthorizedClientRepositoryIfNecessary(defaultAuthorizedClientRepository);
 		oauth2LoginFilterBean.getPropertyValues().addPropertyValue("authenticationManager", authManager);
 		if (authenticationFilterSecurityContextRepositoryRef != null) {
-			oauth2LoginFilterBean.getPropertyValues().addPropertyValue("securityContextRepository",
-					authenticationFilterSecurityContextRepositoryRef);
+			oauth2LoginFilterBean.getPropertyValues()
+				.addPropertyValue("securityContextRepository", authenticationFilterSecurityContextRepositoryRef);
 		}
 
 		// retrieve the other bean result
@@ -350,7 +351,7 @@ final class AuthenticationConfigBuilder {
 		String oauth2LoginAuthProviderId = this.pc.getReaderContext().generateBeanName(oauth2LoginAuthProvider);
 		this.oauth2LoginFilterId = this.pc.getReaderContext().generateBeanName(oauth2LoginFilterBean);
 		String oauth2AuthorizationRequestRedirectFilterId = this.pc.getReaderContext()
-				.generateBeanName(this.oauth2AuthorizationRequestRedirectFilter);
+			.generateBeanName(this.oauth2AuthorizationRequestRedirectFilter);
 		this.oauth2LoginLinks = parser.getOAuth2LoginLinks();
 
 		// register the component
@@ -385,17 +386,17 @@ final class AuthenticationConfigBuilder {
 		registerDefaultAuthorizedClientRepositoryIfNecessary(defaultAuthorizedClientRepository);
 		this.authorizationRequestRedirectFilter = parser.getAuthorizationRequestRedirectFilter();
 		String authorizationRequestRedirectFilterId = this.pc.getReaderContext()
-				.generateBeanName(this.authorizationRequestRedirectFilter);
+			.generateBeanName(this.authorizationRequestRedirectFilter);
 		this.pc.registerBeanComponent(new BeanComponentDefinition(this.authorizationRequestRedirectFilter,
 				authorizationRequestRedirectFilterId));
 		this.authorizationCodeGrantFilter = parser.getAuthorizationCodeGrantFilter();
 		String authorizationCodeGrantFilterId = this.pc.getReaderContext()
-				.generateBeanName(this.authorizationCodeGrantFilter);
+			.generateBeanName(this.authorizationCodeGrantFilter);
 		this.pc.registerBeanComponent(
 				new BeanComponentDefinition(this.authorizationCodeGrantFilter, authorizationCodeGrantFilterId));
 		BeanDefinition authorizationCodeAuthenticationProvider = parser.getAuthorizationCodeAuthenticationProvider();
 		String authorizationCodeAuthenticationProviderId = this.pc.getReaderContext()
-				.generateBeanName(authorizationCodeAuthenticationProvider);
+			.generateBeanName(authorizationCodeAuthenticationProvider);
 		this.pc.registerBeanComponent(new BeanComponentDefinition(authorizationCodeAuthenticationProvider,
 				authorizationCodeAuthenticationProviderId));
 		this.authorizationCodeAuthenticationProviderRef = new RuntimeBeanReference(
@@ -405,7 +406,7 @@ final class AuthenticationConfigBuilder {
 	void registerDefaultAuthorizedClientRepositoryIfNecessary(BeanDefinition defaultAuthorizedClientRepository) {
 		if (!this.defaultAuthorizedClientRepositoryRegistered && defaultAuthorizedClientRepository != null) {
 			String authorizedClientRepositoryId = this.pc.getReaderContext()
-					.generateBeanName(defaultAuthorizedClientRepository);
+				.generateBeanName(defaultAuthorizedClientRepository);
 			this.pc.registerBeanComponent(
 					new BeanComponentDefinition(defaultAuthorizedClientRepository, authorizedClientRepositoryId));
 			this.defaultAuthorizedClientRepositoryRegistered = true;
@@ -418,7 +419,7 @@ final class AuthenticationConfigBuilder {
 		}
 		if (webMvcPresent) {
 			this.pc.getReaderContext()
-					.registerWithGeneratedName(new RootBeanDefinition(OAuth2ClientWebMvcSecurityPostProcessor.class));
+				.registerWithGeneratedName(new RootBeanDefinition(OAuth2ClientWebMvcSecurityPostProcessor.class));
 		}
 	}
 
@@ -437,7 +438,7 @@ final class AuthenticationConfigBuilder {
 
 		this.saml2AuthenticationFilterId = this.pc.getReaderContext().generateBeanName(saml2WebSsoAuthenticationFilter);
 		this.saml2AuthenticationRequestFilterId = this.pc.getReaderContext()
-				.generateBeanName(this.saml2AuthorizationRequestFilter);
+			.generateBeanName(this.saml2AuthorizationRequestFilter);
 		this.saml2AuthenticationUrlToProviderName = parser.getSaml2AuthenticationUrlToProviderName();
 
 		// register the component
@@ -449,8 +450,8 @@ final class AuthenticationConfigBuilder {
 
 	private void injectRememberMeServicesRef(RootBeanDefinition bean, String rememberMeServicesId) {
 		if (rememberMeServicesId != null) {
-			bean.getPropertyValues().addPropertyValue("rememberMeServices",
-					new RuntimeBeanReference(rememberMeServicesId));
+			bean.getPropertyValues()
+				.addPropertyValue("rememberMeServices", new RuntimeBeanReference(rememberMeServicesId));
 		}
 	}
 
@@ -508,7 +509,7 @@ final class AuthenticationConfigBuilder {
 		RootBeanDefinition filter = null;
 		if (x509Elt != null) {
 			BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder
-					.rootBeanDefinition(X509AuthenticationFilter.class);
+				.rootBeanDefinition(X509AuthenticationFilter.class);
 			filterBuilder.getRawBeanDefinition().setSource(this.pc.extractSource(x509Elt));
 			filterBuilder.addPropertyValue("authenticationManager", authManager);
 			filterBuilder.addPropertyValue("securityContextHolderStrategy",
@@ -516,7 +517,7 @@ final class AuthenticationConfigBuilder {
 			String regex = x509Elt.getAttribute("subject-principal-regex");
 			if (StringUtils.hasText(regex)) {
 				BeanDefinitionBuilder extractor = BeanDefinitionBuilder
-						.rootBeanDefinition(SubjectDnX509PrincipalExtractor.class);
+					.rootBeanDefinition(SubjectDnX509PrincipalExtractor.class);
 				extractor.addPropertyValue("subjectDnRegex", regex);
 				filterBuilder.addPropertyValue("principalExtractor", extractor.getBeanDefinition());
 			}
@@ -559,13 +560,13 @@ final class AuthenticationConfigBuilder {
 		RootBeanDefinition filter = null;
 		if (jeeElt != null) {
 			BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder
-					.rootBeanDefinition(J2eePreAuthenticatedProcessingFilter.class);
+				.rootBeanDefinition(J2eePreAuthenticatedProcessingFilter.class);
 			filterBuilder.getRawBeanDefinition().setSource(this.pc.extractSource(jeeElt));
 			filterBuilder.addPropertyValue("authenticationManager", authManager);
 			filterBuilder.addPropertyValue("securityContextHolderStrategy",
 					authenticationFilterSecurityContextHolderStrategyRef);
 			BeanDefinitionBuilder adsBldr = BeanDefinitionBuilder
-					.rootBeanDefinition(J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.class);
+				.rootBeanDefinition(J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.class);
 			adsBldr.addPropertyValue("userRoles2GrantedAuthoritiesMapper",
 					new RootBeanDefinition(SimpleAttributes2GrantedAuthoritiesMapper.class));
 			String roles = jeeElt.getAttribute(ATT_MAPPABLE_ROLES);
@@ -574,8 +575,8 @@ final class AuthenticationConfigBuilder {
 			rolesBuilder.addConstructorArgValue(roles);
 			rolesBuilder.setFactoryMethod("commaDelimitedListToSet");
 			RootBeanDefinition mappableRolesRetriever = new RootBeanDefinition(SimpleMappableAttributesRetriever.class);
-			mappableRolesRetriever.getPropertyValues().addPropertyValue("mappableAttributes",
-					rolesBuilder.getBeanDefinition());
+			mappableRolesRetriever.getPropertyValues()
+				.addPropertyValue("mappableAttributes", rolesBuilder.getBeanDefinition());
 			adsBldr.addPropertyValue("mappableRolesRetriever", mappableRolesRetriever);
 			filterBuilder.addPropertyValue("authenticationDetailsSource", adsBldr.getBeanDefinition());
 			filter = (RootBeanDefinition) filterBuilder.getBeanDefinition();
@@ -609,11 +610,11 @@ final class AuthenticationConfigBuilder {
 			this.logger.info("No login page configured. The default internal one will be used. Use the '"
 					+ FormLoginBeanDefinitionParser.ATT_LOGIN_PAGE + "' attribute to set the URL of the login page.");
 			BeanDefinitionBuilder loginPageFilter = BeanDefinitionBuilder
-					.rootBeanDefinition(DefaultLoginPageGeneratingFilter.class);
+				.rootBeanDefinition(DefaultLoginPageGeneratingFilter.class);
 			loginPageFilter.addPropertyValue("resolveHiddenInputs", new CsrfTokenHiddenInputFunction());
 
 			BeanDefinitionBuilder logoutPageFilter = BeanDefinitionBuilder
-					.rootBeanDefinition(DefaultLogoutPageGeneratingFilter.class);
+				.rootBeanDefinition(DefaultLogoutPageGeneratingFilter.class);
 			logoutPageFilter.addPropertyValue("resolveHiddenInputs", new CsrfTokenHiddenInputFunction());
 			if (this.formFilterId != null) {
 				loginPageFilter.addConstructorArgReference(this.formFilterId);
@@ -726,10 +727,10 @@ final class AuthenticationConfigBuilder {
 		this.anonymousFilter = new RootBeanDefinition(AnonymousAuthenticationFilter.class);
 		this.anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(0, key);
 		this.anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(1, username);
-		this.anonymousFilter.getConstructorArgumentValues().addIndexedArgumentValue(2,
-				AuthorityUtils.commaSeparatedStringToAuthorityList(grantedAuthority));
-		this.anonymousFilter.getPropertyValues().addPropertyValue("securityContextHolderStrategy",
-				authenticationFilterSecurityContextHolderStrategyRef);
+		this.anonymousFilter.getConstructorArgumentValues()
+			.addIndexedArgumentValue(2, AuthorityUtils.commaSeparatedStringToAuthorityList(grantedAuthority));
+		this.anonymousFilter.getPropertyValues()
+			.addPropertyValue("securityContextHolderStrategy", authenticationFilterSecurityContextHolderStrategyRef);
 		this.anonymousFilter.setSource(source);
 		RootBeanDefinition anonymousProviderBean = new RootBeanDefinition(AnonymousAuthenticationProvider.class);
 		anonymousProviderBean.getConstructorArgumentValues().addIndexedArgumentValue(0, key);
@@ -760,16 +761,16 @@ final class AuthenticationConfigBuilder {
 	private BeanMetadataElement createAccessDeniedHandler(Element element, ParserContext pc) {
 		Element accessDeniedElt = DomUtils.getChildElementByTagName(element, Elements.ACCESS_DENIED_HANDLER);
 		BeanDefinitionBuilder accessDeniedHandler = BeanDefinitionBuilder
-				.rootBeanDefinition(AccessDeniedHandlerImpl.class);
+			.rootBeanDefinition(AccessDeniedHandlerImpl.class);
 		if (accessDeniedElt != null) {
 			String errorPage = accessDeniedElt.getAttribute("error-page");
 			String ref = accessDeniedElt.getAttribute("ref");
 			if (StringUtils.hasText(errorPage)) {
 				if (StringUtils.hasText(ref)) {
 					pc.getReaderContext()
-							.error("The attribute " + ATT_ACCESS_DENIED_ERROR_PAGE
-									+ " cannot be used together with the 'ref' attribute within <"
-									+ Elements.ACCESS_DENIED_HANDLER + ">", pc.extractSource(accessDeniedElt));
+						.error("The attribute " + ATT_ACCESS_DENIED_ERROR_PAGE
+								+ " cannot be used together with the 'ref' attribute within <"
+								+ Elements.ACCESS_DENIED_HANDLER + ">", pc.extractSource(accessDeniedElt));
 
 				}
 				accessDeniedHandler.addPropertyValue("errorPage", errorPage);
@@ -786,10 +787,10 @@ final class AuthenticationConfigBuilder {
 			return this.defaultDeniedHandlerMappings.values().iterator().next();
 		}
 		accessDeniedHandler = BeanDefinitionBuilder
-				.rootBeanDefinition(RequestMatcherDelegatingAccessDeniedHandler.class);
+			.rootBeanDefinition(RequestMatcherDelegatingAccessDeniedHandler.class);
 		accessDeniedHandler.addConstructorArgValue(this.defaultDeniedHandlerMappings);
 		accessDeniedHandler
-				.addConstructorArgValue(BeanDefinitionBuilder.rootBeanDefinition(AccessDeniedHandlerImpl.class));
+			.addConstructorArgValue(BeanDefinitionBuilder.rootBeanDefinition(AccessDeniedHandlerImpl.class));
 		return accessDeniedHandler.getBeanDefinition();
 	}
 
@@ -805,7 +806,7 @@ final class AuthenticationConfigBuilder {
 				return this.defaultEntryPointMappings.values().iterator().next();
 			}
 			BeanDefinitionBuilder delegatingEntryPoint = BeanDefinitionBuilder
-					.rootBeanDefinition(DelegatingAuthenticationEntryPoint.class);
+				.rootBeanDefinition(DelegatingAuthenticationEntryPoint.class);
 			delegatingEntryPoint.addConstructorArgValue(this.defaultEntryPointMappings);
 			return delegatingEntryPoint.getBeanDefinition();
 		}
@@ -836,10 +837,11 @@ final class AuthenticationConfigBuilder {
 		if (this.oauth2LoginEntryPoint != null) {
 			return this.oauth2LoginEntryPoint;
 		}
-		this.pc.getReaderContext().error("No AuthenticationEntryPoint could be established. Please "
-				+ "make sure you have a login mechanism configured through the namespace (such as form-login) or "
-				+ "specify a custom AuthenticationEntryPoint with the '" + ATT_ENTRY_POINT_REF + "' attribute ",
-				this.pc.extractSource(this.httpElt));
+		this.pc.getReaderContext()
+			.error("No AuthenticationEntryPoint could be established. Please "
+					+ "make sure you have a login mechanism configured through the namespace (such as form-login) or "
+					+ "specify a custom AuthenticationEntryPoint with the '" + ATT_ENTRY_POINT_REF + "' attribute ",
+					this.pc.extractSource(this.httpElt));
 		return null;
 	}
 

config/src/main/java/org/springframework/security/config/http/AuthorizationFilterParser.java

@@ -75,13 +75,14 @@ class AuthorizationFilterParser implements BeanDefinitionParser {
 	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		if (!isUseExpressions(element)) {
-			parserContext.getReaderContext().error("AuthorizationManager must be used with `use-expressions=\"true\"",
-					element);
+			parserContext.getReaderContext()
+				.error("AuthorizationManager must be used with `use-expressions=\"true\"", element);
 			return null;
 		}
 		if (StringUtils.hasText(element.getAttribute(ATT_ACCESS_DECISION_MANAGER_REF))) {
-			parserContext.getReaderContext().error(
-					"AuthorizationManager cannot be used in conjunction with `access-decision-manager-ref`", element);
+			parserContext.getReaderContext()
+				.error("AuthorizationManager cannot be used in conjunction with `access-decision-manager-ref`",
+						element);
 			return null;
 		}
 		this.authorizationManagerRef = createAuthorizationManager(element, parserContext);
@@ -92,8 +93,8 @@ class AuthorizationFilterParser implements BeanDefinitionParser {
 			filterBuilder.addPropertyValue("shouldFilterAllDispatcherTypes", Boolean.FALSE);
 		}
 		BeanDefinition filter = filterBuilder
-				.addPropertyValue("securityContextHolderStrategy", this.securityContextHolderStrategy)
-				.getBeanDefinition();
+			.addPropertyValue("securityContextHolderStrategy", this.securityContextHolderStrategy)
+			.getBeanDefinition();
 		String id = element.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE);
 		if (StringUtils.hasText(id)) {
 			parserContext.registerComponent(new BeanComponentDefinition(filter, id));
@@ -123,16 +124,16 @@ class AuthorizationFilterParser implements BeanDefinitionParser {
 		for (Element interceptMessage : interceptMessages) {
 			String accessExpression = interceptMessage.getAttribute(ATT_ACCESS);
 			BeanDefinitionBuilder authorizationManager = BeanDefinitionBuilder
-					.rootBeanDefinition(WebExpressionAuthorizationManager.class);
+				.rootBeanDefinition(WebExpressionAuthorizationManager.class);
 			authorizationManager.addPropertyReference("expressionHandler", expressionHandlerRef);
 			authorizationManager.addConstructorArgValue(accessExpression);
 			BeanMetadataElement matcher = createMatcher(matcherType, interceptMessage, parserContext);
 			matcherToExpression.put(matcher, authorizationManager.getBeanDefinition());
 		}
 		BeanDefinitionBuilder mds = BeanDefinitionBuilder
-				.rootBeanDefinition(RequestMatcherDelegatingAuthorizationManagerFactory.class)
-				.addPropertyValue("requestMatcherMap", matcherToExpression)
-				.addPropertyValue("observationRegistry", getObservationRegistry(element));
+			.rootBeanDefinition(RequestMatcherDelegatingAuthorizationManagerFactory.class)
+			.addPropertyValue("requestMatcherMap", matcherToExpression)
+			.addPropertyValue("observationRegistry", getObservationRegistry(element));
 		return context.registerWithGeneratedName(mds.getBeanDefinition());
 	}
 
@@ -152,8 +153,9 @@ class AuthorizationFilterParser implements BeanDefinitionParser {
 			servletPath = null;
 		}
 		else if (!MatcherType.mvc.equals(matcherType)) {
-			parserContext.getReaderContext().error(
-					ATT_SERVLET_PATH + " is not applicable for request-matcher: '" + matcherType.name() + "'", urlElt);
+			parserContext.getReaderContext()
+				.error(ATT_SERVLET_PATH + " is not applicable for request-matcher: '" + matcherType.name() + "'",
+						urlElt);
 		}
 		return hasMatcherRef ? new RuntimeBeanReference(matcherRef)
 				: matcherType.createMatcher(parserContext, path, method, servletPath);
@@ -190,9 +192,9 @@ class AuthorizationFilterParser implements BeanDefinitionParser {
 		@Override
 		public AuthorizationManager<HttpServletRequest> getObject() throws Exception {
 			RequestMatcherDelegatingAuthorizationManager.Builder builder = RequestMatcherDelegatingAuthorizationManager
-					.builder();
+				.builder();
 			for (Map.Entry<RequestMatcher, AuthorizationManager<RequestAuthorizationContext>> entry : this.beans
-					.entrySet()) {
+				.entrySet()) {
 				builder.add(entry.getKey(), entry.getValue());
 			}
 			AuthorizationManager<HttpServletRequest> manager = builder.build();

config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java

@@ -111,7 +111,7 @@ public class CsrfBeanDefinitionParser implements BeanDefinitionParser {
 		if (!StringUtils.hasText(this.csrfRepositoryRef)) {
 			RootBeanDefinition csrfTokenRepository = new RootBeanDefinition(HttpSessionCsrfTokenRepository.class);
 			BeanDefinitionBuilder lazyTokenRepository = BeanDefinitionBuilder
-					.rootBeanDefinition(LazyCsrfTokenRepository.class);
+				.rootBeanDefinition(LazyCsrfTokenRepository.class);
 			lazyTokenRepository.addConstructorArgValue(csrfTokenRepository);
 			this.csrfRepositoryRef = pc.getReaderContext().generateBeanName(lazyTokenRepository.getBeanDefinition());
 			pc.registerBeanComponent(
@@ -161,19 +161,20 @@ public class CsrfBeanDefinitionParser implements BeanDefinitionParser {
 		}
 		ManagedMap<Class<? extends AccessDeniedException>, BeanDefinition> handlers = new ManagedMap<>();
 		BeanDefinitionBuilder invalidSessionHandlerBldr = BeanDefinitionBuilder
-				.rootBeanDefinition(InvalidSessionAccessDeniedHandler.class);
+			.rootBeanDefinition(InvalidSessionAccessDeniedHandler.class);
 		invalidSessionHandlerBldr.addConstructorArgValue(invalidSessionStrategy);
 		handlers.put(MissingCsrfTokenException.class, invalidSessionHandlerBldr.getBeanDefinition());
 		BeanDefinitionBuilder deniedBldr = BeanDefinitionBuilder
-				.rootBeanDefinition(DelegatingAccessDeniedHandler.class);
+			.rootBeanDefinition(DelegatingAccessDeniedHandler.class);
 		deniedBldr.addConstructorArgValue(handlers);
 		deniedBldr.addConstructorArgValue(defaultDeniedHandler);
 		BeanDefinition denied = deniedBldr.getBeanDefinition();
 		ManagedList compositeList = new ManagedList();
 		BeanDefinitionBuilder compositeBldr = BeanDefinitionBuilder
-				.rootBeanDefinition(CompositeAccessDeniedHandler.class);
+			.rootBeanDefinition(CompositeAccessDeniedHandler.class);
 		BeanDefinition observing = BeanDefinitionBuilder.rootBeanDefinition(ObservationMarkingAccessDeniedHandler.class)
-				.addConstructorArgValue(this.observationRegistry).getBeanDefinition();
+			.addConstructorArgValue(this.observationRegistry)
+			.getBeanDefinition();
 		compositeList.add(denied);
 		compositeList.add(observing);
 		compositeBldr.addConstructorArgValue(compositeList);
@@ -182,14 +183,14 @@ public class CsrfBeanDefinitionParser implements BeanDefinitionParser {
 
 	BeanDefinition getCsrfAuthenticationStrategy() {
 		BeanDefinitionBuilder csrfAuthenticationStrategy = BeanDefinitionBuilder
-				.rootBeanDefinition(CsrfAuthenticationStrategy.class);
+			.rootBeanDefinition(CsrfAuthenticationStrategy.class);
 		csrfAuthenticationStrategy.addConstructorArgReference(this.csrfRepositoryRef);
 		return csrfAuthenticationStrategy.getBeanDefinition();
 	}
 
 	BeanDefinition getCsrfLogoutHandler() {
 		BeanDefinitionBuilder csrfAuthenticationStrategy = BeanDefinitionBuilder
-				.rootBeanDefinition(CsrfLogoutHandler.class);
+			.rootBeanDefinition(CsrfLogoutHandler.class);
 		csrfAuthenticationStrategy.addConstructorArgReference(this.csrfRepositoryRef);
 		return csrfAuthenticationStrategy.getBeanDefinition();
 	}

config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java

@@ -150,7 +150,7 @@ public class DefaultFilterChainValidator implements FilterChainProxy.FilterChain
 			return;
 		}
 		String loginPage = ((LoginUrlAuthenticationEntryPoint) exceptions.getAuthenticationEntryPoint())
-				.getLoginFormUrl();
+			.getLoginFormUrl();
 		this.logger.info("Checking whether login URL '" + loginPage + "' is accessible with your configuration");
 		FilterInvocation loginRequest = new FilterInvocation(loginPage, "POST");
 		List<Filter> filters = null;
@@ -219,7 +219,7 @@ public class DefaultFilterChainValidator implements FilterChainProxy.FilterChain
 		AuthorizationFilter authorizationFilter = getFilter(AuthorizationFilter.class, filters);
 		if (authorizationFilter != null) {
 			AuthorizationManager<HttpServletRequest> authorizationManager = authorizationFilter
-					.getAuthorizationManager();
+				.getAuthorizationManager();
 			try {
 				AuthorizationDecision decision = authorizationManager.check(() -> TEST, loginRequest.getHttpRequest());
 				return decision != null && decision.isGranted();
@@ -251,7 +251,7 @@ public class DefaultFilterChainValidator implements FilterChainProxy.FilterChain
 		if (authorizationFilter != null) {
 			return () -> {
 				AuthorizationManager<HttpServletRequest> authorizationManager = authorizationFilter
-						.getAuthorizationManager();
+					.getAuthorizationManager();
 				AuthorizationDecision decision = authorizationManager.check(() -> token, loginRequest.getHttpRequest());
 				return decision != null && decision.isGranted();
 			};

config/src/main/java/org/springframework/security/config/http/FilterChainMapBeanDefinitionDecorator.java

@@ -53,13 +53,14 @@ public class FilterChainMapBeanDefinitionDecorator implements BeanDefinitionDeco
 			String path = chain.getAttribute(HttpSecurityBeanDefinitionParser.ATT_PATH_PATTERN);
 			String filters = chain.getAttribute(HttpSecurityBeanDefinitionParser.ATT_FILTERS);
 			if (!StringUtils.hasText(path)) {
-				parserContext.getReaderContext().error(
-						"The attribute '" + HttpSecurityBeanDefinitionParser.ATT_PATH_PATTERN + "' must not be empty",
-						elt);
+				parserContext.getReaderContext()
+					.error("The attribute '" + HttpSecurityBeanDefinitionParser.ATT_PATH_PATTERN
+							+ "' must not be empty", elt);
 			}
 			if (!StringUtils.hasText(filters)) {
-				parserContext.getReaderContext().error(
-						"The attribute '" + HttpSecurityBeanDefinitionParser.ATT_FILTERS + "'must not be empty", elt);
+				parserContext.getReaderContext()
+					.error("The attribute '" + HttpSecurityBeanDefinitionParser.ATT_FILTERS + "'must not be empty",
+							elt);
 			}
 			BeanDefinition matcher = matcherType.createMatcher(parserContext, path, null);
 			if (filters.equals(HttpSecurityBeanDefinitionParser.OPT_FILTERS_NONE)) {

config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java

@@ -69,17 +69,18 @@ public class FilterInvocationSecurityMetadataSourceParser implements BeanDefinit
 		// Check for attributes that aren't allowed in this context
 		for (Element elt : interceptUrls) {
 			if (StringUtils.hasLength(elt.getAttribute(HttpSecurityBeanDefinitionParser.ATT_REQUIRES_CHANNEL))) {
-				parserContext.getReaderContext().error("The attribute '"
-						+ HttpSecurityBeanDefinitionParser.ATT_REQUIRES_CHANNEL + "' isn't allowed here.", elt);
+				parserContext.getReaderContext()
+					.error("The attribute '" + HttpSecurityBeanDefinitionParser.ATT_REQUIRES_CHANNEL
+							+ "' isn't allowed here.", elt);
 			}
 			if (StringUtils.hasLength(elt.getAttribute(HttpSecurityBeanDefinitionParser.ATT_FILTERS))) {
-				parserContext.getReaderContext().error(
-						"The attribute '" + HttpSecurityBeanDefinitionParser.ATT_FILTERS + "' isn't allowed here.",
-						elt);
+				parserContext.getReaderContext()
+					.error("The attribute '" + HttpSecurityBeanDefinitionParser.ATT_FILTERS + "' isn't allowed here.",
+							elt);
 			}
 			if (StringUtils.hasLength(elt.getAttribute(ATT_SERVLET_PATH))) {
-				parserContext.getReaderContext().error("The attribute '" + ATT_SERVLET_PATH + "' isn't allowed here.",
-						elt);
+				parserContext.getReaderContext()
+					.error("The attribute '" + ATT_SERVLET_PATH + "' isn't allowed here.", elt);
 			}
 		}
 		BeanDefinition mds = createSecurityMetadataSource(interceptUrls, false, element, parserContext);
@@ -110,7 +111,7 @@ public class FilterInvocationSecurityMetadataSourceParser implements BeanDefinit
 				expressionHandlerRef = registerDefaultExpressionHandler(pc);
 			}
 			fidsBuilder = BeanDefinitionBuilder
-					.rootBeanDefinition(ExpressionBasedFilterInvocationSecurityMetadataSource.class);
+				.rootBeanDefinition(ExpressionBasedFilterInvocationSecurityMetadataSource.class);
 			fidsBuilder.addConstructorArgValue(requestToAttributesMap);
 			fidsBuilder.addConstructorArgReference(expressionHandlerRef);
 		}
@@ -159,9 +160,9 @@ public class FilterInvocationSecurityMetadataSourceParser implements BeanDefinit
 				servletPath = null;
 			}
 			else if (!MatcherType.mvc.equals(matcherType)) {
-				parserContext.getReaderContext().error(
-						ATT_SERVLET_PATH + " is not applicable for request-matcher: '" + matcherType.name() + "'",
-						urlElt);
+				parserContext.getReaderContext()
+					.error(ATT_SERVLET_PATH + " is not applicable for request-matcher: '" + matcherType.name() + "'",
+							urlElt);
 			}
 			BeanMetadataElement matcher = hasMatcherRef ? new RuntimeBeanReference(matcherRef)
 					: matcherType.createMatcher(parserContext, path, method, servletPath);

config/src/main/java/org/springframework/security/config/http/FormLoginBeanDefinitionParser.java

@@ -159,7 +159,7 @@ public class FormLoginBeanDefinitionParser {
 		}
 		this.filterBean.setSource(source);
 		BeanDefinitionBuilder entryPointBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class);
+			.rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class);
 		entryPointBuilder.getRawBeanDefinition().setSource(source);
 		entryPointBuilder.addConstructorArgValue((this.loginPage != null) ? this.loginPage : DEF_LOGIN_PAGE);
 		entryPointBuilder.addPropertyValue("portMapper", this.portMapper);
@@ -178,7 +178,7 @@ public class FormLoginBeanDefinitionParser {
 		}
 		this.loginProcessingUrl = loginUrl;
 		BeanDefinitionBuilder matcherBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition("org.springframework.security.web.util.matcher.AntPathRequestMatcher");
+			.rootBeanDefinition("org.springframework.security.web.util.matcher.AntPathRequestMatcher");
 		matcherBuilder.addConstructorArgValue(loginUrl);
 		if (this.loginMethod != null) {
 			matcherBuilder.addConstructorArgValue("POST");
@@ -189,13 +189,13 @@ public class FormLoginBeanDefinitionParser {
 		}
 		else if (StringUtils.hasText(authenticationSuccessForwardUrl)) {
 			BeanDefinitionBuilder forwardSuccessHandler = BeanDefinitionBuilder
-					.rootBeanDefinition(ForwardAuthenticationSuccessHandler.class);
+				.rootBeanDefinition(ForwardAuthenticationSuccessHandler.class);
 			forwardSuccessHandler.addConstructorArgValue(authenticationSuccessForwardUrl);
 			filterBuilder.addPropertyValue("authenticationSuccessHandler", forwardSuccessHandler.getBeanDefinition());
 		}
 		else {
 			BeanDefinitionBuilder successHandler = BeanDefinitionBuilder
-					.rootBeanDefinition(SavedRequestAwareAuthenticationSuccessHandler.class);
+				.rootBeanDefinition(SavedRequestAwareAuthenticationSuccessHandler.class);
 			if ("true".equals(alwaysUseDefault)) {
 				successHandler.addPropertyValue("alwaysUseDefaultTargetUrl", Boolean.TRUE);
 			}
@@ -215,13 +215,13 @@ public class FormLoginBeanDefinitionParser {
 		}
 		else if (StringUtils.hasText(authenticationFailureForwardUrl)) {
 			BeanDefinitionBuilder forwardFailureHandler = BeanDefinitionBuilder
-					.rootBeanDefinition(ForwardAuthenticationFailureHandler.class);
+				.rootBeanDefinition(ForwardAuthenticationFailureHandler.class);
 			forwardFailureHandler.addConstructorArgValue(authenticationFailureForwardUrl);
 			filterBuilder.addPropertyValue("authenticationFailureHandler", forwardFailureHandler.getBeanDefinition());
 		}
 		else {
 			BeanDefinitionBuilder failureHandler = BeanDefinitionBuilder
-					.rootBeanDefinition(SimpleUrlAuthenticationFailureHandler.class);
+				.rootBeanDefinition(SimpleUrlAuthenticationFailureHandler.class);
 			if (!StringUtils.hasText(authenticationFailureUrl)) {
 				// Fall back to re-displaying the custom login page, if one was specified.
 				if (StringUtils.hasText(loginPage)) {

config/src/main/java/org/springframework/security/config/http/GrantedAuthorityDefaultsParserUtils.java

@@ -50,10 +50,10 @@ final class GrantedAuthorityDefaultsParserUtils {
 		@Override
 		public final void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 			String[] grantedAuthorityDefaultsBeanNames = applicationContext
-					.getBeanNamesForType(GrantedAuthorityDefaults.class);
+				.getBeanNamesForType(GrantedAuthorityDefaults.class);
 			if (grantedAuthorityDefaultsBeanNames.length == 1) {
 				GrantedAuthorityDefaults grantedAuthorityDefaults = applicationContext
-						.getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class);
+					.getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class);
 				this.rolePrefix = grantedAuthorityDefaults.getRolePrefix();
 			}
 		}

config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java

@@ -157,8 +157,8 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 		parseHeaderElements(element);
 		boolean noWriters = this.headerWriters.isEmpty();
 		if (disabled && !noWriters) {
-			parserContext.getReaderContext().error("Cannot specify <headers disabled=\"true\"> with child elements.",
-					element);
+			parserContext.getReaderContext()
+				.error("Cannot specify <headers disabled=\"true\"> with child elements.", element);
 		}
 		else if (noWriters) {
 			return null;
@@ -192,7 +192,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 
 	private void addCacheControl() {
 		BeanDefinitionBuilder headersWriter = BeanDefinitionBuilder
-				.genericBeanDefinition(CacheControlHeadersWriter.class);
+			.genericBeanDefinition(CacheControlHeadersWriter.class);
 		this.headerWriters.add(headersWriter.getBeanDefinition());
 	}
 
@@ -309,11 +309,11 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 
 	private void addContentSecurityPolicy(Element contentSecurityPolicyElement, ParserContext context) {
 		BeanDefinitionBuilder headersWriter = BeanDefinitionBuilder
-				.genericBeanDefinition(ContentSecurityPolicyHeaderWriter.class);
+			.genericBeanDefinition(ContentSecurityPolicyHeaderWriter.class);
 		String policyDirectives = contentSecurityPolicyElement.getAttribute(ATT_POLICY_DIRECTIVES);
 		if (!StringUtils.hasText(policyDirectives)) {
-			context.getReaderContext().error(ATT_POLICY_DIRECTIVES + " requires a 'value' to be set.",
-					contentSecurityPolicyElement);
+			context.getReaderContext()
+				.error(ATT_POLICY_DIRECTIVES + " requires a 'value' to be set.", contentSecurityPolicyElement);
 		}
 		else {
 			headersWriter.addConstructorArgValue(policyDirectives);
@@ -335,7 +335,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 
 	private void addReferrerPolicy(Element referrerPolicyElement, ParserContext context) {
 		BeanDefinitionBuilder headersWriter = BeanDefinitionBuilder
-				.genericBeanDefinition(ReferrerPolicyHeaderWriter.class);
+			.genericBeanDefinition(ReferrerPolicyHeaderWriter.class);
 		String policy = referrerPolicyElement.getAttribute(ATT_POLICY);
 		if (StringUtils.hasLength(policy)) {
 			headersWriter.addConstructorArgValue(ReferrerPolicy.get(policy));
@@ -353,11 +353,11 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 
 	private void addFeaturePolicy(Element featurePolicyElement, ParserContext context) {
 		BeanDefinitionBuilder headersWriter = BeanDefinitionBuilder
-				.genericBeanDefinition(FeaturePolicyHeaderWriter.class);
+			.genericBeanDefinition(FeaturePolicyHeaderWriter.class);
 		String policyDirectives = featurePolicyElement.getAttribute(ATT_POLICY_DIRECTIVES);
 		if (!StringUtils.hasText(policyDirectives)) {
-			context.getReaderContext().error(ATT_POLICY_DIRECTIVES + " requires a 'value' to be set.",
-					featurePolicyElement);
+			context.getReaderContext()
+				.error(ATT_POLICY_DIRECTIVES + " requires a 'value' to be set.", featurePolicyElement);
 		}
 		else {
 			headersWriter.addConstructorArgValue(policyDirectives);
@@ -375,7 +375,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 
 	private void addPermissionsPolicy(Element permissionsPolicyElement, ParserContext context) {
 		BeanDefinitionBuilder headersWriter = BeanDefinitionBuilder
-				.genericBeanDefinition(PermissionsPolicyHeaderWriter.class);
+			.genericBeanDefinition(PermissionsPolicyHeaderWriter.class);
 		String policyDirectives = permissionsPolicyElement.getAttribute(ATT_POLICY);
 		if (!StringUtils.hasText(policyDirectives)) {
 			context.getReaderContext().error(ATT_POLICY + " requires a 'value' to be set.", permissionsPolicyElement);
@@ -397,7 +397,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 			addCrossOriginOpenerPolicy(crossOriginOpenerPolicyElement, writer);
 		}
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder
-				.genericBeanDefinition(CrossOriginOpenerPolicyHeaderWriter.class, () -> writer);
+			.genericBeanDefinition(CrossOriginOpenerPolicyHeaderWriter.class, () -> writer);
 		this.headerWriters.add(builder.getBeanDefinition());
 	}
 
@@ -412,7 +412,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 			addCrossOriginEmbedderPolicy(crossOriginEmbedderPolicyElement, writer);
 		}
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder
-				.genericBeanDefinition(CrossOriginEmbedderPolicyHeaderWriter.class, () -> writer);
+			.genericBeanDefinition(CrossOriginEmbedderPolicyHeaderWriter.class, () -> writer);
 		this.headerWriters.add(builder.getBeanDefinition());
 	}
 
@@ -427,7 +427,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 			addCrossOriginResourcePolicy(crossOriginResourcePolicyElement, writer);
 		}
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder
-				.genericBeanDefinition(CrossOriginResourcePolicyHeaderWriter.class, () -> writer);
+			.genericBeanDefinition(CrossOriginResourcePolicyHeaderWriter.class, () -> writer);
 		this.headerWriters.add(builder.getBeanDefinition());
 	}
 
@@ -456,8 +456,8 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 	}
 
 	private void attrNotAllowed(ParserContext context, String attrName, String otherAttrName, Element element) {
-		context.getReaderContext().error("Only one of '" + attrName + "' or '" + otherAttrName + "' can be set.",
-				element);
+		context.getReaderContext()
+			.error("Only one of '" + attrName + "' or '" + otherAttrName + "' can be set.", element);
 	}
 
 	private void parseHeaderElements(Element element) {
@@ -491,7 +491,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 
 	private void addContentTypeOptions() {
 		BeanDefinitionBuilder builder = BeanDefinitionBuilder
-				.genericBeanDefinition(XContentTypeOptionsHeaderWriter.class);
+			.genericBeanDefinition(XContentTypeOptionsHeaderWriter.class);
 		this.headerWriters.add(builder.getBeanDefinition());
 	}
 
@@ -527,8 +527,8 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 		String strategyRef = getAttribute(frameElement, ATT_REF, null);
 		String strategy = getAttribute(frameElement, ATT_STRATEGY, null);
 		if (StringUtils.hasText(strategy) && StringUtils.hasText(strategyRef)) {
-			parserContext.getReaderContext().error("Only one of 'strategy' or 'strategy-ref' can be set.",
-					frameElement);
+			parserContext.getReaderContext()
+				.error("Only one of 'strategy' or 'strategy-ref' can be set.", frameElement);
 			return;
 		}
 		if (strategyRef != null) {
@@ -550,8 +550,8 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 				builder.addConstructorArgValue(new StaticAllowFromStrategy(new URI(value)));
 			}
 			catch (URISyntaxException ex) {
-				parserContext.getReaderContext().error("'value' attribute doesn't represent a valid URI.", frameElement,
-						ex);
+				parserContext.getReaderContext()
+					.error("'value' attribute doesn't represent a valid URI.", frameElement, ex);
 			}
 			return;
 		}
@@ -564,7 +564,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 	private BeanDefinitionBuilder getAllowFromStrategy(String strategy, String value) {
 		if ("whitelist".equals(strategy)) {
 			BeanDefinitionBuilder allowFromStrategy = BeanDefinitionBuilder
-					.rootBeanDefinition(WhiteListedAllowFromStrategy.class);
+				.rootBeanDefinition(WhiteListedAllowFromStrategy.class);
 			allowFromStrategy.addConstructorArgValue(StringUtils.commaDelimitedListToSet(value));
 			return allowFromStrategy;
 		}
@@ -580,7 +580,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 		if (xssElt != null) {
 			boolean disabled = "true".equals(getAttribute(xssElt, ATT_DISABLED, "false"));
 			XXssProtectionHeaderWriter.HeaderValue headerValue = XXssProtectionHeaderWriter.HeaderValue
-					.from(xssElt.getAttribute(ATT_HEADER_VALUE));
+				.from(xssElt.getAttribute(ATT_HEADER_VALUE));
 			if (headerValue != null) {
 				if (disabled) {
 					attrNotAllowed(parserContext, ATT_HEADER_VALUE, ATT_DISABLED, xssElt);

config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java

@@ -338,14 +338,14 @@ class HttpConfigurationBuilder {
 	private void createSecurityContextPersistenceFilter() {
 		BeanDefinitionBuilder scpf = BeanDefinitionBuilder.rootBeanDefinition(SecurityContextPersistenceFilter.class);
 		switch (this.sessionPolicy) {
-		case ALWAYS:
-			scpf.addPropertyValue("forceEagerSessionCreation", Boolean.TRUE);
-			break;
-		case NEVER:
-			scpf.addPropertyValue("forceEagerSessionCreation", Boolean.FALSE);
-			break;
-		default:
-			scpf.addPropertyValue("forceEagerSessionCreation", Boolean.FALSE);
+			case ALWAYS:
+				scpf.addPropertyValue("forceEagerSessionCreation", Boolean.TRUE);
+				break;
+			case NEVER:
+				scpf.addPropertyValue("forceEagerSessionCreation", Boolean.FALSE);
+				break;
+			default:
+				scpf.addPropertyValue("forceEagerSessionCreation", Boolean.FALSE);
 		}
 		scpf.addPropertyValue("securityContextHolderStrategy", this.holderStrategyRef);
 		scpf.addConstructorArgValue(this.contextRepoRef);
@@ -360,7 +360,7 @@ class HttpConfigurationBuilder {
 			return;
 		}
 		this.holderStrategyRef = BeanDefinitionBuilder.rootBeanDefinition(SecurityContextHolderStrategyFactory.class)
-				.getBeanDefinition();
+			.getBeanDefinition();
 	}
 
 	private void createSecurityContextRepository() {
@@ -373,14 +373,14 @@ class HttpConfigurationBuilder {
 			else {
 				contextRepo = BeanDefinitionBuilder.rootBeanDefinition(HttpSessionSecurityContextRepository.class);
 				switch (this.sessionPolicy) {
-				case ALWAYS:
-					contextRepo.addPropertyValue("allowSessionCreation", Boolean.TRUE);
-					break;
-				case NEVER:
-					contextRepo.addPropertyValue("allowSessionCreation", Boolean.FALSE);
-					break;
-				default:
-					contextRepo.addPropertyValue("allowSessionCreation", Boolean.TRUE);
+					case ALWAYS:
+						contextRepo.addPropertyValue("allowSessionCreation", Boolean.TRUE);
+						break;
+					case NEVER:
+						contextRepo.addPropertyValue("allowSessionCreation", Boolean.FALSE);
+						break;
+					default:
+						contextRepo.addPropertyValue("allowSessionCreation", Boolean.TRUE);
 				}
 				if (isDisableUrlRewriting()) {
 					contextRepo.addPropertyValue("disableUrlRewriting", Boolean.TRUE);
@@ -419,9 +419,9 @@ class HttpConfigurationBuilder {
 		if (sessionMgmtElt != null) {
 			if (this.sessionPolicy == SessionCreationPolicy.STATELESS) {
 				this.pc.getReaderContext()
-						.error(Elements.SESSION_MANAGEMENT + "  cannot be used" + " in combination with "
-								+ ATT_CREATE_SESSION + "='" + SessionCreationPolicy.STATELESS + "'",
-								this.pc.extractSource(sessionMgmtElt));
+					.error(Elements.SESSION_MANAGEMENT + "  cannot be used" + " in combination with "
+							+ ATT_CREATE_SESSION + "='" + SessionCreationPolicy.STATELESS + "'",
+							this.pc.extractSource(sessionMgmtElt));
 			}
 			sessionFixationAttribute = sessionMgmtElt.getAttribute(ATT_SESSION_FIXATION_PROTECTION);
 			invalidSessionUrl = sessionMgmtElt.getAttribute(ATT_INVALID_SESSION_URL);
@@ -432,15 +432,14 @@ class HttpConfigurationBuilder {
 			sessionControlEnabled = sessionCtrlElt != null;
 			if (StringUtils.hasText(invalidSessionUrl) && StringUtils.hasText(invalidSessionStrategyRef)) {
 				this.pc.getReaderContext()
-						.error(ATT_INVALID_SESSION_URL + " attribute cannot be used in combination with" + " the "
-								+ ATT_INVALID_SESSION_STRATEGY_REF + " attribute.", sessionMgmtElt);
+					.error(ATT_INVALID_SESSION_URL + " attribute cannot be used in combination with" + " the "
+							+ ATT_INVALID_SESSION_STRATEGY_REF + " attribute.", sessionMgmtElt);
 			}
 			if (sessionControlEnabled) {
 				if (StringUtils.hasText(sessionAuthStratRef)) {
 					this.pc.getReaderContext()
-							.error(ATT_SESSION_AUTH_STRATEGY_REF + " attribute cannot be used"
-									+ " in combination with <" + Elements.CONCURRENT_SESSIONS + ">",
-									this.pc.extractSource(sessionCtrlElt));
+						.error(ATT_SESSION_AUTH_STRATEGY_REF + " attribute cannot be used" + " in combination with <"
+								+ Elements.CONCURRENT_SESSIONS + ">", this.pc.extractSource(sessionCtrlElt));
 				}
 				createConcurrencyControlFilterAndSessionRegistry(sessionCtrlElt);
 			}
@@ -450,8 +449,9 @@ class HttpConfigurationBuilder {
 			sessionFixationAttribute = OPT_CHANGE_SESSION_ID;
 		}
 		else if (StringUtils.hasText(sessionAuthStratRef)) {
-			this.pc.getReaderContext().error(ATT_SESSION_FIXATION_PROTECTION + " attribute cannot be used"
-					+ " in combination with " + ATT_SESSION_AUTH_STRATEGY_REF, this.pc.extractSource(sessionMgmtElt));
+			this.pc.getReaderContext()
+				.error(ATT_SESSION_FIXATION_PROTECTION + " attribute cannot be used" + " in combination with "
+						+ ATT_SESSION_AUTH_STRATEGY_REF, this.pc.extractSource(sessionMgmtElt));
 		}
 
 		if (this.sessionPolicy == SessionCreationPolicy.STATELESS) {
@@ -459,7 +459,7 @@ class HttpConfigurationBuilder {
 			return;
 		}
 		boolean sessionFixationProtectionRequired = !sessionFixationAttribute
-				.equals(OPT_SESSION_FIXATION_NO_PROTECTION);
+			.equals(OPT_SESSION_FIXATION_NO_PROTECTION);
 		ManagedList<BeanMetadataElement> delegateSessionStrategies = new ManagedList<>();
 		BeanDefinitionBuilder concurrentSessionStrategy;
 		BeanDefinitionBuilder sessionFixationStrategy = null;
@@ -470,10 +470,11 @@ class HttpConfigurationBuilder {
 		if (sessionControlEnabled) {
 			Assert.state(this.sessionRegistryRef != null, "No sessionRegistryRef found");
 			concurrentSessionStrategy = BeanDefinitionBuilder
-					.rootBeanDefinition(ConcurrentSessionControlAuthenticationStrategy.class);
+				.rootBeanDefinition(ConcurrentSessionControlAuthenticationStrategy.class);
 			concurrentSessionStrategy.addConstructorArgValue(this.sessionRegistryRef);
-			String maxSessions = this.pc.getReaderContext().getEnvironment()
-					.resolvePlaceholders(sessionCtrlElt.getAttribute("max-sessions"));
+			String maxSessions = this.pc.getReaderContext()
+				.getEnvironment()
+				.resolvePlaceholders(sessionCtrlElt.getAttribute("max-sessions"));
 			if (StringUtils.hasText(maxSessions)) {
 				concurrentSessionStrategy.addPropertyValue("maximumSessions", maxSessions);
 			}
@@ -487,11 +488,11 @@ class HttpConfigurationBuilder {
 		if (sessionFixationProtectionRequired || StringUtils.hasText(invalidSessionUrl)) {
 			if (useChangeSessionId) {
 				sessionFixationStrategy = BeanDefinitionBuilder
-						.rootBeanDefinition(ChangeSessionIdAuthenticationStrategy.class);
+					.rootBeanDefinition(ChangeSessionIdAuthenticationStrategy.class);
 			}
 			else {
 				sessionFixationStrategy = BeanDefinitionBuilder
-						.rootBeanDefinition(SessionFixationProtectionStrategy.class);
+					.rootBeanDefinition(SessionFixationProtectionStrategy.class);
 			}
 			delegateSessionStrategies.add(sessionFixationStrategy.getBeanDefinition());
 		}
@@ -500,7 +501,7 @@ class HttpConfigurationBuilder {
 		}
 		if (sessionControlEnabled) {
 			registerSessionStrategy = BeanDefinitionBuilder
-					.rootBeanDefinition(RegisterSessionAuthenticationStrategy.class);
+				.rootBeanDefinition(RegisterSessionAuthenticationStrategy.class);
 			registerSessionStrategy.addConstructorArgValue(this.sessionRegistryRef);
 			delegateSessionStrategies.add(registerSessionStrategy.getBeanDefinition());
 		}
@@ -509,7 +510,7 @@ class HttpConfigurationBuilder {
 			return;
 		}
 		BeanDefinitionBuilder sessionMgmtFilter = BeanDefinitionBuilder
-				.rootBeanDefinition(SessionManagementFilter.class);
+			.rootBeanDefinition(SessionManagementFilter.class);
 		RootBeanDefinition failureHandler = new RootBeanDefinition(SimpleUrlAuthenticationFailureHandler.class);
 		if (StringUtils.hasText(errorUrl)) {
 			failureHandler.getPropertyValues().addPropertyValue("defaultFailureUrl", errorUrl);
@@ -525,7 +526,7 @@ class HttpConfigurationBuilder {
 		}
 		if (!delegateSessionStrategies.isEmpty()) {
 			BeanDefinitionBuilder sessionStrategy = BeanDefinitionBuilder
-					.rootBeanDefinition(CompositeSessionAuthenticationStrategy.class);
+				.rootBeanDefinition(CompositeSessionAuthenticationStrategy.class);
 			BeanDefinition strategyBean = sessionStrategy.getBeanDefinition();
 			sessionStrategy.addConstructorArgValue(delegateSessionStrategies);
 			sessionAuthStratRef = this.pc.getReaderContext().generateBeanName(strategyBean);
@@ -533,7 +534,7 @@ class HttpConfigurationBuilder {
 		}
 		if (StringUtils.hasText(invalidSessionUrl)) {
 			BeanDefinitionBuilder invalidSessionBldr = BeanDefinitionBuilder
-					.rootBeanDefinition(SimpleRedirectInvalidSessionStrategy.class);
+				.rootBeanDefinition(SimpleRedirectInvalidSessionStrategy.class);
 			invalidSessionBldr.addConstructorArgValue(invalidSessionUrl);
 			this.invalidSession = invalidSessionBldr.getBeanDefinition();
 			sessionMgmtFilter.addPropertyValue("invalidSessionStrategy", this.invalidSession);
@@ -575,13 +576,13 @@ class HttpConfigurationBuilder {
 		String expiryUrl = element.getAttribute(ATT_EXPIRY_URL);
 		String expiredSessionStrategyRef = element.getAttribute(ATT_EXPIRED_SESSION_STRATEGY_REF);
 		if (StringUtils.hasText(expiryUrl) && StringUtils.hasText(expiredSessionStrategyRef)) {
-			this.pc.getReaderContext().error(
-					"Cannot use 'expired-url' attribute and 'expired-session-strategy-ref'" + " attribute together.",
-					source);
+			this.pc.getReaderContext()
+				.error("Cannot use 'expired-url' attribute and 'expired-session-strategy-ref'" + " attribute together.",
+						source);
 		}
 		if (StringUtils.hasText(expiryUrl)) {
 			BeanDefinitionBuilder expiredSessionBldr = BeanDefinitionBuilder
-					.rootBeanDefinition(SimpleRedirectSessionInformationExpiredStrategy.class);
+				.rootBeanDefinition(SimpleRedirectSessionInformationExpiredStrategy.class);
 			expiredSessionBldr.addConstructorArgValue(expiryUrl);
 			filterBuilder.addConstructorArgValue(expiredSessionBldr.getBeanDefinition());
 		}
@@ -623,7 +624,8 @@ class HttpConfigurationBuilder {
 		}
 		if ("true".equals(provideJaasApi)) {
 			this.jaasApiFilter = BeanDefinitionBuilder.rootBeanDefinition(JaasApiIntegrationFilter.class)
-					.addPropertyValue("securityContextHolderStrategy", this.holderStrategyRef).getBeanDefinition();
+				.addPropertyValue("securityContextHolderStrategy", this.holderStrategyRef)
+				.getBeanDefinition();
 		}
 	}
 
@@ -634,10 +636,10 @@ class HttpConfigurationBuilder {
 		}
 		RootBeanDefinition channelFilter = new RootBeanDefinition(ChannelProcessingFilter.class);
 		BeanDefinitionBuilder metadataSourceBldr = BeanDefinitionBuilder
-				.rootBeanDefinition(DefaultFilterInvocationSecurityMetadataSource.class);
+			.rootBeanDefinition(DefaultFilterInvocationSecurityMetadataSource.class);
 		metadataSourceBldr.addConstructorArgValue(channelRequestMap);
-		channelFilter.getPropertyValues().addPropertyValue("securityMetadataSource",
-				metadataSourceBldr.getBeanDefinition());
+		channelFilter.getPropertyValues()
+			.addPropertyValue("securityMetadataSource", metadataSourceBldr.getBeanDefinition());
 		RootBeanDefinition channelDecisionManager = new RootBeanDefinition(ChannelDecisionManagerImpl.class);
 		ManagedList<RootBeanDefinition> channelProcessors = new ManagedList<>(3);
 		RootBeanDefinition secureChannelProcessor = new RootBeanDefinition(SecureChannelProcessor.class);
@@ -703,7 +705,7 @@ class HttpConfigurationBuilder {
 				requestCacheBldr.addPropertyValue("portResolver", this.portResolver);
 				if (this.csrfFilter != null) {
 					BeanDefinitionBuilder requestCacheMatcherBldr = BeanDefinitionBuilder
-							.rootBeanDefinition(AntPathRequestMatcher.class);
+						.rootBeanDefinition(AntPathRequestMatcher.class);
 					requestCacheMatcherBldr.addConstructorArgValue("/**");
 					requestCacheMatcherBldr.addConstructorArgValue("GET");
 					requestCacheBldr.addPropertyValue("requestMatcher", requestCacheMatcherBldr.getBeanDefinition());
@@ -743,8 +745,9 @@ class HttpConfigurationBuilder {
 		// use with
 		// taglibs etc.
 		BeanDefinition wipe = BeanDefinitionBuilder
-				.rootBeanDefinition(AuthorizationManagerWebInvocationPrivilegeEvaluator.class)
-				.addConstructorArgReference(authorizationFilterParser.getAuthorizationManagerRef()).getBeanDefinition();
+			.rootBeanDefinition(AuthorizationManagerWebInvocationPrivilegeEvaluator.class)
+			.addConstructorArgReference(authorizationFilterParser.getAuthorizationManagerRef())
+			.getBeanDefinition();
 		this.pc.registerBeanComponent(
 				new BeanComponentDefinition(wipe, this.pc.getReaderContext().generateBeanName(wipe)));
 		this.fsi = new RuntimeBeanReference(fsiId);
@@ -753,14 +756,15 @@ class HttpConfigurationBuilder {
 	private void createFilterSecurityInterceptor(BeanReference authManager) {
 		boolean useExpressions = FilterInvocationSecurityMetadataSourceParser.isUseExpressions(this.httpElt);
 		RootBeanDefinition securityMds = FilterInvocationSecurityMetadataSourceParser
-				.createSecurityMetadataSource(this.interceptUrls, this.addAllAuth, this.httpElt, this.pc);
+			.createSecurityMetadataSource(this.interceptUrls, this.addAllAuth, this.httpElt, this.pc);
 		RootBeanDefinition accessDecisionMgr;
 		ManagedList<BeanDefinition> voters = new ManagedList<>(2);
 		if (useExpressions) {
 			BeanDefinitionBuilder expressionVoter = BeanDefinitionBuilder.rootBeanDefinition(WebExpressionVoter.class);
 			// Read the expression handler from the FISMS
 			RuntimeBeanReference expressionHandler = (RuntimeBeanReference) securityMds.getConstructorArgumentValues()
-					.getArgumentValue(1, RuntimeBeanReference.class).getValue();
+				.getArgumentValue(1, RuntimeBeanReference.class)
+				.getValue();
 			expressionVoter.addPropertyValue("expressionHandler", expressionHandler);
 			voters.add(expressionVoter.getBeanDefinition());
 		}
@@ -927,7 +931,7 @@ class HttpConfigurationBuilder {
 		private SecurityContextHolderAwareRequestFilter filter = new SecurityContextHolderAwareRequestFilter();
 
 		private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-				.getContextHolderStrategy();
+			.getContextHolderStrategy();
 
 		@Override
 		public SecurityContextHolderAwareRequestFilter getBean() {

config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java

@@ -125,7 +125,8 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
 		// Obtain the filter chains and add the new chain to it
 		BeanDefinition listFactoryBean = pc.getRegistry().getBeanDefinition(BeanIds.FILTER_CHAINS);
 		List<BeanReference> filterChains = (List<BeanReference>) listFactoryBean.getPropertyValues()
-				.getPropertyValue("sourceList").getValue();
+			.getPropertyValue("sourceList")
+			.getValue();
 		filterChains.add(createFilterChain(element, pc));
 		pc.popAndRegisterContainingComponent();
 		return null;
@@ -140,8 +141,9 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
 			validateSecuredFilterChainElement(element, pc);
 			for (int i = 0; i < element.getChildNodes().getLength(); i++) {
 				if (element.getChildNodes().item(i) instanceof Element) {
-					pc.getReaderContext().error("If you are using <http> to define an unsecured pattern, "
-							+ "it cannot contain child elements.", pc.extractSource(element));
+					pc.getReaderContext()
+						.error("If you are using <http> to define an unsecured pattern, "
+								+ "it cannot contain child elements.", pc.extractSource(element));
 				}
 			}
 			return createSecurityFilterChainBean(element, pc, Collections.emptyList());
@@ -198,9 +200,9 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
 		String filterChainPattern = element.getAttribute(ATT_PATH_PATTERN);
 		if (StringUtils.hasText(requestMatcherRef)) {
 			if (StringUtils.hasText(filterChainPattern)) {
-				pc.getReaderContext().error(
-						"You can't define a pattern and a request-matcher-ref for the " + "same filter chain",
-						pc.extractSource(element));
+				pc.getReaderContext()
+					.error("You can't define a pattern and a request-matcher-ref for the " + "same filter chain",
+							pc.extractSource(element));
 			}
 			filterChainMatcher = new RuntimeBeanReference(requestMatcherRef);
 
@@ -212,7 +214,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
 			filterChainMatcher = new RootBeanDefinition(AnyRequestMatcher.class);
 		}
 		BeanDefinitionBuilder filterChainBldr = BeanDefinitionBuilder
-				.rootBeanDefinition(DefaultSecurityFilterChain.class);
+			.rootBeanDefinition(DefaultSecurityFilterChain.class);
 		filterChainBldr.addConstructorArgValue(filterChainMatcher);
 		filterChainBldr.addConstructorArgValue(filterChain);
 		BeanDefinition filterChainBean = filterChainBldr.getBeanDefinition();
@@ -231,7 +233,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
 		// Register the portMapper. A default will always be created, even if no element
 		// exists.
 		BeanDefinition portMapper = new PortMappingsBeanDefinitionParser()
-				.parse(DomUtils.getChildElementByTagName(elt, Elements.PORT_MAPPINGS), pc);
+			.parse(DomUtils.getChildElementByTagName(elt, Elements.PORT_MAPPINGS), pc);
 		String portMapperName = pc.getReaderContext().generateBeanName(portMapper);
 		pc.registerBeanComponent(new BeanComponentDefinition(portMapper, portMapperName));
 		return new RuntimeBeanReference(portMapperName);
@@ -257,7 +259,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
 			ManagedList<BeanReference> authenticationProviders) {
 		String parentMgrRef = element.getAttribute(ATT_AUTHENTICATION_MANAGER_REF);
 		BeanDefinitionBuilder authManager = BeanDefinitionBuilder
-				.rootBeanDefinition(ChildAuthenticationManagerFactoryBean.class);
+			.rootBeanDefinition(ChildAuthenticationManagerFactoryBean.class);
 		authManager.addConstructorArgValue(authenticationProviders);
 		if (StringUtils.hasText(parentMgrRef)) {
 			RuntimeBeanReference parentAuthManager = new RuntimeBeanReference(parentMgrRef);
@@ -265,8 +267,8 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
 			RootBeanDefinition clearCredentials = new RootBeanDefinition(
 					ClearCredentialsMethodInvokingFactoryBean.class);
 			clearCredentials.getPropertyValues().addPropertyValue("targetObject", parentAuthManager);
-			clearCredentials.getPropertyValues().addPropertyValue("targetMethod",
-					"isEraseCredentialsAfterAuthentication");
+			clearCredentials.getPropertyValues()
+				.addPropertyValue("targetMethod", "isEraseCredentialsAfterAuthentication");
 			authManager.addPropertyValue("eraseCredentialsAfterAuthentication", clearCredentials);
 		}
 		else {
@@ -276,8 +278,8 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
 			pc.registerBeanComponent(new BeanComponentDefinition(amfb, amfbId));
 			RootBeanDefinition clearCredentials = new RootBeanDefinition(MethodInvokingFactoryBean.class);
 			clearCredentials.getPropertyValues().addPropertyValue("targetObject", new RuntimeBeanReference(amfbId));
-			clearCredentials.getPropertyValues().addPropertyValue("targetMethod",
-					"isEraseCredentialsAfterAuthentication");
+			clearCredentials.getPropertyValues()
+				.addPropertyValue("targetMethod", "isEraseCredentialsAfterAuthentication");
 			authManager.addConstructorArgValue(new RuntimeBeanReference(amfbId));
 			authManager.addPropertyValue("eraseCredentialsAfterAuthentication", clearCredentials);
 		}
@@ -300,12 +302,12 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
 				OrderDecorator previous = filters.get(i - 1);
 				if (filter.getOrder() == previous.getOrder()) {
 					pc.getReaderContext()
-							.error("Filter beans '" + filter.bean + "' and '" + previous.bean
-									+ "' have the same 'order' value. When using custom filters, "
-									+ "please make sure the positions do not conflict with default filters. "
-									+ "Alternatively you can disable the default filters by removing the corresponding "
-									+ "child elements from <http> and avoiding the use of <http auto-config='true'>.",
-									source);
+						.error("Filter beans '" + filter.bean + "' and '" + previous.bean
+								+ "' have the same 'order' value. When using custom filters, "
+								+ "please make sure the positions do not conflict with default filters. "
+								+ "Alternatively you can disable the default filters by removing the corresponding "
+								+ "child elements from <http> and avoiding the use of <http auto-config='true'>.",
+								source);
 				}
 			}
 		}
@@ -324,8 +326,9 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
 			}
 			RuntimeBeanReference bean = new RuntimeBeanReference(ref);
 			if (WebConfigUtils.countNonEmpty(new String[] { after, before, position }) != 1) {
-				pc.getReaderContext().error("A single '" + ATT_AFTER + "', '" + ATT_BEFORE + "', or '" + ATT_POSITION
-						+ "' attribute must be supplied", pc.extractSource(elt));
+				pc.getReaderContext()
+					.error("A single '" + ATT_AFTER + "', '" + ATT_BEFORE + "', or '" + ATT_POSITION
+							+ "' attribute must be supplied", pc.extractSource(elt));
 			}
 			if (StringUtils.hasText(position)) {
 				customFilters.add(new OrderDecorator(bean, SecurityFilters.valueOf(position)));
@@ -368,14 +371,15 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
 		fcpBldr.addConstructorArgReference(BeanIds.FILTER_CHAINS);
 		fcpBldr.addPropertyValue("filterChainValidator", new RootBeanDefinition(DefaultFilterChainValidator.class));
 		BeanDefinition filterChainDecorator = BeanDefinitionBuilder
-				.rootBeanDefinition(FilterChainDecoratorFactory.class)
-				.addPropertyValue("observationRegistry", getObservationRegistry(element)).getBeanDefinition();
+			.rootBeanDefinition(FilterChainDecoratorFactory.class)
+			.addPropertyValue("observationRegistry", getObservationRegistry(element))
+			.getBeanDefinition();
 		fcpBldr.addPropertyValue("filterChainDecorator", filterChainDecorator);
 		BeanDefinition fcpBean = fcpBldr.getBeanDefinition();
 		pc.registerBeanComponent(new BeanComponentDefinition(fcpBean, BeanIds.FILTER_CHAIN_PROXY));
 		registry.registerAlias(BeanIds.FILTER_CHAIN_PROXY, BeanIds.SPRING_SECURITY_FILTER_CHAIN);
 		BeanDefinitionBuilder requestRejected = BeanDefinitionBuilder
-				.rootBeanDefinition(RequestRejectedHandlerPostProcessor.class);
+			.rootBeanDefinition(RequestRejectedHandlerPostProcessor.class);
 		requestRejected.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 		requestRejected.addConstructorArgValue("requestRejectedHandler");
 		requestRejected.addConstructorArgValue(BeanIds.FILTER_CHAIN_PROXY);
@@ -414,13 +418,14 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser {
 		public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
 			if (registry.containsBeanDefinition(this.beanName)) {
 				BeanDefinition beanDefinition = registry.getBeanDefinition(this.targetBeanName);
-				beanDefinition.getPropertyValues().add(this.targetPropertyName,
-						new RuntimeBeanReference(this.beanName));
+				beanDefinition.getPropertyValues()
+					.add(this.targetPropertyName, new RuntimeBeanReference(this.beanName));
 			}
 			else if (!this.observationRegistry.isNoop()) {
 				BeanDefinition observable = BeanDefinitionBuilder
-						.rootBeanDefinition(ObservationMarkingRequestRejectedHandler.class)
-						.addConstructorArgValue(this.observationRegistry).getBeanDefinition();
+					.rootBeanDefinition(ObservationMarkingRequestRejectedHandler.class)
+					.addConstructorArgValue(this.observationRegistry)
+					.getBeanDefinition();
 				BeanDefinition beanDefinition = registry.getBeanDefinition(this.targetBeanName);
 				beanDefinition.getPropertyValues().add(this.targetPropertyName, observable);
 			}

config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java

@@ -99,9 +99,9 @@ class LogoutBeanDefinitionParser implements BeanDefinitionParser {
 		builder.addPropertyValue("logoutRequestMatcher", getLogoutRequestMatcher(logoutUrl));
 		if (StringUtils.hasText(successHandlerRef)) {
 			if (StringUtils.hasText(logoutSuccessUrl)) {
-				pc.getReaderContext().error(
-						"Use " + ATT_LOGOUT_SUCCESS_URL + " or " + ATT_LOGOUT_HANDLER + ", but not both",
-						pc.extractSource(element));
+				pc.getReaderContext()
+					.error("Use " + ATT_LOGOUT_SUCCESS_URL + " or " + ATT_LOGOUT_HANDLER + ", but not both",
+							pc.extractSource(element));
 			}
 			builder.addConstructorArgReference(successHandlerRef);
 			this.logoutSuccessHandler = new RuntimeBeanReference(successHandlerRef);
@@ -134,7 +134,7 @@ class LogoutBeanDefinitionParser implements BeanDefinitionParser {
 
 	private BeanDefinition getLogoutRequestMatcher(String logoutUrl) {
 		BeanDefinitionBuilder matcherBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition("org.springframework.security.web.util.matcher.AntPathRequestMatcher");
+			.rootBeanDefinition("org.springframework.security.web.util.matcher.AntPathRequestMatcher");
 		matcherBuilder.addConstructorArgValue(logoutUrl);
 		if (this.csrfEnabled) {
 			matcherBuilder.addConstructorArgValue("POST");

config/src/main/java/org/springframework/security/config/http/MatcherType.java

@@ -39,8 +39,8 @@ import org.springframework.util.StringUtils;
  */
 public enum MatcherType {
 
-	ant(AntPathRequestMatcher.class), regex(RegexRequestMatcher.class), ciRegex(RegexRequestMatcher.class), mvc(
-			MvcRequestMatcher.class);
+	ant(AntPathRequestMatcher.class), regex(RegexRequestMatcher.class), ciRegex(RegexRequestMatcher.class),
+	mvc(MvcRequestMatcher.class);
 
 	private static final String HANDLER_MAPPING_INTROSPECTOR = "org.springframework.web.servlet.handler.HandlerMappingIntrospector";
 

config/src/main/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParser.java

@@ -77,21 +77,21 @@ final class OAuth2ClientBeanDefinitionParser implements BeanDefinitionParser {
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		Element authorizationCodeGrantElt = DomUtils.getChildElementByTagName(element, ELT_AUTHORIZATION_CODE_GRANT);
 		BeanMetadataElement clientRegistrationRepository = OAuth2ClientBeanDefinitionParserUtils
-				.getClientRegistrationRepository(element);
+			.getClientRegistrationRepository(element);
 		BeanMetadataElement authorizedClientRepository = OAuth2ClientBeanDefinitionParserUtils
-				.getAuthorizedClientRepository(element);
+			.getAuthorizedClientRepository(element);
 		if (authorizedClientRepository == null) {
 			BeanMetadataElement authorizedClientService = OAuth2ClientBeanDefinitionParserUtils
-					.getAuthorizedClientService(element);
+				.getAuthorizedClientService(element);
 			this.defaultAuthorizedClientRepository = OAuth2ClientBeanDefinitionParserUtils
-					.createDefaultAuthorizedClientRepository(clientRegistrationRepository, authorizedClientService);
+				.createDefaultAuthorizedClientRepository(clientRegistrationRepository, authorizedClientService);
 			authorizedClientRepository = new RuntimeBeanReference(OAuth2AuthorizedClientRepository.class);
 		}
 		BeanMetadataElement authorizationRequestRepository = getAuthorizationRequestRepository(
 				authorizationCodeGrantElt);
 		BeanMetadataElement authorizationRedirectStrategy = getAuthorizationRedirectStrategy(authorizationCodeGrantElt);
 		BeanDefinitionBuilder authorizationRequestRedirectFilterBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition(OAuth2AuthorizationRequestRedirectFilter.class);
+			.rootBeanDefinition(OAuth2AuthorizationRequestRedirectFilter.class);
 		String authorizationRequestResolverRef = (authorizationCodeGrantElt != null)
 				? authorizationCodeGrantElt.getAttribute(ATT_AUTHORIZATION_REQUEST_RESOLVER_REF) : null;
 		if (!StringUtils.isEmpty(authorizationRequestResolverRef)) {
@@ -101,20 +101,23 @@ final class OAuth2ClientBeanDefinitionParser implements BeanDefinitionParser {
 			authorizationRequestRedirectFilterBuilder.addConstructorArgValue(clientRegistrationRepository);
 		}
 		this.authorizationRequestRedirectFilter = authorizationRequestRedirectFilterBuilder
-				.addPropertyValue("authorizationRequestRepository", authorizationRequestRepository)
-				.addPropertyValue("authorizationRedirectStrategy", authorizationRedirectStrategy)
-				.addPropertyValue("requestCache", this.requestCache).getBeanDefinition();
+			.addPropertyValue("authorizationRequestRepository", authorizationRequestRepository)
+			.addPropertyValue("authorizationRedirectStrategy", authorizationRedirectStrategy)
+			.addPropertyValue("requestCache", this.requestCache)
+			.getBeanDefinition();
 		BeanDefinitionBuilder authorizationCodeGrantFilterBldr = BeanDefinitionBuilder
-				.rootBeanDefinition(OAuth2AuthorizationCodeGrantFilter.class)
-				.addConstructorArgValue(clientRegistrationRepository).addConstructorArgValue(authorizedClientRepository)
-				.addConstructorArgValue(this.authenticationManager)
-				.addPropertyValue("authorizationRequestRepository", authorizationRequestRepository);
+			.rootBeanDefinition(OAuth2AuthorizationCodeGrantFilter.class)
+			.addConstructorArgValue(clientRegistrationRepository)
+			.addConstructorArgValue(authorizedClientRepository)
+			.addConstructorArgValue(this.authenticationManager)
+			.addPropertyValue("authorizationRequestRepository", authorizationRequestRepository);
 		this.authorizationCodeGrantFilter = authorizationCodeGrantFilterBldr.getBeanDefinition();
 
 		BeanMetadataElement accessTokenResponseClient = getAccessTokenResponseClient(authorizationCodeGrantElt);
 		this.authorizationCodeAuthenticationProvider = BeanDefinitionBuilder
-				.rootBeanDefinition(OAuth2AuthorizationCodeAuthenticationProvider.class)
-				.addConstructorArgValue(accessTokenResponseClient).getBeanDefinition();
+			.rootBeanDefinition(OAuth2AuthorizationCodeAuthenticationProvider.class)
+			.addConstructorArgValue(accessTokenResponseClient)
+			.getBeanDefinition();
 
 		return null;
 	}
@@ -125,9 +128,10 @@ final class OAuth2ClientBeanDefinitionParser implements BeanDefinitionParser {
 		if (!StringUtils.isEmpty(authorizationRequestRepositoryRef)) {
 			return new RuntimeBeanReference(authorizationRequestRepositoryRef);
 		}
-		return BeanDefinitionBuilder.rootBeanDefinition(
-				"org.springframework.security.oauth2.client.web.HttpSessionOAuth2AuthorizationRequestRepository")
-				.getBeanDefinition();
+		return BeanDefinitionBuilder
+			.rootBeanDefinition(
+					"org.springframework.security.oauth2.client.web.HttpSessionOAuth2AuthorizationRequestRepository")
+			.getBeanDefinition();
 	}
 
 	private BeanMetadataElement getAuthorizationRedirectStrategy(Element element) {
@@ -137,7 +141,7 @@ final class OAuth2ClientBeanDefinitionParser implements BeanDefinitionParser {
 			return new RuntimeBeanReference(authorizationRedirectStrategyRef);
 		}
 		return BeanDefinitionBuilder.rootBeanDefinition("org.springframework.security.web.DefaultRedirectStrategy")
-				.getBeanDefinition();
+			.getBeanDefinition();
 	}
 
 	private BeanMetadataElement getAccessTokenResponseClient(Element element) {
@@ -146,9 +150,10 @@ final class OAuth2ClientBeanDefinitionParser implements BeanDefinitionParser {
 		if (!StringUtils.isEmpty(accessTokenResponseClientRef)) {
 			return new RuntimeBeanReference(accessTokenResponseClientRef);
 		}
-		return BeanDefinitionBuilder.rootBeanDefinition(
-				"org.springframework.security.oauth2.client.endpoint.DefaultAuthorizationCodeTokenResponseClient")
-				.getBeanDefinition();
+		return BeanDefinitionBuilder
+			.rootBeanDefinition(
+					"org.springframework.security.oauth2.client.endpoint.DefaultAuthorizationCodeTokenResponseClient")
+			.getBeanDefinition();
 	}
 
 	BeanDefinition getDefaultAuthorizedClientRepository() {

config/src/main/java/org/springframework/security/config/http/OAuth2ClientBeanDefinitionParserUtils.java

@@ -68,13 +68,14 @@ final class OAuth2ClientBeanDefinitionParserUtils {
 			BeanMetadataElement authorizedClientService) {
 		if (authorizedClientService == null) {
 			authorizedClientService = BeanDefinitionBuilder
-					.rootBeanDefinition(
-							"org.springframework.security.oauth2.client.InMemoryOAuth2AuthorizedClientService")
-					.addConstructorArgValue(clientRegistrationRepository).getBeanDefinition();
+				.rootBeanDefinition("org.springframework.security.oauth2.client.InMemoryOAuth2AuthorizedClientService")
+				.addConstructorArgValue(clientRegistrationRepository)
+				.getBeanDefinition();
 		}
 		return BeanDefinitionBuilder.rootBeanDefinition(
 				"org.springframework.security.oauth2.client.web.AuthenticatedPrincipalOAuth2AuthorizedClientRepository")
-				.addConstructorArgValue(authorizedClientService).getBeanDefinition();
+			.addConstructorArgValue(authorizedClientService)
+			.getBeanDefinition();
 	}
 
 }

config/src/main/java/org/springframework/security/config/http/OAuth2ClientWebMvcSecurityPostProcessor.java

@@ -57,7 +57,7 @@ final class OAuth2ClientWebMvcSecurityPostProcessor implements BeanDefinitionReg
 			BeanDefinition beanDefinition = registry.getBeanDefinition(beanName);
 			if (RequestMappingHandlerAdapter.class.getName().equals(beanDefinition.getBeanClassName())) {
 				PropertyValue currentArgumentResolvers = beanDefinition.getPropertyValues()
-						.getPropertyValue(CUSTOM_ARGUMENT_RESOLVERS_PROPERTY);
+					.getPropertyValue(CUSTOM_ARGUMENT_RESOLVERS_PROPERTY);
 				ManagedList<Object> argumentResolvers = new ManagedList<>();
 				if (currentArgumentResolvers != null) {
 					argumentResolvers.addAll((ManagedList<?>) currentArgumentResolvers.getValue());
@@ -65,7 +65,7 @@ final class OAuth2ClientWebMvcSecurityPostProcessor implements BeanDefinitionReg
 				String[] authorizedClientManagerBeanNames = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
 						(ListableBeanFactory) this.beanFactory, OAuth2AuthorizedClientManager.class, false, false);
 				BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder
-						.genericBeanDefinition(OAuth2AuthorizedClientArgumentResolver.class);
+					.genericBeanDefinition(OAuth2AuthorizedClientArgumentResolver.class);
 				if (authorizedClientManagerBeanNames.length == 1) {
 					beanDefinitionBuilder.addConstructorArgReference(authorizedClientManagerBeanNames[0]);
 				}

config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java

@@ -146,29 +146,30 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		// register magic bean
 		BeanDefinition oauth2LoginBeanConfig = BeanDefinitionBuilder.rootBeanDefinition(OAuth2LoginBeanConfig.class)
-				.getBeanDefinition();
+			.getBeanDefinition();
 		String oauth2LoginBeanConfigId = parserContext.getReaderContext().generateBeanName(oauth2LoginBeanConfig);
 		parserContext
-				.registerBeanComponent(new BeanComponentDefinition(oauth2LoginBeanConfig, oauth2LoginBeanConfigId));
+			.registerBeanComponent(new BeanComponentDefinition(oauth2LoginBeanConfig, oauth2LoginBeanConfigId));
 		// configure filter
 		BeanMetadataElement clientRegistrationRepository = OAuth2ClientBeanDefinitionParserUtils
-				.getClientRegistrationRepository(element);
+			.getClientRegistrationRepository(element);
 		BeanMetadataElement authorizedClientRepository = OAuth2ClientBeanDefinitionParserUtils
-				.getAuthorizedClientRepository(element);
+			.getAuthorizedClientRepository(element);
 		if (authorizedClientRepository == null) {
 			BeanMetadataElement authorizedClientService = OAuth2ClientBeanDefinitionParserUtils
-					.getAuthorizedClientService(element);
+				.getAuthorizedClientService(element);
 			this.defaultAuthorizedClientRepository = OAuth2ClientBeanDefinitionParserUtils
-					.createDefaultAuthorizedClientRepository(clientRegistrationRepository, authorizedClientService);
+				.createDefaultAuthorizedClientRepository(clientRegistrationRepository, authorizedClientService);
 			authorizedClientRepository = new RuntimeBeanReference(OAuth2AuthorizedClientRepository.class);
 		}
 		BeanMetadataElement accessTokenResponseClient = getAccessTokenResponseClient(element);
 		BeanMetadataElement oauth2UserService = getOAuth2UserService(element);
 		BeanMetadataElement authorizationRequestRepository = getAuthorizationRequestRepository(element);
 		BeanDefinitionBuilder oauth2LoginAuthenticationFilterBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition(OAuth2LoginAuthenticationFilter.class)
-				.addConstructorArgValue(clientRegistrationRepository).addConstructorArgValue(authorizedClientRepository)
-				.addPropertyValue("authorizationRequestRepository", authorizationRequestRepository);
+			.rootBeanDefinition(OAuth2LoginAuthenticationFilter.class)
+			.addConstructorArgValue(clientRegistrationRepository)
+			.addConstructorArgValue(authorizedClientRepository)
+			.addPropertyValue("authorizationRequestRepository", authorizationRequestRepository);
 		if (this.sessionStrategy != null) {
 			oauth2LoginAuthenticationFilterBuilder.addPropertyValue("sessionAuthenticationStrategy",
 					this.sessionStrategy);
@@ -181,11 +182,12 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 		}
 		else {
 			oauth2LoginAuthenticationFilterBuilder
-					.addConstructorArgValue(OAuth2LoginAuthenticationFilter.DEFAULT_FILTER_PROCESSES_URI);
+				.addConstructorArgValue(OAuth2LoginAuthenticationFilter.DEFAULT_FILTER_PROCESSES_URI);
 		}
 		BeanDefinitionBuilder oauth2LoginAuthenticationProviderBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition(OAuth2LoginAuthenticationProvider.class)
-				.addConstructorArgValue(accessTokenResponseClient).addConstructorArgValue(oauth2UserService);
+			.rootBeanDefinition(OAuth2LoginAuthenticationProvider.class)
+			.addConstructorArgValue(accessTokenResponseClient)
+			.addConstructorArgValue(oauth2UserService);
 		String userAuthoritiesMapperRef = element.getAttribute(ATT_USER_AUTHORITIES_MAPPER_REF);
 		if (!StringUtils.isEmpty(userAuthoritiesMapperRef)) {
 			oauth2LoginAuthenticationProviderBuilder.addPropertyReference("authoritiesMapper",
@@ -195,7 +197,7 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 		this.oauth2LoginOidcAuthenticationProvider = getOidcAuthProvider(element, accessTokenResponseClient,
 				userAuthoritiesMapperRef);
 		BeanDefinitionBuilder oauth2AuthorizationRequestRedirectFilterBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition(OAuth2AuthorizationRequestRedirectFilter.class);
+			.rootBeanDefinition(OAuth2AuthorizationRequestRedirectFilter.class);
 		String authorizationRequestResolverRef = element.getAttribute(ATT_AUTHORIZATION_REQUEST_RESOLVER_REF);
 		if (!StringUtils.isEmpty(authorizationRequestResolverRef)) {
 			oauth2AuthorizationRequestRedirectFilterBuilder.addConstructorArgReference(authorizationRequestResolverRef);
@@ -204,20 +206,21 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 			oauth2AuthorizationRequestRedirectFilterBuilder.addConstructorArgValue(clientRegistrationRepository);
 		}
 		oauth2AuthorizationRequestRedirectFilterBuilder
-				.addPropertyValue("authorizationRequestRepository", authorizationRequestRepository)
-				.addPropertyValue("authorizationRedirectStrategy", getAuthorizationRedirectStrategy(element))
-				.addPropertyValue("requestCache", this.requestCache);
+			.addPropertyValue("authorizationRequestRepository", authorizationRequestRepository)
+			.addPropertyValue("authorizationRedirectStrategy", getAuthorizationRedirectStrategy(element))
+			.addPropertyValue("requestCache", this.requestCache);
 		this.oauth2AuthorizationRequestRedirectFilter = oauth2AuthorizationRequestRedirectFilterBuilder
-				.getBeanDefinition();
+			.getBeanDefinition();
 		String authenticationSuccessHandlerRef = element.getAttribute(ATT_AUTHENTICATION_SUCCESS_HANDLER_REF);
 		if (!StringUtils.isEmpty(authenticationSuccessHandlerRef)) {
 			oauth2LoginAuthenticationFilterBuilder.addPropertyReference("authenticationSuccessHandler",
 					authenticationSuccessHandlerRef);
 		}
 		else {
-			BeanDefinitionBuilder successHandlerBuilder = BeanDefinitionBuilder.rootBeanDefinition(
-					"org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler")
-					.addPropertyValue("requestCache", this.requestCache);
+			BeanDefinitionBuilder successHandlerBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(
+						"org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler")
+				.addPropertyValue("requestCache", this.requestCache);
 			oauth2LoginAuthenticationFilterBuilder.addPropertyValue("authenticationSuccessHandler",
 					successHandlerBuilder.getBeanDefinition());
 		}
@@ -225,17 +228,20 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 		if (!StringUtils.isEmpty(loginPage)) {
 			WebConfigUtils.validateHttpRedirect(loginPage, parserContext, source);
 			this.oauth2LoginAuthenticationEntryPoint = BeanDefinitionBuilder
-					.rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class).addConstructorArgValue(loginPage)
-					.addPropertyValue("portMapper", this.portMapper).addPropertyValue("portResolver", this.portResolver)
-					.getBeanDefinition();
+				.rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class)
+				.addConstructorArgValue(loginPage)
+				.addPropertyValue("portMapper", this.portMapper)
+				.addPropertyValue("portResolver", this.portResolver)
+				.getBeanDefinition();
 		}
 		else {
 			Map<RequestMatcher, AuthenticationEntryPoint> entryPoint = getLoginEntryPoint(element);
 			if (entryPoint != null) {
 				this.oauth2LoginAuthenticationEntryPoint = BeanDefinitionBuilder
-						.rootBeanDefinition(DelegatingAuthenticationEntryPoint.class).addConstructorArgValue(entryPoint)
-						.addPropertyValue("defaultEntryPoint", new LoginUrlAuthenticationEntryPoint(DEFAULT_LOGIN_URI))
-						.getBeanDefinition();
+					.rootBeanDefinition(DelegatingAuthenticationEntryPoint.class)
+					.addConstructorArgValue(entryPoint)
+					.addPropertyValue("defaultEntryPoint", new LoginUrlAuthenticationEntryPoint(DEFAULT_LOGIN_URI))
+					.getBeanDefinition();
 			}
 		}
 		String authenticationFailureHandlerRef = element.getAttribute(ATT_AUTHENTICATION_FAILURE_HANDLER_REF);
@@ -256,7 +262,8 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 				this.authenticationFilterSecurityContextHolderStrategy);
 		// prepare loginlinks
 		this.oauth2LoginLinks = BeanDefinitionBuilder.rootBeanDefinition(Map.class)
-				.setFactoryMethodOnBean("getLoginLinks", oauth2LoginBeanConfigId).getBeanDefinition();
+			.setFactoryMethodOnBean("getLoginLinks", oauth2LoginBeanConfigId)
+			.getBeanDefinition();
 		return oauth2LoginAuthenticationFilterBuilder.getBeanDefinition();
 	}
 
@@ -265,9 +272,10 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 		if (!StringUtils.isEmpty(authorizationRequestRepositoryRef)) {
 			return new RuntimeBeanReference(authorizationRequestRepositoryRef);
 		}
-		return BeanDefinitionBuilder.rootBeanDefinition(
-				"org.springframework.security.oauth2.client.web.HttpSessionOAuth2AuthorizationRequestRepository")
-				.getBeanDefinition();
+		return BeanDefinitionBuilder
+			.rootBeanDefinition(
+					"org.springframework.security.oauth2.client.web.HttpSessionOAuth2AuthorizationRequestRepository")
+			.getBeanDefinition();
 	}
 
 	private BeanMetadataElement getAuthorizationRedirectStrategy(Element element) {
@@ -276,20 +284,21 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 			return new RuntimeBeanReference(authorizationRedirectStrategyRef);
 		}
 		return BeanDefinitionBuilder.rootBeanDefinition("org.springframework.security.web.DefaultRedirectStrategy")
-				.getBeanDefinition();
+			.getBeanDefinition();
 	}
 
 	private BeanDefinition getOidcAuthProvider(Element element, BeanMetadataElement accessTokenResponseClient,
 			String userAuthoritiesMapperRef) {
 		boolean oidcAuthenticationProviderEnabled = ClassUtils
-				.isPresent("org.springframework.security.oauth2.jwt.JwtDecoder", this.getClass().getClassLoader());
+			.isPresent("org.springframework.security.oauth2.jwt.JwtDecoder", this.getClass().getClassLoader());
 		if (!oidcAuthenticationProviderEnabled) {
 			return BeanDefinitionBuilder.rootBeanDefinition(OidcAuthenticationRequestChecker.class).getBeanDefinition();
 		}
 		BeanMetadataElement oidcUserService = getOidcUserService(element);
 		BeanDefinitionBuilder oidcAuthProviderBuilder = BeanDefinitionBuilder.rootBeanDefinition(
 				"org.springframework.security.oauth2.client.oidc.authentication.OidcAuthorizationCodeAuthenticationProvider")
-				.addConstructorArgValue(accessTokenResponseClient).addConstructorArgValue(oidcUserService);
+			.addConstructorArgValue(accessTokenResponseClient)
+			.addConstructorArgValue(oidcUserService);
 		if (!StringUtils.isEmpty(userAuthoritiesMapperRef)) {
 			oidcAuthProviderBuilder.addPropertyReference("authoritiesMapper", userAuthoritiesMapperRef);
 		}
@@ -306,8 +315,8 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 			return new RuntimeBeanReference(oidcUserServiceRef);
 		}
 		return BeanDefinitionBuilder
-				.rootBeanDefinition("org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService")
-				.getBeanDefinition();
+			.rootBeanDefinition("org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService")
+			.getBeanDefinition();
 	}
 
 	private BeanMetadataElement getOAuth2UserService(Element element) {
@@ -316,8 +325,8 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 			return new RuntimeBeanReference(oauth2UserServiceRef);
 		}
 		return BeanDefinitionBuilder
-				.rootBeanDefinition("org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService")
-				.getBeanDefinition();
+			.rootBeanDefinition("org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService")
+			.getBeanDefinition();
 	}
 
 	private BeanMetadataElement getAccessTokenResponseClient(Element element) {
@@ -325,9 +334,10 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 		if (!StringUtils.isEmpty(accessTokenResponseClientRef)) {
 			return new RuntimeBeanReference(accessTokenResponseClientRef);
 		}
-		return BeanDefinitionBuilder.rootBeanDefinition(
-				"org.springframework.security.oauth2.client.endpoint.DefaultAuthorizationCodeTokenResponseClient")
-				.getBeanDefinition();
+		return BeanDefinitionBuilder
+			.rootBeanDefinition(
+					"org.springframework.security.oauth2.client.endpoint.DefaultAuthorizationCodeTokenResponseClient")
+			.getBeanDefinition();
 	}
 
 	BeanDefinition getDefaultAuthorizedClientRepository() {
@@ -395,8 +405,10 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 		@Override
 		public Authentication authenticate(Authentication authentication) throws AuthenticationException {
 			OAuth2LoginAuthenticationToken authorizationCodeAuthentication = (OAuth2LoginAuthenticationToken) authentication;
-			if (!authorizationCodeAuthentication.getAuthorizationExchange().getAuthorizationRequest().getScopes()
-					.contains(OidcScopes.OPENID)) {
+			if (!authorizationCodeAuthentication.getAuthorizationExchange()
+				.getAuthorizationRequest()
+				.getScopes()
+				.contains(OidcScopes.OPENID)) {
 				return null;
 			}
 			// Section 3.1.2.1 Authentication Request -
@@ -433,7 +445,7 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser {
 		Map<String, String> getLoginLinks() {
 			Iterable<ClientRegistration> clientRegistrations = null;
 			ClientRegistrationRepository clientRegistrationRepository = this.context
-					.getBean(ClientRegistrationRepository.class);
+				.getBean(ClientRegistrationRepository.class);
 			ResolvableType type = ResolvableType.forInstance(clientRegistrationRepository).as(Iterable.class);
 			if (type != ResolvableType.NONE && ClientRegistration.class.isAssignableFrom(type.resolveGenerics()[0])) {
 				clientRegistrations = (Iterable<ClientRegistration>) clientRegistrationRepository;

config/src/main/java/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParser.java

@@ -125,7 +125,7 @@ final class OAuth2ResourceServerBeanDefinitionParser implements BeanDefinitionPa
 		}
 		BeanMetadataElement bearerTokenResolver = getBearerTokenResolver(oauth2ResourceServer);
 		BeanDefinitionBuilder requestMatcherBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition(BearerTokenRequestMatcher.class);
+			.rootBeanDefinition(BearerTokenRequestMatcher.class);
 		requestMatcherBuilder.addConstructorArgValue(bearerTokenResolver);
 		BeanDefinition requestMatcher = requestMatcherBuilder.getBeanDefinition();
 		BeanMetadataElement authenticationEntryPoint = getEntryPoint(oauth2ResourceServer);
@@ -133,7 +133,7 @@ final class OAuth2ResourceServerBeanDefinitionParser implements BeanDefinitionPa
 		this.deniedHandlers.put(requestMatcher, this.accessDeniedHandler);
 		this.ignoreCsrfRequestMatchers.add(requestMatcher);
 		BeanDefinitionBuilder filterBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition(BearerTokenAuthenticationFilter.class);
+			.rootBeanDefinition(BearerTokenAuthenticationFilter.class);
 		BeanMetadataElement authenticationManagerResolver = getAuthenticationManagerResolver(oauth2ResourceServer);
 		filterBuilder.addConstructorArgValue(authenticationManagerResolver);
 		filterBuilder.addPropertyValue(BEARER_TOKEN_RESOLVER, bearerTokenResolver);
@@ -146,20 +146,21 @@ final class OAuth2ResourceServerBeanDefinitionParser implements BeanDefinitionPa
 	void validateConfiguration(Element oauth2ResourceServer, Element jwt, Element opaqueToken, ParserContext pc) {
 		if (!oauth2ResourceServer.hasAttribute(AUTHENTICATION_MANAGER_RESOLVER_REF)) {
 			if (jwt == null && opaqueToken == null) {
-				pc.getReaderContext().error("Didn't find authentication-manager-resolver-ref, "
-						+ "<jwt>, or <opaque-token>. " + "Please select one.", oauth2ResourceServer);
+				pc.getReaderContext()
+					.error("Didn't find authentication-manager-resolver-ref, " + "<jwt>, or <opaque-token>. "
+							+ "Please select one.", oauth2ResourceServer);
 			}
 			return;
 		}
 		if (jwt != null) {
-			pc.getReaderContext().error(
-					"Found <jwt> as well as authentication-manager-resolver-ref. Please select just one.",
-					oauth2ResourceServer);
+			pc.getReaderContext()
+				.error("Found <jwt> as well as authentication-manager-resolver-ref. Please select just one.",
+						oauth2ResourceServer);
 		}
 		if (opaqueToken != null) {
-			pc.getReaderContext().error(
-					"Found <opaque-token> as well as authentication-manager-resolver-ref. Please select just one.",
-					oauth2ResourceServer);
+			pc.getReaderContext()
+				.error("Found <opaque-token> as well as authentication-manager-resolver-ref. Please select just one.",
+						oauth2ResourceServer);
 		}
 	}
 
@@ -169,7 +170,7 @@ final class OAuth2ResourceServerBeanDefinitionParser implements BeanDefinitionPa
 			return new RuntimeBeanReference(authenticationManagerResolverRef);
 		}
 		BeanDefinitionBuilder authenticationManagerResolver = BeanDefinitionBuilder
-				.rootBeanDefinition(StaticAuthenticationManagerResolver.class);
+			.rootBeanDefinition(StaticAuthenticationManagerResolver.class);
 		authenticationManagerResolver.addConstructorArgValue(this.authenticationManager);
 		return authenticationManagerResolver.getBeanDefinition();
 	}
@@ -207,7 +208,7 @@ final class OAuth2ResourceServerBeanDefinitionParser implements BeanDefinitionPa
 		public BeanDefinition parse(Element element, ParserContext pc) {
 			validateConfiguration(element, pc);
 			BeanDefinitionBuilder jwtProviderBuilder = BeanDefinitionBuilder
-					.rootBeanDefinition(JwtAuthenticationProvider.class);
+				.rootBeanDefinition(JwtAuthenticationProvider.class);
 			jwtProviderBuilder.addConstructorArgValue(getDecoder(element));
 			jwtProviderBuilder.addPropertyValue(JWT_AUTHENTICATION_CONVERTER, getJwtAuthenticationConverter(element));
 			return jwtProviderBuilder.getBeanDefinition();
@@ -227,7 +228,7 @@ final class OAuth2ResourceServerBeanDefinitionParser implements BeanDefinitionPa
 				return new RuntimeBeanReference(decoderRef);
 			}
 			BeanDefinitionBuilder builder = BeanDefinitionBuilder
-					.rootBeanDefinition(NimbusJwtDecoderJwkSetUriFactoryBean.class);
+				.rootBeanDefinition(NimbusJwtDecoderJwkSetUriFactoryBean.class);
 			builder.addConstructorArgValue(element.getAttribute(JWK_SET_URI));
 			return builder.getBeanDefinition();
 		}
@@ -263,7 +264,7 @@ final class OAuth2ResourceServerBeanDefinitionParser implements BeanDefinitionPa
 			BeanMetadataElement introspector = getIntrospector(element);
 			String authenticationConverterRef = element.getAttribute(AUTHENTICATION_CONVERTER_REF);
 			BeanDefinitionBuilder opaqueTokenProviderBuilder = BeanDefinitionBuilder
-					.rootBeanDefinition(OpaqueTokenAuthenticationProvider.class);
+				.rootBeanDefinition(OpaqueTokenAuthenticationProvider.class);
 			opaqueTokenProviderBuilder.addConstructorArgValue(introspector);
 			if (StringUtils.hasText(authenticationConverterRef)) {
 				opaqueTokenProviderBuilder.addPropertyReference(AUTHENTICATION_CONVERTER, authenticationConverterRef);
@@ -276,15 +277,16 @@ final class OAuth2ResourceServerBeanDefinitionParser implements BeanDefinitionPa
 			boolean usesEndpoint = element.hasAttribute(INTROSPECTION_URI) || element.hasAttribute(CLIENT_ID)
 					|| element.hasAttribute(CLIENT_SECRET);
 			if (usesIntrospector == usesEndpoint) {
-				pc.getReaderContext().error("Please specify either introspector-ref or all of "
-						+ "introspection-uri, client-id, and client-secret.", element);
+				pc.getReaderContext()
+					.error("Please specify either introspector-ref or all of "
+							+ "introspection-uri, client-id, and client-secret.", element);
 				return;
 			}
 			if (usesEndpoint) {
 				if (!(element.hasAttribute(INTROSPECTION_URI) && element.hasAttribute(CLIENT_ID)
 						&& element.hasAttribute(CLIENT_SECRET))) {
 					pc.getReaderContext()
-							.error("Please specify introspection-uri, client-id, and client-secret together", element);
+						.error("Please specify introspection-uri, client-id, and client-secret together", element);
 				}
 			}
 		}
@@ -298,7 +300,7 @@ final class OAuth2ResourceServerBeanDefinitionParser implements BeanDefinitionPa
 			String clientId = element.getAttribute(CLIENT_ID);
 			String clientSecret = element.getAttribute(CLIENT_SECRET);
 			BeanDefinitionBuilder introspectorBuilder = BeanDefinitionBuilder
-					.rootBeanDefinition(NimbusOpaqueTokenIntrospector.class);
+				.rootBeanDefinition(NimbusOpaqueTokenIntrospector.class);
 			introspectorBuilder.addConstructorArgValue(introspectionUri);
 			introspectorBuilder.addConstructorArgValue(clientId);
 			introspectorBuilder.addConstructorArgValue(clientSecret);

config/src/main/java/org/springframework/security/config/http/RememberMeBeanDefinitionParser.java

@@ -109,14 +109,14 @@ class RememberMeBeanDefinitionParser implements BeanDefinitionParser {
 		if (servicesRefSet && (dataSourceSet || tokenRepoSet || userServiceSet || tokenValiditySet || useSecureCookieSet
 				|| remembermeParameterSet || remembermeCookieSet)) {
 			pc.getReaderContext()
-					.error(ATT_SERVICES_REF + " can't be used in combination with attributes " + ATT_TOKEN_REPOSITORY
-							+ "," + ATT_DATA_SOURCE + ", " + ATT_USER_SERVICE_REF + ", " + ATT_TOKEN_VALIDITY + ", "
-							+ ATT_SECURE_COOKIE + ", " + ATT_FORM_REMEMBERME_PARAMETER + " or " + ATT_REMEMBERME_COOKIE,
-							source);
+				.error(ATT_SERVICES_REF + " can't be used in combination with attributes " + ATT_TOKEN_REPOSITORY + ","
+						+ ATT_DATA_SOURCE + ", " + ATT_USER_SERVICE_REF + ", " + ATT_TOKEN_VALIDITY + ", "
+						+ ATT_SECURE_COOKIE + ", " + ATT_FORM_REMEMBERME_PARAMETER + " or " + ATT_REMEMBERME_COOKIE,
+						source);
 		}
 		if (dataSourceSet && tokenRepoSet) {
-			pc.getReaderContext().error("Specify " + ATT_TOKEN_REPOSITORY + " or " + ATT_DATA_SOURCE + " but not both",
-					source);
+			pc.getReaderContext()
+				.error("Specify " + ATT_TOKEN_REPOSITORY + " or " + ATT_DATA_SOURCE + " but not both", source);
 		}
 		boolean isPersistent = dataSourceSet | tokenRepoSet;
 		if (isPersistent) {
@@ -127,8 +127,8 @@ class RememberMeBeanDefinitionParser implements BeanDefinitionParser {
 			}
 			else {
 				tokenRepo = new RootBeanDefinition(JdbcTokenRepositoryImpl.class);
-				((BeanDefinition) tokenRepo).getPropertyValues().addPropertyValue("dataSource",
-						new RuntimeBeanReference(dataSource));
+				((BeanDefinition) tokenRepo).getPropertyValues()
+					.addPropertyValue("dataSource", new RuntimeBeanReference(dataSource));
 			}
 			services.getConstructorArgumentValues().addIndexedArgumentValue(2, tokenRepo);
 		}
@@ -151,8 +151,9 @@ class RememberMeBeanDefinitionParser implements BeanDefinitionParser {
 			if (tokenValiditySet) {
 				boolean isTokenValidityNegative = tokenValiditySeconds.startsWith("-");
 				if (isTokenValidityNegative && isPersistent) {
-					pc.getReaderContext().error(ATT_TOKEN_VALIDITY + " cannot be negative if using"
-							+ " a persistent remember-me token repository", source);
+					pc.getReaderContext()
+						.error(ATT_TOKEN_VALIDITY + " cannot be negative if using"
+								+ " a persistent remember-me token repository", source);
 				}
 				services.getPropertyValues().addPropertyValue("tokenValiditySeconds", tokenValiditySeconds);
 			}

config/src/main/java/org/springframework/security/config/http/Saml2LoginBeanDefinitionParser.java

@@ -119,34 +119,35 @@ final class Saml2LoginBeanDefinitionParser implements BeanDefinitionParser {
 			this.loginProcessingUrl = loginProcessingUrl;
 		}
 		BeanDefinition saml2LoginBeanConfig = BeanDefinitionBuilder.rootBeanDefinition(Saml2LoginBeanConfig.class)
-				.getBeanDefinition();
+			.getBeanDefinition();
 		String saml2LoginBeanConfigId = pc.getReaderContext().generateBeanName(saml2LoginBeanConfig);
 		pc.registerBeanComponent(new BeanComponentDefinition(saml2LoginBeanConfig, saml2LoginBeanConfigId));
 		registerDefaultCsrfOverride();
 		BeanMetadataElement relyingPartyRegistrationRepository = Saml2LoginBeanDefinitionParserUtils
-				.getRelyingPartyRegistrationRepository(element);
+			.getRelyingPartyRegistrationRepository(element);
 		BeanMetadataElement authenticationRequestRepository = Saml2LoginBeanDefinitionParserUtils
-				.getAuthenticationRequestRepository(element);
+			.getAuthenticationRequestRepository(element);
 		BeanMetadataElement authenticationRequestResolver = Saml2LoginBeanDefinitionParserUtils
-				.getAuthenticationRequestResolver(element);
+			.getAuthenticationRequestResolver(element);
 		if (authenticationRequestResolver == null) {
 			authenticationRequestResolver = Saml2LoginBeanDefinitionParserUtils
-					.createDefaultAuthenticationRequestResolver(relyingPartyRegistrationRepository);
+				.createDefaultAuthenticationRequestResolver(relyingPartyRegistrationRepository);
 		}
 		BeanMetadataElement authenticationConverter = Saml2LoginBeanDefinitionParserUtils
-				.getAuthenticationConverter(element);
+			.getAuthenticationConverter(element);
 		if (authenticationConverter == null) {
 			if (!this.loginProcessingUrl.contains("{registrationId}")) {
 				pc.getReaderContext().error("loginProcessingUrl must contain {registrationId} path variable", element);
 			}
 			authenticationConverter = Saml2LoginBeanDefinitionParserUtils
-					.createDefaultAuthenticationConverter(relyingPartyRegistrationRepository);
+				.createDefaultAuthenticationConverter(relyingPartyRegistrationRepository);
 		}
 		// Configure the Saml2WebSsoAuthenticationFilter
 		BeanDefinitionBuilder saml2WebSsoAuthenticationFilterBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition(Saml2WebSsoAuthenticationFilter.class)
-				.addConstructorArgValue(authenticationConverter).addConstructorArgValue(this.loginProcessingUrl)
-				.addPropertyValue("authenticationRequestRepository", authenticationRequestRepository);
+			.rootBeanDefinition(Saml2WebSsoAuthenticationFilter.class)
+			.addConstructorArgValue(authenticationConverter)
+			.addConstructorArgValue(this.loginProcessingUrl)
+			.addPropertyValue("authenticationRequestRepository", authenticationRequestRepository);
 		resolveLoginPage(element, pc);
 		resolveAuthenticationSuccessHandler(element, saml2WebSsoAuthenticationFilterBuilder);
 		resolveAuthenticationFailureHandler(element, saml2WebSsoAuthenticationFilterBuilder);
@@ -154,16 +155,16 @@ final class Saml2LoginBeanDefinitionParser implements BeanDefinitionParser {
 		resolveSecurityContextRepository(element, saml2WebSsoAuthenticationFilterBuilder);
 		// Configure the Saml2WebSsoAuthenticationRequestFilter
 		this.saml2WebSsoAuthenticationRequestFilter = BeanDefinitionBuilder
-				.rootBeanDefinition(Saml2WebSsoAuthenticationRequestFilter.class)
-				.addConstructorArgValue(authenticationRequestResolver)
-				.addPropertyValue("authenticationRequestRepository", authenticationRequestRepository)
-				.getBeanDefinition();
+			.rootBeanDefinition(Saml2WebSsoAuthenticationRequestFilter.class)
+			.addConstructorArgValue(authenticationRequestResolver)
+			.addPropertyValue("authenticationRequestRepository", authenticationRequestRepository)
+			.getBeanDefinition();
 		BeanDefinition saml2AuthenticationProvider = Saml2LoginBeanDefinitionParserUtils.createAuthenticationProvider();
 		this.authenticationProviders.add(
 				new RuntimeBeanReference(pc.getReaderContext().registerWithGeneratedName(saml2AuthenticationProvider)));
 		this.saml2AuthenticationUrlToProviderName = BeanDefinitionBuilder.rootBeanDefinition(Map.class)
-				.setFactoryMethodOnBean("getAuthenticationUrlToProviderName", saml2LoginBeanConfigId)
-				.getBeanDefinition();
+			.setFactoryMethodOnBean("getAuthenticationUrlToProviderName", saml2LoginBeanConfigId)
+			.getBeanDefinition();
 		return saml2WebSsoAuthenticationFilterBuilder.getBeanDefinition();
 	}
 
@@ -195,23 +196,27 @@ final class Saml2LoginBeanDefinitionParser implements BeanDefinitionParser {
 		if (StringUtils.hasText(loginPage)) {
 			WebConfigUtils.validateHttpRedirect(loginPage, parserContext, source);
 			saml2LoginAuthenticationEntryPoint = BeanDefinitionBuilder
-					.rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class).addConstructorArgValue(loginPage)
-					.addPropertyValue("portMapper", this.portMapper).addPropertyValue("portResolver", this.portResolver)
-					.getBeanDefinition();
+				.rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class)
+				.addConstructorArgValue(loginPage)
+				.addPropertyValue("portMapper", this.portMapper)
+				.addPropertyValue("portResolver", this.portResolver)
+				.getBeanDefinition();
 		}
 		else {
 			Map<String, String> identityProviderUrlMap = getIdentityProviderUrlMap(element);
 			if (identityProviderUrlMap.size() == 1) {
 				String loginUrl = identityProviderUrlMap.entrySet().iterator().next().getKey();
 				saml2LoginAuthenticationEntryPoint = BeanDefinitionBuilder
-						.rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class).addConstructorArgValue(loginUrl)
-						.addPropertyValue("portMapper", this.portMapper)
-						.addPropertyValue("portResolver", this.portResolver).getBeanDefinition();
+					.rootBeanDefinition(LoginUrlAuthenticationEntryPoint.class)
+					.addConstructorArgValue(loginUrl)
+					.addPropertyValue("portMapper", this.portMapper)
+					.addPropertyValue("portResolver", this.portResolver)
+					.getBeanDefinition();
 			}
 		}
 		if (saml2LoginAuthenticationEntryPoint != null) {
 			BeanDefinitionBuilder requestMatcherBuilder = BeanDefinitionBuilder
-					.rootBeanDefinition(AntPathRequestMatcher.class);
+				.rootBeanDefinition(AntPathRequestMatcher.class);
 			requestMatcherBuilder.addConstructorArgValue(this.loginProcessingUrl);
 			BeanDefinition requestMatcher = requestMatcherBuilder.getBeanDefinition();
 			this.entryPoints.put(requestMatcher, saml2LoginAuthenticationEntryPoint);
@@ -244,9 +249,10 @@ final class Saml2LoginBeanDefinitionParser implements BeanDefinitionParser {
 					authenticationSuccessHandlerRef);
 		}
 		else {
-			BeanDefinitionBuilder successHandlerBuilder = BeanDefinitionBuilder.rootBeanDefinition(
-					"org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler")
-					.addPropertyValue("requestCache", this.requestCache);
+			BeanDefinitionBuilder successHandlerBuilder = BeanDefinitionBuilder
+				.rootBeanDefinition(
+						"org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler")
+				.addPropertyValue("requestCache", this.requestCache);
 			saml2WebSsoAuthenticationFilterBuilder.addPropertyValue("authenticationSuccessHandler",
 					successHandlerBuilder.getBeanDefinition());
 		}
@@ -254,7 +260,7 @@ final class Saml2LoginBeanDefinitionParser implements BeanDefinitionParser {
 
 	private void registerDefaultCsrfOverride() {
 		BeanDefinitionBuilder requestMatcherBuilder = BeanDefinitionBuilder
-				.rootBeanDefinition(AntPathRequestMatcher.class);
+			.rootBeanDefinition(AntPathRequestMatcher.class);
 		requestMatcherBuilder.addConstructorArgValue(this.loginProcessingUrl);
 		BeanDefinition requestMatcher = requestMatcherBuilder.getBeanDefinition();
 		this.csrfIgnoreRequestMatchers.add(requestMatcher);
@@ -296,7 +302,7 @@ final class Saml2LoginBeanDefinitionParser implements BeanDefinitionParser {
 		Map<String, String> getAuthenticationUrlToProviderName() {
 			Iterable<RelyingPartyRegistration> relyingPartyRegistrations = null;
 			RelyingPartyRegistrationRepository relyingPartyRegistrationRepository = this.context
-					.getBean(RelyingPartyRegistrationRepository.class);
+				.getBean(RelyingPartyRegistrationRepository.class);
 			ResolvableType type = ResolvableType.forInstance(relyingPartyRegistrationRepository).as(Iterable.class);
 			if (type != ResolvableType.NONE
 					&& RelyingPartyRegistration.class.isAssignableFrom(type.resolveGenerics()[0])) {

config/src/main/java/org/springframework/security/config/http/Saml2LoginBeanDefinitionParserUtils.java

@@ -48,7 +48,7 @@ final class Saml2LoginBeanDefinitionParserUtils {
 
 	static BeanMetadataElement getRelyingPartyRegistrationRepository(Element element) {
 		String relyingPartyRegistrationRepositoryRef = element
-				.getAttribute(ATT_RELYING_PARTY_REGISTRATION_REPOSITORY_REF);
+			.getAttribute(ATT_RELYING_PARTY_REGISTRATION_REPOSITORY_REF);
 		if (StringUtils.hasText(relyingPartyRegistrationRepositoryRef)) {
 			return new RuntimeBeanReference(relyingPartyRegistrationRepositoryRef);
 		}
@@ -61,7 +61,7 @@ final class Saml2LoginBeanDefinitionParserUtils {
 			return new RuntimeBeanReference(authenticationRequestRepositoryRef);
 		}
 		return BeanDefinitionBuilder.rootBeanDefinition(HttpSessionSaml2AuthenticationRequestRepository.class)
-				.getBeanDefinition();
+			.getBeanDefinition();
 	}
 
 	static BeanMetadataElement getAuthenticationRequestResolver(Element element) {
@@ -75,17 +75,19 @@ final class Saml2LoginBeanDefinitionParserUtils {
 	static BeanMetadataElement createDefaultAuthenticationRequestResolver(
 			BeanMetadataElement relyingPartyRegistrationRepository) {
 		BeanMetadataElement defaultRelyingPartyRegistrationResolver = BeanDefinitionBuilder
-				.rootBeanDefinition(DefaultRelyingPartyRegistrationResolver.class)
-				.addConstructorArgValue(relyingPartyRegistrationRepository).getBeanDefinition();
+			.rootBeanDefinition(DefaultRelyingPartyRegistrationResolver.class)
+			.addConstructorArgValue(relyingPartyRegistrationRepository)
+			.getBeanDefinition();
 		return BeanDefinitionBuilder.rootBeanDefinition(
 				"org.springframework.security.saml2.provider.service.web.authentication.OpenSaml4AuthenticationRequestResolver")
-				.addConstructorArgValue(defaultRelyingPartyRegistrationResolver).getBeanDefinition();
+			.addConstructorArgValue(defaultRelyingPartyRegistrationResolver)
+			.getBeanDefinition();
 	}
 
 	static BeanDefinition createAuthenticationProvider() {
 		return BeanDefinitionBuilder.rootBeanDefinition(
 				"org.springframework.security.saml2.provider.service.authentication.OpenSaml4AuthenticationProvider")
-				.getBeanDefinition();
+			.getBeanDefinition();
 	}
 
 	static BeanMetadataElement getAuthenticationConverter(Element element) {
@@ -98,10 +100,12 @@ final class Saml2LoginBeanDefinitionParserUtils {
 
 	static BeanDefinition createDefaultAuthenticationConverter(BeanMetadataElement relyingPartyRegistrationRepository) {
 		AbstractBeanDefinition resolver = BeanDefinitionBuilder
-				.rootBeanDefinition(DefaultRelyingPartyRegistrationResolver.class)
-				.addConstructorArgValue(relyingPartyRegistrationRepository).getBeanDefinition();
+			.rootBeanDefinition(DefaultRelyingPartyRegistrationResolver.class)
+			.addConstructorArgValue(relyingPartyRegistrationRepository)
+			.getBeanDefinition();
 		return BeanDefinitionBuilder.rootBeanDefinition(Saml2AuthenticationTokenConverter.class)
-				.addConstructorArgValue(resolver).getBeanDefinition();
+			.addConstructorArgValue(resolver)
+			.getBeanDefinition();
 	}
 
 }

config/src/main/java/org/springframework/security/config/http/Saml2LogoutBeanDefinitionParser.java

@@ -112,40 +112,47 @@ final class Saml2LogoutBeanDefinitionParser implements BeanDefinitionParser {
 			this.logoutSuccessHandler = createDefaultLogoutSuccessHandler();
 		}
 		BeanMetadataElement relyingPartyRegistrationRepository = Saml2LogoutBeanDefinitionParserUtils
-				.getRelyingPartyRegistrationRepository(element);
+			.getRelyingPartyRegistrationRepository(element);
 		BeanMetadataElement registrations = BeanDefinitionBuilder
-				.rootBeanDefinition(DefaultRelyingPartyRegistrationResolver.class)
-				.addConstructorArgValue(relyingPartyRegistrationRepository).getBeanDefinition();
+			.rootBeanDefinition(DefaultRelyingPartyRegistrationResolver.class)
+			.addConstructorArgValue(relyingPartyRegistrationRepository)
+			.getBeanDefinition();
 		BeanMetadataElement logoutResponseResolver = Saml2LogoutBeanDefinitionParserUtils
-				.getLogoutResponseResolver(element, registrations);
+			.getLogoutResponseResolver(element, registrations);
 		BeanMetadataElement logoutRequestValidator = Saml2LogoutBeanDefinitionParserUtils
-				.getLogoutRequestValidator(element);
+			.getLogoutRequestValidator(element);
 		BeanMetadataElement logoutRequestMatcher = createSaml2LogoutRequestMatcher();
 		this.logoutRequestFilter = BeanDefinitionBuilder.rootBeanDefinition(Saml2LogoutRequestFilter.class)
-				.addConstructorArgValue(registrations).addConstructorArgValue(logoutRequestValidator)
-				.addConstructorArgValue(logoutResponseResolver).addConstructorArgValue(this.logoutHandlers)
-				.addPropertyValue("logoutRequestMatcher", logoutRequestMatcher)
-				.addPropertyValue("securityContextHolderStrategy",
-						this.authenticationFilterSecurityContextHolderStrategy)
-				.getBeanDefinition();
+			.addConstructorArgValue(registrations)
+			.addConstructorArgValue(logoutRequestValidator)
+			.addConstructorArgValue(logoutResponseResolver)
+			.addConstructorArgValue(this.logoutHandlers)
+			.addPropertyValue("logoutRequestMatcher", logoutRequestMatcher)
+			.addPropertyValue("securityContextHolderStrategy", this.authenticationFilterSecurityContextHolderStrategy)
+			.getBeanDefinition();
 		BeanMetadataElement logoutResponseValidator = Saml2LogoutBeanDefinitionParserUtils
-				.getLogoutResponseValidator(element);
+			.getLogoutResponseValidator(element);
 		BeanMetadataElement logoutRequestRepository = Saml2LogoutBeanDefinitionParserUtils
-				.getLogoutRequestRepository(element);
+			.getLogoutRequestRepository(element);
 		BeanMetadataElement logoutResponseMatcher = createSaml2LogoutResponseMatcher();
 		this.logoutResponseFilter = BeanDefinitionBuilder.rootBeanDefinition(Saml2LogoutResponseFilter.class)
-				.addConstructorArgValue(registrations).addConstructorArgValue(logoutResponseValidator)
-				.addConstructorArgValue(this.logoutSuccessHandler)
-				.addPropertyValue("logoutRequestMatcher", logoutResponseMatcher)
-				.addPropertyValue("logoutRequestRepository", logoutRequestRepository).getBeanDefinition();
+			.addConstructorArgValue(registrations)
+			.addConstructorArgValue(logoutResponseValidator)
+			.addConstructorArgValue(this.logoutSuccessHandler)
+			.addPropertyValue("logoutRequestMatcher", logoutResponseMatcher)
+			.addPropertyValue("logoutRequestRepository", logoutRequestRepository)
+			.getBeanDefinition();
 		BeanMetadataElement logoutRequestResolver = Saml2LogoutBeanDefinitionParserUtils
-				.getLogoutRequestResolver(element, registrations);
+			.getLogoutRequestResolver(element, registrations);
 		BeanMetadataElement saml2LogoutRequestSuccessHandler = BeanDefinitionBuilder
-				.rootBeanDefinition(Saml2RelyingPartyInitiatedLogoutSuccessHandler.class)
-				.addConstructorArgValue(logoutRequestResolver).getBeanDefinition();
+			.rootBeanDefinition(Saml2RelyingPartyInitiatedLogoutSuccessHandler.class)
+			.addConstructorArgValue(logoutRequestResolver)
+			.getBeanDefinition();
 		this.logoutFilter = BeanDefinitionBuilder.rootBeanDefinition(LogoutFilter.class)
-				.addConstructorArgValue(saml2LogoutRequestSuccessHandler).addConstructorArgValue(this.logoutHandlers)
-				.addPropertyValue("logoutRequestMatcher", createLogoutRequestMatcher()).getBeanDefinition();
+			.addConstructorArgValue(saml2LogoutRequestSuccessHandler)
+			.addConstructorArgValue(this.logoutHandlers)
+			.addPropertyValue("logoutRequestMatcher", createLogoutRequestMatcher())
+			.getBeanDefinition();
 		return null;
 	}
 
@@ -153,45 +160,54 @@ final class Saml2LogoutBeanDefinitionParser implements BeanDefinitionParser {
 		List<BeanMetadataElement> handlers = new ManagedList<>();
 		handlers.add(BeanDefinitionBuilder.rootBeanDefinition(SecurityContextLogoutHandler.class).getBeanDefinition());
 		handlers.add(BeanDefinitionBuilder.rootBeanDefinition(LogoutSuccessEventPublishingLogoutHandler.class)
-				.getBeanDefinition());
+			.getBeanDefinition());
 		return handlers;
 	}
 
 	private static BeanMetadataElement createDefaultLogoutSuccessHandler() {
 		return BeanDefinitionBuilder.rootBeanDefinition(SimpleUrlLogoutSuccessHandler.class)
-				.addPropertyValue("defaultTargetUrl", "/login?logout").getBeanDefinition();
+			.addPropertyValue("defaultTargetUrl", "/login?logout")
+			.getBeanDefinition();
 	}
 
 	private BeanMetadataElement createLogoutRequestMatcher() {
 		BeanMetadataElement logoutMatcher = BeanDefinitionBuilder.rootBeanDefinition(AntPathRequestMatcher.class)
-				.addConstructorArgValue(this.logoutUrl).addConstructorArgValue("POST").getBeanDefinition();
+			.addConstructorArgValue(this.logoutUrl)
+			.addConstructorArgValue("POST")
+			.getBeanDefinition();
 		BeanMetadataElement saml2Matcher = BeanDefinitionBuilder.rootBeanDefinition(Saml2RequestMatcher.class)
-				.addPropertyValue("securityContextHolderStrategy",
-						this.authenticationFilterSecurityContextHolderStrategy)
-				.getBeanDefinition();
+			.addPropertyValue("securityContextHolderStrategy", this.authenticationFilterSecurityContextHolderStrategy)
+			.getBeanDefinition();
 		return BeanDefinitionBuilder.rootBeanDefinition(AndRequestMatcher.class)
-				.addConstructorArgValue(toManagedList(logoutMatcher, saml2Matcher)).getBeanDefinition();
+			.addConstructorArgValue(toManagedList(logoutMatcher, saml2Matcher))
+			.getBeanDefinition();
 	}
 
 	private BeanMetadataElement createSaml2LogoutRequestMatcher() {
 		BeanMetadataElement logoutRequestMatcher = BeanDefinitionBuilder.rootBeanDefinition(AntPathRequestMatcher.class)
-				.addConstructorArgValue(this.logoutRequestUrl).getBeanDefinition();
+			.addConstructorArgValue(this.logoutRequestUrl)
+			.getBeanDefinition();
 		BeanMetadataElement saml2RequestMatcher = BeanDefinitionBuilder
-				.rootBeanDefinition(ParameterRequestMatcher.class).addConstructorArgValue("SAMLRequest")
-				.getBeanDefinition();
+			.rootBeanDefinition(ParameterRequestMatcher.class)
+			.addConstructorArgValue("SAMLRequest")
+			.getBeanDefinition();
 		return BeanDefinitionBuilder.rootBeanDefinition(AndRequestMatcher.class)
-				.addConstructorArgValue(toManagedList(logoutRequestMatcher, saml2RequestMatcher)).getBeanDefinition();
+			.addConstructorArgValue(toManagedList(logoutRequestMatcher, saml2RequestMatcher))
+			.getBeanDefinition();
 	}
 
 	private BeanMetadataElement createSaml2LogoutResponseMatcher() {
 		BeanMetadataElement logoutResponseMatcher = BeanDefinitionBuilder
-				.rootBeanDefinition(AntPathRequestMatcher.class).addConstructorArgValue(this.logoutResponseUrl)
-				.getBeanDefinition();
+			.rootBeanDefinition(AntPathRequestMatcher.class)
+			.addConstructorArgValue(this.logoutResponseUrl)
+			.getBeanDefinition();
 		BeanMetadataElement saml2ResponseMatcher = BeanDefinitionBuilder
-				.rootBeanDefinition(ParameterRequestMatcher.class).addConstructorArgValue("SAMLResponse")
-				.getBeanDefinition();
+			.rootBeanDefinition(ParameterRequestMatcher.class)
+			.addConstructorArgValue("SAMLResponse")
+			.getBeanDefinition();
 		return BeanDefinitionBuilder.rootBeanDefinition(AndRequestMatcher.class)
-				.addConstructorArgValue(toManagedList(logoutResponseMatcher, saml2ResponseMatcher)).getBeanDefinition();
+			.addConstructorArgValue(toManagedList(logoutResponseMatcher, saml2ResponseMatcher))
+			.getBeanDefinition();
 	}
 
 	private static List<BeanMetadataElement> toManagedList(BeanMetadataElement... elements) {
@@ -232,7 +248,7 @@ final class Saml2LogoutBeanDefinitionParser implements BeanDefinitionParser {
 	public static class Saml2RequestMatcher implements RequestMatcher {
 
 		private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-				.getContextHolderStrategy();
+			.getContextHolderStrategy();
 
 		@Override
 		public boolean matches(HttpServletRequest request) {

config/src/main/java/org/springframework/security/config/http/Saml2LogoutBeanDefinitionParserUtils.java

@@ -50,7 +50,7 @@ final class Saml2LogoutBeanDefinitionParserUtils {
 
 	static BeanMetadataElement getRelyingPartyRegistrationRepository(Element element) {
 		String relyingPartyRegistrationRepositoryRef = element
-				.getAttribute(ATT_RELYING_PARTY_REGISTRATION_REPOSITORY_REF);
+			.getAttribute(ATT_RELYING_PARTY_REGISTRATION_REPOSITORY_REF);
 		if (StringUtils.hasText(relyingPartyRegistrationRepositoryRef)) {
 			return new RuntimeBeanReference(relyingPartyRegistrationRepositoryRef);
 		}
@@ -64,7 +64,8 @@ final class Saml2LogoutBeanDefinitionParserUtils {
 		}
 		return BeanDefinitionBuilder.rootBeanDefinition(
 				"org.springframework.security.saml2.provider.service.web.authentication.logout.OpenSaml4LogoutResponseResolver")
-				.addConstructorArgValue(registrations).getBeanDefinition();
+			.addConstructorArgValue(registrations)
+			.getBeanDefinition();
 	}
 
 	static BeanMetadataElement getLogoutRequestValidator(Element element) {
@@ -98,7 +99,8 @@ final class Saml2LogoutBeanDefinitionParserUtils {
 		}
 		return BeanDefinitionBuilder.rootBeanDefinition(
 				"org.springframework.security.saml2.provider.service.web.authentication.logout.OpenSaml4LogoutRequestResolver")
-				.addConstructorArgValue(registrations).getBeanDefinition();
+			.addConstructorArgValue(registrations)
+			.getBeanDefinition();
 	}
 
 }

config/src/main/java/org/springframework/security/config/http/WellKnownChangePasswordBeanDefinitionParser.java

@@ -46,9 +46,10 @@ public final class WellKnownChangePasswordBeanDefinitionParser implements BeanDe
 	@Override
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 		BeanDefinition changePasswordFilter = BeanDefinitionBuilder
-				.rootBeanDefinition(RequestMatcherRedirectFilter.class)
-				.addConstructorArgValue(new AntPathRequestMatcher(WELL_KNOWN_CHANGE_PASSWORD_PATTERN))
-				.addConstructorArgValue(getChangePasswordPage(element)).getBeanDefinition();
+			.rootBeanDefinition(RequestMatcherRedirectFilter.class)
+			.addConstructorArgValue(new AntPathRequestMatcher(WELL_KNOWN_CHANGE_PASSWORD_PATTERN))
+			.addConstructorArgValue(getChangePasswordPage(element))
+			.getBeanDefinition();
 		parserContext.getReaderContext().registerWithGeneratedName(changePasswordFilter);
 		return changePasswordFilter;
 	}

config/src/main/java/org/springframework/security/config/ldap/LdapProviderBeanDefinitionParser.java

@@ -69,7 +69,7 @@ public class LdapProviderBeanDefinitionParser implements BeanDefinitionParser {
 			this.logger.info("No search information or DN pattern specified. Using default search filter '"
 					+ DEF_USER_SEARCH_FILTER + "'");
 			BeanDefinitionBuilder searchBeanBuilder = BeanDefinitionBuilder
-					.rootBeanDefinition(LdapUserServiceBeanDefinitionParser.LDAP_SEARCH_CLASS);
+				.rootBeanDefinition(LdapUserServiceBeanDefinitionParser.LDAP_SEARCH_CLASS);
 			searchBeanBuilder.getRawBeanDefinition().setSource(elt);
 			searchBeanBuilder.addConstructorArgValue("");
 			searchBeanBuilder.addConstructorArgValue(DEF_USER_SEARCH_FILTER);
@@ -89,9 +89,9 @@ public class LdapProviderBeanDefinitionParser implements BeanDefinitionParser {
 			String hash = passwordCompareElt.getAttribute(ATT_HASH);
 			if (passwordEncoderElement != null) {
 				if (StringUtils.hasText(hash)) {
-					parserContext.getReaderContext().warning(
-							"Attribute 'hash' cannot be used with 'password-encoder' and " + "will be ignored.",
-							parserContext.extractSource(elt));
+					parserContext.getReaderContext()
+						.warning("Attribute 'hash' cannot be used with 'password-encoder' and " + "will be ignored.",
+								parserContext.extractSource(elt));
 				}
 				PasswordEncoderParser pep = new PasswordEncoderParser(passwordEncoderElement, parserContext);
 				authenticatorBuilder.addPropertyValue("passwordEncoder", pep.getPasswordEncoder());
@@ -108,8 +108,8 @@ public class LdapProviderBeanDefinitionParser implements BeanDefinitionParser {
 		}
 		BeanDefinitionBuilder ldapProvider = BeanDefinitionBuilder.rootBeanDefinition(PROVIDER_CLASS);
 		ldapProvider.addConstructorArgValue(authenticatorBuilder.getBeanDefinition());
-		ldapProvider.addConstructorArgValue(
-				LdapUserServiceBeanDefinitionParser.parseAuthoritiesPopulator(elt, parserContext));
+		ldapProvider
+			.addConstructorArgValue(LdapUserServiceBeanDefinitionParser.parseAuthoritiesPopulator(elt, parserContext));
 		ldapProvider.addPropertyValue("userDetailsContextMapper",
 				LdapUserServiceBeanDefinitionParser.parseUserDetailsClassOrUserMapperRef(elt, parserContext));
 		return ldapProvider.getBeanDefinition();

config/src/main/java/org/springframework/security/config/ldap/LdapServerBeanDefinitionParser.java

@@ -114,7 +114,7 @@ public class LdapServerBeanDefinitionParser implements BeanDefinitionParser {
 		if (StringUtils.hasText(managerDn)) {
 			if (!StringUtils.hasText(managerPassword)) {
 				parserContext.getReaderContext()
-						.error("You must specify the " + ATT_PASSWORD + " if you supply a " + managerDn, elt);
+					.error("You must specify the " + ATT_PASSWORD + " if you supply a " + managerDn, elt);
 			}
 			contextSource.getPropertyValues().addPropertyValue("userDn", managerDn);
 			contextSource.getPropertyValues().addPropertyValue("password", managerPassword);
@@ -145,9 +145,10 @@ public class LdapServerBeanDefinitionParser implements BeanDefinitionParser {
 		contextSource.addPropertyValue("userDn", "uid=admin,ou=system");
 		contextSource.addPropertyValue("password", "secret");
 		BeanDefinition embeddedLdapServerConfigBean = BeanDefinitionBuilder
-				.rootBeanDefinition(EmbeddedLdapServerConfigBean.class).getBeanDefinition();
+			.rootBeanDefinition(EmbeddedLdapServerConfigBean.class)
+			.getBeanDefinition();
 		String embeddedLdapServerConfigBeanName = parserContext.getReaderContext()
-				.generateBeanName(embeddedLdapServerConfigBean);
+			.generateBeanName(embeddedLdapServerConfigBean);
 		parserContext.registerBeanComponent(
 				new BeanComponentDefinition(embeddedLdapServerConfigBean, embeddedLdapServerConfigBeanName));
 		contextSource.setFactoryMethodOnBean("createEmbeddedContextSource", embeddedLdapServerConfigBeanName);
@@ -163,8 +164,8 @@ public class LdapServerBeanDefinitionParser implements BeanDefinitionParser {
 		ldapContainer.getPropertyValues().addPropertyValue("port", getPort(element));
 		if (parserContext.getRegistry().containsBeanDefinition(BeanIds.EMBEDDED_APACHE_DS)
 				|| parserContext.getRegistry().containsBeanDefinition(BeanIds.EMBEDDED_UNBOUNDID)) {
-			parserContext.getReaderContext().error("Only one embedded server bean is allowed per application context",
-					element);
+			parserContext.getReaderContext()
+				.error("Only one embedded server bean is allowed per application context", element);
 		}
 		String beanId = resolveBeanId(mode);
 		if (beanId != null) {

config/src/main/java/org/springframework/security/config/ldap/LdapUserServiceBeanDefinitionParser.java

@@ -96,7 +96,7 @@ public class LdapUserServiceBeanDefinitionParser extends AbstractUserDetailsServ
 		if (StringUtils.hasText(userSearchBase)) {
 			if (!StringUtils.hasText(userSearchFilter)) {
 				parserContext.getReaderContext()
-						.error(ATT_USER_SEARCH_BASE + " cannot be used without a " + ATT_USER_SEARCH_FILTER, source);
+					.error(ATT_USER_SEARCH_BASE + " cannot be used without a " + ATT_USER_SEARCH_FILTER, source);
 			}
 		}
 		else {
@@ -143,8 +143,9 @@ public class LdapUserServiceBeanDefinitionParser extends AbstractUserDetailsServ
 		String userDetailsClass = elt.getAttribute(ATT_USER_CLASS);
 		String userMapperRef = elt.getAttribute(ATT_USER_CONTEXT_MAPPER_REF);
 		if (StringUtils.hasText(userDetailsClass) && StringUtils.hasText(userMapperRef)) {
-			parserContext.getReaderContext().error("Attributes " + ATT_USER_CLASS + " and "
-					+ ATT_USER_CONTEXT_MAPPER_REF + " cannot be used together.", parserContext.extractSource(elt));
+			parserContext.getReaderContext()
+				.error("Attributes " + ATT_USER_CLASS + " and " + ATT_USER_CONTEXT_MAPPER_REF
+						+ " cannot be used together.", parserContext.extractSource(elt));
 		}
 		if (StringUtils.hasText(userMapperRef)) {
 			return new RuntimeBeanReference(userMapperRef);

config/src/main/java/org/springframework/security/config/method/AspectJMethodMatcher.java

@@ -37,8 +37,8 @@ class AspectJMethodMatcher implements MethodMatcher, ClassFilter, Pointcut {
 		supportedPrimitives.add(PointcutPrimitive.EXECUTION);
 		supportedPrimitives.add(PointcutPrimitive.ARGS);
 		supportedPrimitives.add(PointcutPrimitive.REFERENCE);
-		parser = PointcutParser.getPointcutParserSupportingSpecifiedPrimitivesAndUsingContextClassloaderForResolution(
-				supportedPrimitives);
+		parser = PointcutParser
+			.getPointcutParserSupportingSpecifiedPrimitivesAndUsingContextClassloaderForResolution(supportedPrimitives);
 	}
 
 	private final PointcutExpression expression;

config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java

@@ -144,27 +144,28 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP
 			Element prePostElt = DomUtils.getChildElementByTagName(element, Elements.INVOCATION_HANDLING);
 			Element expressionHandlerElt = DomUtils.getChildElementByTagName(element, Elements.EXPRESSION_HANDLER);
 			if (prePostElt != null && expressionHandlerElt != null) {
-				pc.getReaderContext().error(Elements.INVOCATION_HANDLING + " and " + Elements.EXPRESSION_HANDLER
-						+ " cannot be used together ", source);
+				pc.getReaderContext()
+					.error(Elements.INVOCATION_HANDLING + " and " + Elements.EXPRESSION_HANDLER
+							+ " cannot be used together ", source);
 			}
 			BeanDefinitionBuilder preInvocationVoterBldr = BeanDefinitionBuilder
-					.rootBeanDefinition(PreInvocationAuthorizationAdviceVoter.class);
+				.rootBeanDefinition(PreInvocationAuthorizationAdviceVoter.class);
 			// After-invocation provider to handle post-invocation filtering and
 			// authorization expression annotations.
 			BeanDefinitionBuilder afterInvocationBldr = BeanDefinitionBuilder
-					.rootBeanDefinition(PostInvocationAdviceProvider.class);
+				.rootBeanDefinition(PostInvocationAdviceProvider.class);
 			// The metadata source for the security interceptor
 			BeanDefinitionBuilder mds = BeanDefinitionBuilder
-					.rootBeanDefinition(PrePostAnnotationSecurityMetadataSource.class);
+				.rootBeanDefinition(PrePostAnnotationSecurityMetadataSource.class);
 			if (prePostElt != null) {
 				// Customized override of expression handling system
 				String attributeFactoryRef = DomUtils
-						.getChildElementByTagName(prePostElt, Elements.INVOCATION_ATTRIBUTE_FACTORY)
-						.getAttribute("ref");
+					.getChildElementByTagName(prePostElt, Elements.INVOCATION_ATTRIBUTE_FACTORY)
+					.getAttribute("ref");
 				String preAdviceRef = DomUtils.getChildElementByTagName(prePostElt, Elements.PRE_INVOCATION_ADVICE)
-						.getAttribute("ref");
+					.getAttribute("ref");
 				String postAdviceRef = DomUtils.getChildElementByTagName(prePostElt, Elements.POST_INVOCATION_ADVICE)
-						.getAttribute("ref");
+					.getAttribute("ref");
 				mds.addConstructorArgReference(attributeFactoryRef);
 				preInvocationVoterBldr.addConstructorArgReference(preAdviceRef);
 				afterInvocationBldr.addConstructorArgReference(postAdviceRef);
@@ -181,16 +182,16 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP
 					lazyInitPP.getConstructorArgumentValues().addGenericArgumentValue(expressionHandlerRef);
 					pc.getReaderContext().registerWithGeneratedName(lazyInitPP);
 					BeanDefinitionBuilder lazyMethodSecurityExpressionHandlerBldr = BeanDefinitionBuilder
-							.rootBeanDefinition(LazyInitTargetSource.class);
+						.rootBeanDefinition(LazyInitTargetSource.class);
 					lazyMethodSecurityExpressionHandlerBldr.addPropertyValue("targetBeanName", expressionHandlerRef);
 					BeanDefinitionBuilder expressionHandlerProxyBldr = BeanDefinitionBuilder
-							.rootBeanDefinition(ProxyFactoryBean.class);
+						.rootBeanDefinition(ProxyFactoryBean.class);
 					expressionHandlerProxyBldr.addPropertyValue("targetSource",
 							lazyMethodSecurityExpressionHandlerBldr.getBeanDefinition());
 					expressionHandlerProxyBldr.addPropertyValue("proxyInterfaces",
 							MethodSecurityExpressionHandler.class);
 					expressionHandlerRef = pc.getReaderContext()
-							.generateBeanName(expressionHandlerProxyBldr.getBeanDefinition());
+						.generateBeanName(expressionHandlerProxyBldr.getBeanDefinition());
 					pc.registerBeanComponent(new BeanComponentDefinition(expressionHandlerProxyBldr.getBeanDefinition(),
 							expressionHandlerRef));
 				}
@@ -203,15 +204,15 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP
 							+ "was configured. All hasPermission() expressions will evaluate to false.");
 				}
 				BeanDefinitionBuilder expressionPreAdviceBldr = BeanDefinitionBuilder
-						.rootBeanDefinition(ExpressionBasedPreInvocationAdvice.class);
+					.rootBeanDefinition(ExpressionBasedPreInvocationAdvice.class);
 				expressionPreAdviceBldr.addPropertyReference("expressionHandler", expressionHandlerRef);
 				preInvocationVoterBldr.addConstructorArgValue(expressionPreAdviceBldr.getBeanDefinition());
 				BeanDefinitionBuilder expressionPostAdviceBldr = BeanDefinitionBuilder
-						.rootBeanDefinition(ExpressionBasedPostInvocationAdvice.class);
+					.rootBeanDefinition(ExpressionBasedPostInvocationAdvice.class);
 				expressionPostAdviceBldr.addConstructorArgReference(expressionHandlerRef);
 				afterInvocationBldr.addConstructorArgValue(expressionPostAdviceBldr.getBeanDefinition());
 				BeanDefinitionBuilder annotationInvocationFactory = BeanDefinitionBuilder
-						.rootBeanDefinition(ExpressionBasedAnnotationAttributeFactory.class);
+					.rootBeanDefinition(ExpressionBasedAnnotationAttributeFactory.class);
 				annotationInvocationFactory.addConstructorArgReference(expressionHandlerRef);
 				mds.addConstructorArgValue(annotationInvocationFactory.getBeanDefinition());
 			}
@@ -221,7 +222,7 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP
 		}
 		if (useSecured) {
 			delegates.add(BeanDefinitionBuilder.rootBeanDefinition(SecuredAnnotationSecurityMetadataSource.class)
-					.getBeanDefinition());
+				.getBeanDefinition());
 		}
 		if (jsr250Enabled) {
 			RootBeanDefinition jsrMetadataSource = registerWithDefaultRolePrefix(pc,
@@ -331,12 +332,12 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP
 			String accessConfig = childElt.getAttribute(ATT_ACCESS);
 			String expression = childElt.getAttribute(ATT_EXPRESSION);
 			if (!StringUtils.hasText(accessConfig)) {
-				parserContext.getReaderContext().error("Access configuration required",
-						parserContext.extractSource(childElt));
+				parserContext.getReaderContext()
+					.error("Access configuration required", parserContext.extractSource(childElt));
 			}
 			if (!StringUtils.hasText(expression)) {
-				parserContext.getReaderContext().error("Pointcut expression required",
-						parserContext.extractSource(childElt));
+				parserContext.getReaderContext()
+					.error("Pointcut expression required", parserContext.extractSource(childElt));
 			}
 			String[] attributeTokens = StringUtils.commaDelimitedListToStringArray(accessConfig);
 			List<ConfigAttribute> attributes = new ArrayList<>(attributeTokens.length);
@@ -351,8 +352,8 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP
 	private BeanReference registerMethodSecurityInterceptor(ParserContext pc, String authMgrRef, String accessManagerId,
 			String runAsManagerId, BeanReference metadataSource, List<BeanMetadataElement> afterInvocationProviders,
 			Object source, boolean useAspectJ) {
-		BeanDefinitionBuilder bldr = BeanDefinitionBuilder.rootBeanDefinition(
-				useAspectJ ? AspectJMethodSecurityInterceptor.class : MethodSecurityInterceptor.class);
+		BeanDefinitionBuilder bldr = BeanDefinitionBuilder
+			.rootBeanDefinition(useAspectJ ? AspectJMethodSecurityInterceptor.class : MethodSecurityInterceptor.class);
 		bldr.getRawBeanDefinition().setSource(source);
 		bldr.addPropertyReference("accessDecisionManager", accessManagerId);
 		RootBeanDefinition authMgr = new RootBeanDefinition(AuthenticationManagerDelegator.class);
@@ -483,10 +484,10 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP
 		@Override
 		public final void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 			String[] grantedAuthorityDefaultsBeanNames = applicationContext
-					.getBeanNamesForType(GrantedAuthorityDefaults.class);
+				.getBeanNamesForType(GrantedAuthorityDefaults.class);
 			if (grantedAuthorityDefaultsBeanNames.length == 1) {
 				GrantedAuthorityDefaults grantedAuthorityDefaults = applicationContext
-						.getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class);
+					.getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class);
 				this.rolePrefix = grantedAuthorityDefaults.getRolePrefix();
 			}
 		}

config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java

@@ -79,7 +79,7 @@ public class InterceptMethodsBeanDefinitionDecorator implements BeanDefinitionDe
 		protected BeanDefinition createInterceptorDefinition(Node node) {
 			Element interceptMethodsElt = (Element) node;
 			BeanDefinitionBuilder interceptor = BeanDefinitionBuilder
-					.rootBeanDefinition(AuthorizationManagerBeforeMethodInterceptor.class);
+				.rootBeanDefinition(AuthorizationManagerBeforeMethodInterceptor.class);
 			interceptor.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
 			Map<Pointcut, BeanMetadataElement> managers = new ManagedMap<>();
 			List<Element> methods = DomUtils.getChildElementsByTagName(interceptMethodsElt, Elements.PROTECT);
@@ -88,7 +88,8 @@ public class InterceptMethodsBeanDefinitionDecorator implements BeanDefinitionDe
 						authorizationManager(interceptMethodsElt, protectElt));
 			}
 			return interceptor.addConstructorArgValue(Pointcut.TRUE)
-					.addConstructorArgValue(authorizationManager(managers)).getBeanDefinition();
+				.addConstructorArgValue(authorizationManager(managers))
+				.getBeanDefinition();
 		}
 
 		boolean supports(Node node) {
@@ -115,12 +116,14 @@ public class InterceptMethodsBeanDefinitionDecorator implements BeanDefinitionDe
 			}
 			String access = protectElt.getAttribute(ATT_ACCESS);
 			return BeanDefinitionBuilder.rootBeanDefinition(MethodExpressionAuthorizationManager.class)
-					.addConstructorArgValue(access).getBeanDefinition();
+				.addConstructorArgValue(access)
+				.getBeanDefinition();
 		}
 
 		private BeanMetadataElement authorizationManager(Map<Pointcut, BeanMetadataElement> managers) {
 			return BeanDefinitionBuilder.rootBeanDefinition(PointcutDelegatingAuthorizationManager.class)
-					.addConstructorArgValue(managers).getBeanDefinition();
+				.addConstructorArgValue(managers)
+				.getBeanDefinition();
 		}
 
 	}
@@ -146,7 +149,7 @@ public class InterceptMethodsBeanDefinitionDecorator implements BeanDefinitionDe
 		protected BeanDefinition createInterceptorDefinition(Node node) {
 			Element interceptMethodsElt = (Element) node;
 			BeanDefinitionBuilder interceptor = BeanDefinitionBuilder
-					.rootBeanDefinition(MethodSecurityInterceptor.class);
+				.rootBeanDefinition(MethodSecurityInterceptor.class);
 			// Default to autowiring to pick up after invocation mgr
 			interceptor.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
 			String accessManagerId = interceptMethodsElt.getAttribute(ATT_ACCESS_MGR);

config/src/main/java/org/springframework/security/config/method/MethodConfigUtils.java

@@ -38,8 +38,9 @@ abstract class MethodConfigUtils {
 	@SuppressWarnings("unchecked")
 	static void registerDefaultMethodAccessManagerIfNecessary(ParserContext parserContext) {
 		if (!parserContext.getRegistry().containsBeanDefinition(BeanIds.METHOD_ACCESS_MANAGER)) {
-			parserContext.getRegistry().registerBeanDefinition(BeanIds.METHOD_ACCESS_MANAGER,
-					createAccessManagerBean(RoleVoter.class, AuthenticatedVoter.class));
+			parserContext.getRegistry()
+				.registerBeanDefinition(BeanIds.METHOD_ACCESS_MANAGER,
+						createAccessManagerBean(RoleVoter.class, AuthenticatedVoter.class));
 		}
 	}
 

config/src/main/java/org/springframework/security/config/method/MethodSecurityBeanDefinitionParser.java

@@ -103,23 +103,23 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 		boolean useAspectJ = "aspectj".equals(element.getAttribute(ATT_MODE));
 		if (prePostAnnotationsEnabled) {
 			BeanDefinitionBuilder preFilterInterceptor = BeanDefinitionBuilder
-					.rootBeanDefinition(PreFilterAuthorizationMethodInterceptor.class)
-					.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
-					.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy);
+				.rootBeanDefinition(PreFilterAuthorizationMethodInterceptor.class)
+				.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
+				.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy);
 			BeanDefinitionBuilder preAuthorizeInterceptor = BeanDefinitionBuilder
-					.rootBeanDefinition(PreAuthorizeAuthorizationMethodInterceptor.class)
-					.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
-					.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy)
-					.addPropertyValue("observationRegistry", observationRegistry);
+				.rootBeanDefinition(PreAuthorizeAuthorizationMethodInterceptor.class)
+				.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
+				.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy)
+				.addPropertyValue("observationRegistry", observationRegistry);
 			BeanDefinitionBuilder postAuthorizeInterceptor = BeanDefinitionBuilder
-					.rootBeanDefinition(PostAuthorizeAuthorizationMethodInterceptor.class)
-					.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
-					.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy)
-					.addPropertyValue("observationRegistry", observationRegistry);
+				.rootBeanDefinition(PostAuthorizeAuthorizationMethodInterceptor.class)
+				.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
+				.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy)
+				.addPropertyValue("observationRegistry", observationRegistry);
 			BeanDefinitionBuilder postFilterInterceptor = BeanDefinitionBuilder
-					.rootBeanDefinition(PostFilterAuthorizationMethodInterceptor.class)
-					.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
-					.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy);
+				.rootBeanDefinition(PostFilterAuthorizationMethodInterceptor.class)
+				.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
+				.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy);
 			Element expressionHandlerElt = DomUtils.getChildElementByTagName(element, Elements.EXPRESSION_HANDLER);
 			if (expressionHandlerElt != null) {
 				String expressionHandlerRef = expressionHandlerElt.getAttribute("ref");
@@ -130,47 +130,53 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 			}
 			else {
 				BeanDefinition expressionHandler = BeanDefinitionBuilder
-						.rootBeanDefinition(MethodSecurityExpressionHandlerBean.class).getBeanDefinition();
+					.rootBeanDefinition(MethodSecurityExpressionHandlerBean.class)
+					.getBeanDefinition();
 				preFilterInterceptor.addPropertyValue("expressionHandler", expressionHandler);
 				preAuthorizeInterceptor.addPropertyValue("expressionHandler", expressionHandler);
 				postAuthorizeInterceptor.addPropertyValue("expressionHandler", expressionHandler);
 				postFilterInterceptor.addPropertyValue("expressionHandler", expressionHandler);
 			}
-			pc.getRegistry().registerBeanDefinition("preFilterAuthorizationMethodInterceptor",
-					preFilterInterceptor.getBeanDefinition());
-			pc.getRegistry().registerBeanDefinition("preAuthorizeAuthorizationMethodInterceptor",
-					preAuthorizeInterceptor.getBeanDefinition());
-			pc.getRegistry().registerBeanDefinition("postAuthorizeAuthorizationMethodInterceptor",
-					postAuthorizeInterceptor.getBeanDefinition());
-			pc.getRegistry().registerBeanDefinition("postFilterAuthorizationMethodInterceptor",
-					postFilterInterceptor.getBeanDefinition());
+			pc.getRegistry()
+				.registerBeanDefinition("preFilterAuthorizationMethodInterceptor",
+						preFilterInterceptor.getBeanDefinition());
+			pc.getRegistry()
+				.registerBeanDefinition("preAuthorizeAuthorizationMethodInterceptor",
+						preAuthorizeInterceptor.getBeanDefinition());
+			pc.getRegistry()
+				.registerBeanDefinition("postAuthorizeAuthorizationMethodInterceptor",
+						postAuthorizeInterceptor.getBeanDefinition());
+			pc.getRegistry()
+				.registerBeanDefinition("postFilterAuthorizationMethodInterceptor",
+						postFilterInterceptor.getBeanDefinition());
 		}
 		boolean securedEnabled = "true".equals(element.getAttribute(ATT_USE_SECURED));
 		if (securedEnabled) {
 			BeanDefinitionBuilder securedInterceptor = BeanDefinitionBuilder
-					.rootBeanDefinition(SecuredAuthorizationMethodInterceptor.class)
-					.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
-					.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy)
-					.addPropertyValue("observationRegistry", observationRegistry);
-			pc.getRegistry().registerBeanDefinition("securedAuthorizationMethodInterceptor",
-					securedInterceptor.getBeanDefinition());
+				.rootBeanDefinition(SecuredAuthorizationMethodInterceptor.class)
+				.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
+				.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy)
+				.addPropertyValue("observationRegistry", observationRegistry);
+			pc.getRegistry()
+				.registerBeanDefinition("securedAuthorizationMethodInterceptor",
+						securedInterceptor.getBeanDefinition());
 		}
 		boolean jsr250Enabled = "true".equals(element.getAttribute(ATT_USE_JSR250));
 		if (jsr250Enabled) {
 			BeanDefinitionBuilder jsr250Interceptor = BeanDefinitionBuilder
-					.rootBeanDefinition(Jsr250AuthorizationMethodInterceptor.class)
-					.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
-					.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy)
-					.addPropertyValue("observationRegistry", observationRegistry);
-			pc.getRegistry().registerBeanDefinition("jsr250AuthorizationMethodInterceptor",
-					jsr250Interceptor.getBeanDefinition());
+				.rootBeanDefinition(Jsr250AuthorizationMethodInterceptor.class)
+				.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
+				.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy)
+				.addPropertyValue("observationRegistry", observationRegistry);
+			pc.getRegistry()
+				.registerBeanDefinition("jsr250AuthorizationMethodInterceptor", jsr250Interceptor.getBeanDefinition());
 		}
 		Map<Pointcut, BeanMetadataElement> managers = new ManagedMap<>();
 		List<Element> methods = DomUtils.getChildElementsByTagName(element, Elements.PROTECT_POINTCUT);
 		if (useAspectJ) {
 			if (!methods.isEmpty()) {
-				pc.getReaderContext().error("Cannot use <protect-pointcut> and mode='aspectj' together",
-						pc.extractSource(element));
+				pc.getReaderContext()
+					.error("Cannot use <protect-pointcut> and mode='aspectj' together", pc.extractSource(element));
 			}
 			registerInterceptors(pc.getRegistry());
 		}
@@ -180,13 +186,14 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 					managers.put(pointcut(protectElt), authorizationManager(element, protectElt));
 				}
 				BeanDefinitionBuilder protectPointcutInterceptor = BeanDefinitionBuilder
-						.rootBeanDefinition(AuthorizationManagerBeforeMethodInterceptor.class)
-						.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
-						.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy)
-						.addConstructorArgValue(pointcut(managers.keySet()))
-						.addConstructorArgValue(authorizationManager(managers));
-				pc.getRegistry().registerBeanDefinition("protectPointcutInterceptor",
-						protectPointcutInterceptor.getBeanDefinition());
+					.rootBeanDefinition(AuthorizationManagerBeforeMethodInterceptor.class)
+					.setRole(BeanDefinition.ROLE_INFRASTRUCTURE)
+					.addPropertyValue("securityContextHolderStrategy", securityContextHolderStrategy)
+					.addConstructorArgValue(pointcut(managers.keySet()))
+					.addConstructorArgValue(authorizationManager(managers));
+				pc.getRegistry()
+					.registerBeanDefinition("protectPointcutInterceptor",
+							protectPointcutInterceptor.getBeanDefinition());
 			}
 			AopNamespaceUtils.registerAutoProxyCreatorIfNecessary(pc, element);
 		}
@@ -243,12 +250,14 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 		}
 		String access = protectElt.getAttribute(ATT_ACCESS);
 		return BeanDefinitionBuilder.rootBeanDefinition(MethodExpressionAuthorizationManager.class)
-				.addConstructorArgValue(access).getBeanDefinition();
+			.addConstructorArgValue(access)
+			.getBeanDefinition();
 	}
 
 	private BeanMetadataElement authorizationManager(Map<Pointcut, BeanMetadataElement> managers) {
 		return BeanDefinitionBuilder.rootBeanDefinition(PointcutDelegatingAuthorizationManager.class)
-				.addConstructorArgValue(managers).getBeanDefinition();
+			.addConstructorArgValue(managers)
+			.getBeanDefinition();
 	}
 
 	private void registerInterceptors(BeanDefinitionRegistry registry) {
@@ -299,10 +308,10 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 		@Override
 		public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 			String[] grantedAuthorityDefaultsBeanNames = applicationContext
-					.getBeanNamesForType(GrantedAuthorityDefaults.class);
+				.getBeanNamesForType(GrantedAuthorityDefaults.class);
 			if (grantedAuthorityDefaultsBeanNames.length == 1) {
 				GrantedAuthorityDefaults grantedAuthorityDefaults = applicationContext
-						.getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class);
+					.getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class);
 				this.expressionHandler.setDefaultRolePrefix(grantedAuthorityDefaults.getRolePrefix());
 			}
 		}
@@ -313,7 +322,7 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 			implements FactoryBean<AuthorizationManagerBeforeMethodInterceptor>, ApplicationContextAware {
 
 		private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-				.getContextHolderStrategy();
+			.getContextHolderStrategy();
 
 		private ObservationRegistry observationRegistry = ObservationRegistry.NOOP;
 
@@ -326,7 +335,7 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 				manager = new ObservationAuthorizationManager<>(this.observationRegistry, this.manager);
 			}
 			AuthorizationManagerBeforeMethodInterceptor interceptor = AuthorizationManagerBeforeMethodInterceptor
-					.jsr250(manager);
+				.jsr250(manager);
 			interceptor.setSecurityContextHolderStrategy(this.securityContextHolderStrategy);
 			return interceptor;
 		}
@@ -339,10 +348,10 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 		@Override
 		public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 			String[] grantedAuthorityDefaultsBeanNames = applicationContext
-					.getBeanNamesForType(GrantedAuthorityDefaults.class);
+				.getBeanNamesForType(GrantedAuthorityDefaults.class);
 			if (grantedAuthorityDefaultsBeanNames.length == 1) {
 				GrantedAuthorityDefaults grantedAuthorityDefaults = applicationContext
-						.getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class);
+					.getBean(grantedAuthorityDefaultsBeanNames[0], GrantedAuthorityDefaults.class);
 				this.manager.setRolePrefix(grantedAuthorityDefaults.getRolePrefix());
 			}
 		}
@@ -361,7 +370,7 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 			implements FactoryBean<AuthorizationManagerBeforeMethodInterceptor> {
 
 		private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-				.getContextHolderStrategy();
+			.getContextHolderStrategy();
 
 		private ObservationRegistry observationRegistry = ObservationRegistry.NOOP;
 
@@ -374,7 +383,7 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 				manager = new ObservationAuthorizationManager<>(this.observationRegistry, this.manager);
 			}
 			AuthorizationManagerBeforeMethodInterceptor interceptor = AuthorizationManagerBeforeMethodInterceptor
-					.secured(manager);
+				.secured(manager);
 			interceptor.setSecurityContextHolderStrategy(this.securityContextHolderStrategy);
 			return interceptor;
 		}
@@ -398,7 +407,7 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 			implements FactoryBean<AuthorizationManagerBeforeMethodInterceptor> {
 
 		private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-				.getContextHolderStrategy();
+			.getContextHolderStrategy();
 
 		private ObservationRegistry observationRegistry = ObservationRegistry.NOOP;
 
@@ -411,7 +420,7 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 				manager = new ObservationAuthorizationManager<>(this.observationRegistry, this.manager);
 			}
 			AuthorizationManagerBeforeMethodInterceptor interceptor = AuthorizationManagerBeforeMethodInterceptor
-					.preAuthorize(manager);
+				.preAuthorize(manager);
 			interceptor.setSecurityContextHolderStrategy(this.securityContextHolderStrategy);
 			return interceptor;
 		}
@@ -439,7 +448,7 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 			implements FactoryBean<AuthorizationManagerAfterMethodInterceptor> {
 
 		private SecurityContextHolderStrategy securityContextHolderStrategy = SecurityContextHolder
-				.getContextHolderStrategy();
+			.getContextHolderStrategy();
 
 		private ObservationRegistry observationRegistry = ObservationRegistry.NOOP;
 
@@ -452,7 +461,7 @@ public class MethodSecurityBeanDefinitionParser implements BeanDefinitionParser
 				manager = new ObservationAuthorizationManager<>(this.observationRegistry, this.manager);
 			}
 			AuthorizationManagerAfterMethodInterceptor interceptor = AuthorizationManagerAfterMethodInterceptor
-					.postAuthorize(manager);
+				.postAuthorize(manager);
 			interceptor.setSecurityContextHolderStrategy(this.securityContextHolderStrategy);
 			return interceptor;
 		}