From 63b5998fadd3c3e016106a43a68bc3d827966356 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 23 Jul 2020 12:58:41 -0700 Subject: [PATCH] Add noformat blocks around auth config Find `auth` config using a regex search of `^\s*auths*$` and protect them against formatting. Issue gh-8945 --- ...onProviderBuilderSecurityBuilderTests.java | 28 +++++++++---------- ...AuthenticationProviderConfigurerTests.java | 14 ++++++---- ...dapAuthenticationProviderTestsConfigs.java | 16 +++++------ .../AuthenticationManagerBuilderTests.java | 4 +++ .../BaseAuthenticationConfig.java | 2 ++ .../NamespaceAuthenticationManagerTests.java | 6 ++++ .../NamespaceAuthenticationProviderTests.java | 4 +++ .../NamespaceJdbcUserServiceTests.java | 4 +++ .../NamespacePasswordEncoderTests.java | 6 ++++ .../PasswordEncoderConfigurerTests.java | 8 +++--- .../AuthenticationConfigurationTests.java | 2 ++ ...lobalMethodSecurityConfigurationTests.java | 2 ++ ...SampleEnableGlobalMethodSecurityTests.java | 4 +++ ...mpleWebSecurityConfigurerAdapterTests.java | 6 ++++ ...curityConfigurerAdapterPowermockTests.java | 2 ++ .../WebSecurityConfigurerAdapterTests.java | 10 +++++++ .../web/builders/HttpConfigurationTests.java | 2 ++ .../web/builders/NamespaceHttpTests.java | 2 ++ ...icationPrincipalArgumentResolverTests.java | 2 ++ .../configuration/EnableWebSecurityTests.java | 2 ++ .../HttpSecurityAntMatchersTests.java | 4 +++ .../configurers/HttpSecurityLogoutTests.java | 2 ++ .../NamespaceHttpExpressionHandlerTests.java | 2 ++ .../NamespaceHttpInterceptUrlTests.java | 2 ++ .../NamespaceHttpPortMappingsTests.java | 2 ++ .../NamespaceHttpRequestCacheTests.java | 4 +++ .../configurers/NamespaceHttpX509Tests.java | 10 +++++++ .../configurers/NamespaceRememberMeTests.java | 2 ++ ...ionManagementConfigurerServlet31Tests.java | 4 +-- ...rerSessionAuthenticationStrategyTests.java | 4 +-- ...onfigurerTransientAuthenticationTests.java | 2 ++ .../core/GrantedAuthorityDefaultsJcTests.java | 2 ++ .../showcase/WithMockUserParentTests.java | 4 +-- .../context/showcase/WithMockUserTests.java | 4 +-- .../showcase/WithUserDetailsTests.java | 4 +-- ...rocessorsAuthenticationStatelessTests.java | 4 +-- ...sorsTestSecurityContextStatelessTests.java | 4 +-- .../showcase/csrf/CsrfShowcaseTests.java | 4 +-- .../csrf/CustomCsrfShowcaseTests.java | 4 +-- .../csrf/DefaultCsrfShowcaseTests.java | 4 +-- .../DefaultfSecurityRequestsTests.java | 4 +-- .../secured/SecurityRequestsTests.java | 4 +-- .../secured/WithUserAuthenticationTests.java | 4 +-- ...WithUserClassLevelAuthenticationTests.java | 4 +-- .../WithUserDetailsAuthenticationTests.java | 4 +-- ...rDetailsClassLevelAuthenticationTests.java | 4 +-- 46 files changed, 158 insertions(+), 64 deletions(-) diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.java index 9ff0675bc2..42736b22e4 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderBuilderSecurityBuilderTests.java @@ -74,14 +74,14 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests { @EnableWebSecurity static class DefaultLdapConfig extends BaseLdapProviderConfig { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .contextSource(contextSource()) .userDnPatterns("uid={0},ou=people"); + // @formatter:on } - // @formatter:on } @Test @@ -94,15 +94,15 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests { @EnableWebSecurity static class GroupRolesConfig extends BaseLdapProviderConfig { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .contextSource(contextSource()) .userDnPatterns("uid={0},ou=people") .groupRoleAttribute("group"); + // @formatter:on } - // @formatter:on } @Test @@ -115,15 +115,15 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests { @EnableWebSecurity static class GroupSearchConfig extends BaseLdapProviderConfig { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .contextSource(contextSource()) .userDnPatterns("uid={0},ou=people") .groupSearchFilter("ou=groupName"); + // @formatter:on } - // @formatter:on } @Test @@ -137,16 +137,16 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests { @EnableWebSecurity static class GroupSubtreeSearchConfig extends BaseLdapProviderConfig { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .contextSource(contextSource()) .userDnPatterns("uid={0},ou=people") .groupSearchFilter("ou=groupName") .groupSearchSubtree(true); + // @formatter:on } - // @formatter:on } @Test @@ -159,15 +159,15 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests { @EnableWebSecurity static class RolePrefixConfig extends BaseLdapProviderConfig { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .contextSource(contextSource()) .userDnPatterns("uid={0},ou=people") .rolePrefix("role_"); + // @formatter:on } - // @formatter:on } @Test @@ -180,16 +180,16 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests { @EnableWebSecurity static class BindAuthenticationConfig extends BaseLdapServerConfig { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .contextSource(contextSource()) .groupSearchBase("ou=groups") .groupSearchFilter("(member={0})") .userDnPatterns("uid={0},ou=people"); + // @formatter:on } - // @formatter:on } // SEC-2472 @@ -203,8 +203,8 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests { @EnableWebSecurity static class PasswordEncoderConfig extends BaseLdapServerConfig { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .contextSource(contextSource()) @@ -212,8 +212,8 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests { .groupSearchBase("ou=groups") .groupSearchFilter("(member={0})") .userDnPatterns("uid={0},ou=people"); + // @formatter:on } - // @formatter:on } private LdapAuthenticationProvider ldapProvider() { diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderConfigurerTests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderConfigurerTests.java index 3cf29d6338..ab5960f1c4 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderConfigurerTests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/LdapAuthenticationProviderConfigurerTests.java @@ -83,8 +83,8 @@ public class LdapAuthenticationProviderConfigurerTests { @EnableWebSecurity static class MultiLdapAuthenticationProvidersConfig extends WebSecurityConfigurerAdapter { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .groupSearchBase("ou=groups") @@ -95,14 +95,14 @@ public class LdapAuthenticationProviderConfigurerTests { .groupSearchBase("ou=groups") .groupSearchFilter("(member={0})") .userDnPatterns("uid={0},ou=people"); + // @formatter:on } - // @formatter:on } @EnableWebSecurity static class MultiLdapWithCustomRolePrefixAuthenticationProvidersConfig extends WebSecurityConfigurerAdapter { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .groupSearchBase("ou=groups") @@ -115,14 +115,15 @@ public class LdapAuthenticationProviderConfigurerTests { .groupSearchFilter("(member={0})") .userDnPatterns("uid={0},ou=people") .rolePrefix("RUOLO_"); + // @formatter:on } - // @formatter:on } @EnableWebSecurity static class LdapWithRandomPortConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .groupSearchBase("ou=groups") @@ -130,20 +131,21 @@ public class LdapAuthenticationProviderConfigurerTests { .userDnPatterns("uid={0},ou=people") .contextSource() .port(0); + // @formatter:on } } @EnableWebSecurity static class GroupSubtreeSearchConfig extends BaseLdapProviderConfig { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .groupSearchBase("ou=groups") .groupSearchFilter("(member={0})") .groupSearchSubtree(true) .userDnPatterns("uid={0},ou=people"); + // @formatter:on } - // @formatter:on } } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/NamespaceLdapAuthenticationProviderTestsConfigs.java b/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/NamespaceLdapAuthenticationProviderTestsConfigs.java index c349ce6a1b..d73fb3a801 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/NamespaceLdapAuthenticationProviderTestsConfigs.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/authentication/ldap/NamespaceLdapAuthenticationProviderTestsConfigs.java @@ -29,21 +29,21 @@ import org.springframework.security.ldap.userdetails.PersonContextMapper; public class NamespaceLdapAuthenticationProviderTestsConfigs { @EnableWebSecurity static class LdapAuthenticationProviderConfig extends WebSecurityConfigurerAdapter { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .groupSearchBase("ou=groups") .userDnPatterns("uid={0},ou=people"); // ldap-server@user-dn-pattern + // @formatter:on } - // @formatter:on } @EnableWebSecurity static class CustomLdapAuthenticationProviderConfig extends WebSecurityConfigurerAdapter { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .groupRoleAttribute("cn") // ldap-authentication-provider@group-role-attribute @@ -63,28 +63,28 @@ public class NamespaceLdapAuthenticationProviderTestsConfigs { .root("dc=springframework,dc=org") // ldap-server@root // .url("ldap://localhost:33389/dc-springframework,dc=org") this overrides root and port and is used for external ; + // @formatter:on } - // @formatter:on } @EnableWebSecurity static class CustomAuthoritiesPopulatorConfig extends WebSecurityConfigurerAdapter { static LdapAuthoritiesPopulator LAP; - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .userSearchFilter("(uid={0})") .ldapAuthoritiesPopulator(LAP); + // @formatter:on } - // @formatter:on } @EnableWebSecurity static class PasswordCompareLdapConfig extends WebSecurityConfigurerAdapter { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .ldapAuthentication() .groupSearchBase("ou=groups") @@ -92,7 +92,7 @@ public class NamespaceLdapAuthenticationProviderTestsConfigs { .passwordCompare() .passwordEncoder(new BCryptPasswordEncoder()) // ldap-authentication-provider/password-compare/password-encoder@ref .passwordAttribute("userPassword"); // ldap-authentication-provider/password-compare@password-attribute + // @formatter:on } - // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/AuthenticationManagerBuilderTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/AuthenticationManagerBuilderTests.java index 6b02c0cb3f..6fac5b0e29 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/AuthenticationManagerBuilderTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/AuthenticationManagerBuilderTests.java @@ -113,9 +113,11 @@ public class AuthenticationManagerBuilderTests { static class PasswordEncoderGlobalConfig extends WebSecurityConfigurerAdapter { @Autowired void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } @Bean @@ -139,9 +141,11 @@ public class AuthenticationManagerBuilderTests { @EnableWebSecurity static class PasswordEncoderConfig extends WebSecurityConfigurerAdapter { protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } @Bean diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/BaseAuthenticationConfig.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/BaseAuthenticationConfig.java index 172d463d46..b2546aee46 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/BaseAuthenticationConfig.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/BaseAuthenticationConfig.java @@ -28,9 +28,11 @@ import org.springframework.security.config.annotation.authentication.builders.Au public class BaseAuthenticationConfig { @Autowired protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER").and() .withUser("admin").password("password").roles("USER", "ADMIN"); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationManagerTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationManagerTests.java index 31c48eca29..cab352ce61 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationManagerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationManagerTests.java @@ -55,9 +55,11 @@ public class NamespaceAuthenticationManagerTests { static class EraseCredentialsTrueDefaultConfig extends WebSecurityConfigurerAdapter { @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } } @@ -77,10 +79,12 @@ public class NamespaceAuthenticationManagerTests { static class EraseCredentialsFalseConfig extends WebSecurityConfigurerAdapter { @Override public void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .eraseCredentials(false) .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } } @@ -97,10 +101,12 @@ public class NamespaceAuthenticationManagerTests { static class GlobalEraseCredentialsFalseConfig extends WebSecurityConfigurerAdapter { @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .eraseCredentials(false) .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationProviderTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationProviderTests.java index b26b9fc2c6..d4ec0812ca 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationProviderTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceAuthenticationProviderTests.java @@ -56,8 +56,10 @@ public class NamespaceAuthenticationProviderTests { @EnableWebSecurity static class AuthenticationProviderRefConfig extends WebSecurityConfigurerAdapter { protected void configure(AuthenticationManagerBuilder auth) { + // @formatter:off auth .authenticationProvider(authenticationProvider()); + // @formatter:on } @Bean @@ -80,8 +82,10 @@ public class NamespaceAuthenticationProviderTests { @EnableWebSecurity static class UserServiceRefConfig extends WebSecurityConfigurerAdapter { protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .userDetailsService(userDetailsService()); + // @formatter:on } @Bean diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceJdbcUserServiceTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceJdbcUserServiceTests.java index b1242b5a3f..8e17e22a47 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceJdbcUserServiceTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespaceJdbcUserServiceTests.java @@ -63,11 +63,13 @@ public class NamespaceJdbcUserServiceTests { private DataSource dataSource; protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .jdbcAuthentication() .withDefaultSchema() .withUser(PasswordEncodedUser.user()) .dataSource(this.dataSource); // jdbc-user-service@data-source-ref + // @formatter:on } } @@ -94,6 +96,7 @@ public class NamespaceJdbcUserServiceTests { private DataSource dataSource; protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .jdbcAuthentication() // jdbc-user-service@dataSource @@ -108,6 +111,7 @@ public class NamespaceJdbcUserServiceTests { .groupAuthoritiesByUsername(JdbcUserDetailsManager.DEF_GROUP_AUTHORITIES_BY_USERNAME_QUERY) // jdbc-user-service@role-prefix .rolePrefix("ROLE_"); + // @formatter:on } diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespacePasswordEncoderTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespacePasswordEncoderTests.java index d8c2ce0ccc..61a34154e5 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespacePasswordEncoderTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/NamespacePasswordEncoderTests.java @@ -61,10 +61,12 @@ public class NamespacePasswordEncoderTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password(encoder.encode("password")).roles("USER").and() .passwordEncoder(encoder); + // @formatter:on } } @@ -82,12 +84,14 @@ public class NamespacePasswordEncoderTests { protected void configure(AuthenticationManagerBuilder auth) throws Exception { BCryptPasswordEncoder encoder = new BCryptPasswordEncoder(); + // @formatter:off auth .jdbcAuthentication() .withDefaultSchema() .dataSource(dataSource()) .withUser("user").password(encoder.encode("password")).roles("USER").and() .passwordEncoder(encoder); + // @formatter:on } @Bean @@ -116,9 +120,11 @@ public class NamespacePasswordEncoderTests { .roles("USER") .build(); InMemoryUserDetailsManager uds = new InMemoryUserDetailsManager(user); + // @formatter:off auth .userDetailsService(uds) .passwordEncoder(encoder); + // @formatter:on } @Bean diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/PasswordEncoderConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/PasswordEncoderConfigurerTests.java index e145d411c5..2b2287b4f2 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/PasswordEncoderConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/PasswordEncoderConfigurerTests.java @@ -49,15 +49,15 @@ public class PasswordEncoderConfigurerTests { @EnableWebSecurity static class PasswordEncoderConfig extends WebSecurityConfigurerAdapter { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { BCryptPasswordEncoder encoder = passwordEncoder(); + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password(encoder.encode("password")).roles("USER").and() .passwordEncoder(encoder); + // @formatter:on } - // @formatter:on @Override protected void configure(HttpSecurity http) { @@ -80,15 +80,15 @@ public class PasswordEncoderConfigurerTests { @EnableWebSecurity static class PasswordEncoderNoAuthManagerLoadsConfig extends WebSecurityConfigurerAdapter { - // @formatter:off protected void configure(AuthenticationManagerBuilder auth) throws Exception { BCryptPasswordEncoder encoder = passwordEncoder(); + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password(encoder.encode("password")).roles("USER").and() .passwordEncoder(encoder); + // @formatter:on } - // @formatter:on @Bean public BCryptPasswordEncoder passwordEncoder() { diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java index 3ba459170f..14546c85f7 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfigurationTests.java @@ -241,9 +241,11 @@ public class AuthenticationConfigurationTests { static class ConfiguresInMemoryConfigurerAdapter extends GlobalAuthenticationConfigurerAdapter { public void init(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java index 221a63d24c..902af21b20 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java @@ -134,8 +134,10 @@ public class GlobalMethodSecurityConfigurationTests { public static class InMemoryAuthWithGlobalMethodSecurityConfig extends GlobalMethodSecurityConfiguration { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication(); + // @formatter:on } @Bean diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/SampleEnableGlobalMethodSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/SampleEnableGlobalMethodSecurityTests.java index ea690af732..13ffa15645 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/SampleEnableGlobalMethodSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/SampleEnableGlobalMethodSecurityTests.java @@ -74,10 +74,12 @@ public class SampleEnableGlobalMethodSecurityTests { @Autowired protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER").and() .withUser("admin").password("password").roles("USER", "ADMIN"); + // @formatter:on } } @@ -109,10 +111,12 @@ public class SampleEnableGlobalMethodSecurityTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER").and() .withUser("admin").password("password").roles("USER", "ADMIN"); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/SampleWebSecurityConfigurerAdapterTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/SampleWebSecurityConfigurerAdapterTests.java index 218f261433..760152d496 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/SampleWebSecurityConfigurerAdapterTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/SampleWebSecurityConfigurerAdapterTests.java @@ -135,9 +135,11 @@ public class SampleWebSecurityConfigurerAdapterTests { public static class HelloWorldWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdapter { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } } @@ -233,10 +235,12 @@ public class SampleWebSecurityConfigurerAdapterTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()) .withUser(PasswordEncodedUser.admin()); + // @formatter:on } } @@ -346,10 +350,12 @@ public class SampleWebSecurityConfigurerAdapterTests { public static class SampleMultiHttpSecurityConfig { @Autowired protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()) .withUser(PasswordEncodedUser.admin()); + // @formatter:on } @Configuration diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java index c35cdb39fe..a0643fcf3f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterPowermockTests.java @@ -146,9 +146,11 @@ public class WebSecurityConfigurerAdapterPowermockTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } @Override diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterTests.java index 8f784aa513..4d8bf244d1 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/WebSecurityConfigurerAdapterTests.java @@ -96,9 +96,11 @@ public class WebSecurityConfigurerAdapterTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } @Override @@ -125,9 +127,11 @@ public class WebSecurityConfigurerAdapterTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } @Override @@ -152,9 +156,11 @@ public class WebSecurityConfigurerAdapterTests { static class InMemoryConfigureProtectedConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } @Override @@ -180,9 +186,11 @@ public class WebSecurityConfigurerAdapterTests { static class InMemoryConfigureGlobalConfig extends WebSecurityConfigurerAdapter { @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } @Override @@ -283,9 +291,11 @@ public class WebSecurityConfigurerAdapterTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/builders/HttpConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/builders/HttpConfigurationTests.java index 00fa2b4e96..620abd0367 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/builders/HttpConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/builders/HttpConfigurationTests.java @@ -75,9 +75,11 @@ public class HttpConfigurationTests { } protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/builders/NamespaceHttpTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/builders/NamespaceHttpTests.java index d94e54403e..a5a33c4fe5 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/builders/NamespaceHttpTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/builders/NamespaceHttpTests.java @@ -479,9 +479,11 @@ public class NamespaceHttpTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/AuthenticationPrincipalArgumentResolverTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/AuthenticationPrincipalArgumentResolverTests.java index 9392335bb8..021865f318 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/AuthenticationPrincipalArgumentResolverTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/AuthenticationPrincipalArgumentResolverTests.java @@ -79,8 +79,10 @@ public class AuthenticationPrincipalArgumentResolverTests { static class Config { @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication(); + // @formatter:off } @Bean diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurityTests.java index fd77bea5d5..35dac47b9c 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/EnableWebSecurityTests.java @@ -64,9 +64,11 @@ public class EnableWebSecurityTests { static class SecurityConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } @Bean diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityAntMatchersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityAntMatchersTests.java index 29184b43ec..45836760f6 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityAntMatchersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityAntMatchersTests.java @@ -90,8 +90,10 @@ public class HttpSecurityAntMatchersTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication(); + // @formatter:on } } @@ -123,8 +125,10 @@ public class HttpSecurityAntMatchersTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication(); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityLogoutTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityLogoutTests.java index 673705ef3a..e7a80a6e7b 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityLogoutTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityLogoutTests.java @@ -95,8 +95,10 @@ public class HttpSecurityLogoutTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication(); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpExpressionHandlerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpExpressionHandlerTests.java index 3c5af7d6e9..7bea9d6eac 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpExpressionHandlerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpExpressionHandlerTests.java @@ -77,9 +77,11 @@ public class NamespaceHttpExpressionHandlerTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("rod").password("password").roles("USER", "ADMIN"); + // @formatter:on } @Override diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpInterceptUrlTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpInterceptUrlTests.java index 76aa167d30..bea987ff28 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpInterceptUrlTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpInterceptUrlTests.java @@ -147,10 +147,12 @@ public class NamespaceHttpInterceptUrlTests { } protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER").and() .withUser("admin").password("password").roles("USER", "ADMIN"); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpPortMappingsTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpPortMappingsTests.java index f742f4c9e9..062d561a06 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpPortMappingsTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpPortMappingsTests.java @@ -79,10 +79,12 @@ public class NamespaceHttpPortMappingsTests { } protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER").and() .withUser("admin").password("password").roles("USER", "ADMIN"); + // @formatter:on } } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpRequestCacheTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpRequestCacheTests.java index ac895fc284..4504f74d6f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpRequestCacheTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpRequestCacheTests.java @@ -78,10 +78,12 @@ public class NamespaceHttpRequestCacheTests { } protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()) .withUser(PasswordEncodedUser.admin()); + // @formatter:on } @Bean @@ -114,10 +116,12 @@ public class NamespaceHttpRequestCacheTests { } protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()) .withUser(PasswordEncodedUser.admin()); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpX509Tests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpX509Tests.java index 6f9d7d7cc4..f77c04facd 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpX509Tests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpX509Tests.java @@ -81,9 +81,11 @@ public class NamespaceHttpX509Tests { public static class X509Config extends WebSecurityConfigurerAdapter { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("rod").password("password").roles("USER", "ADMIN"); + // @formatter:on } @Override @@ -114,9 +116,11 @@ public class NamespaceHttpX509Tests { static class AuthenticationDetailsSourceRefConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("rod").password("password").roles("USER", "ADMIN"); + // @formatter:on } @Override @@ -152,9 +156,11 @@ public class NamespaceHttpX509Tests { public static class SubjectPrincipalRegexConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("rod").password("password").roles("USER", "ADMIN"); + // @formatter:on } @Override @@ -183,9 +189,11 @@ public class NamespaceHttpX509Tests { public static class CustomPrincipalExtractorConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("rod@example.com").password("password").roles("USER", "ADMIN"); + // @formatter:on } @Override @@ -222,9 +230,11 @@ public class NamespaceHttpX509Tests { public static class UserDetailsServiceRefConfig extends WebSecurityConfigurerAdapter { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("rod").password("password").roles("USER", "ADMIN"); + // @formatter:on } @Override diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java index b1e03fe1d7..41673a98cb 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceRememberMeTests.java @@ -441,8 +441,10 @@ public class NamespaceRememberMeTests { @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .userDetailsService(USERDETAILS_SERVICE); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java index f9d5a64972..cd8d78f5bf 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerServlet31Tests.java @@ -113,14 +113,14 @@ public class SessionManagementConfigurerServlet31Tests { // @formatter:on } - // @formatter:off @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } - // @formatter:on } private void loadConfig(Class... classes) { diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerSessionAuthenticationStrategyTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerSessionAuthenticationStrategyTests.java index 6d4b39966f..eb8f2d0e02 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerSessionAuthenticationStrategyTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerSessionAuthenticationStrategyTests.java @@ -71,13 +71,13 @@ public class SessionManagementConfigurerSessionAuthenticationStrategyTests { // @formatter:on } - // @formatter:off @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser(PasswordEncodedUser.user()); + // @formatter:on } - // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTransientAuthenticationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTransientAuthenticationTests.java index 98d863223d..b8f99f009c 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTransientAuthenticationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTransientAuthenticationTests.java @@ -78,8 +78,10 @@ public class SessionManagementConfigurerTransientAuthenticationTests { @Override protected void configure(AuthenticationManagerBuilder auth) { + // @formatter:off auth .authenticationProvider(new TransientAuthenticationProvider()); + // @formatter:on } } diff --git a/config/src/test/java/org/springframework/security/config/core/GrantedAuthorityDefaultsJcTests.java b/config/src/test/java/org/springframework/security/config/core/GrantedAuthorityDefaultsJcTests.java index d62e1f8821..dcf6e5995f 100644 --- a/config/src/test/java/org/springframework/security/config/core/GrantedAuthorityDefaultsJcTests.java +++ b/config/src/test/java/org/springframework/security/config/core/GrantedAuthorityDefaultsJcTests.java @@ -158,9 +158,11 @@ public class GrantedAuthorityDefaultsJcTests { @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } @Override diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserParentTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserParentTests.java index 0f25882073..a15edc44d6 100644 --- a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserParentTests.java +++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserParentTests.java @@ -48,13 +48,13 @@ public class WithMockUserParentTests extends WithMockUserParent { @EnableGlobalMethodSecurity(prePostEnabled = true) @ComponentScan(basePackageClasses = HelloMessageService.class) static class Config { - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } - // @formatter:on } } \ No newline at end of file diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java index eafe930b31..a525f310b5 100644 --- a/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java +++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithMockUserTests.java @@ -77,13 +77,13 @@ public class WithMockUserTests { @EnableGlobalMethodSecurity(prePostEnabled = true) @ComponentScan(basePackageClasses = HelloMessageService.class) static class Config { - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } - // @formatter:on } } \ No newline at end of file diff --git a/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java b/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java index 55a8af3d38..8143f4f01a 100644 --- a/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java +++ b/test/src/test/java/org/springframework/security/test/context/showcase/WithUserDetailsTests.java @@ -77,13 +77,13 @@ public class WithUserDetailsTests { @EnableGlobalMethodSecurity(prePostEnabled = true) @ComponentScan(basePackageClasses = HelloMessageService.class) static class Config { - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .userDetailsService(myUserDetailsService()); + // @formatter:on } - // @formatter:on @Bean public UserDetailsService myUserDetailsService() { diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java index e4d84b99d9..51c92c5032 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests.java @@ -82,13 +82,13 @@ public class SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests { // @formatter:on } - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication(); + // @formatter:on } - // @formatter:on @RestController static class Controller { diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java index b957c7c98e..cc01f37ac1 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTests.java @@ -82,13 +82,13 @@ public class SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTes // @formatter:on } - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication(); + // @formatter:on } - // @formatter:on @RestController static class Controller { diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java index bf5f71edfe..b61a4247ef 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CsrfShowcaseTests.java @@ -75,13 +75,13 @@ public class CsrfShowcaseTests { protected void configure(HttpSecurity http) { } - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } - // @formatter:on } } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java index 8ce1ec6637..ad66e089a1 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/CustomCsrfShowcaseTests.java @@ -83,14 +83,14 @@ public class CustomCsrfShowcaseTests { // @formatter:on } - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } - // @formatter:on @Bean public CsrfTokenRepository repo() { diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java index 4554ca660d..42081d209f 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/csrf/DefaultCsrfShowcaseTests.java @@ -70,13 +70,13 @@ public class DefaultCsrfShowcaseTests { protected void configure(HttpSecurity http) { } - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } - // @formatter:on } } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java index a1bf100d43..31858ba6d6 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/DefaultfSecurityRequestsTests.java @@ -97,13 +97,13 @@ public class DefaultfSecurityRequestsTests { // @formatter:on } - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } - // @formatter:on } } \ No newline at end of file diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java index 226197aa38..4514754ff5 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/SecurityRequestsTests.java @@ -115,14 +115,14 @@ public class SecurityRequestsTests { // @formatter:on } - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } - // @formatter:on @Override @Bean diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java index cfdc27f7af..4a58ac6bde 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserAuthenticationTests.java @@ -99,13 +99,13 @@ public class WithUserAuthenticationTests { // @formatter:on } - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } - // @formatter:on } } \ No newline at end of file diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java index 951245aa12..a0bd420579 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserClassLevelAuthenticationTests.java @@ -99,13 +99,13 @@ public class WithUserClassLevelAuthenticationTests { // @formatter:on } - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER"); + // @formatter:on } - // @formatter:on } } \ No newline at end of file diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java index 5d89232bc8..be7234f3ef 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsAuthenticationTests.java @@ -97,14 +97,14 @@ public class WithUserDetailsAuthenticationTests { return super.userDetailsServiceBean(); } - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER").and() .withUser("admin").password("password").roles("USER", "ADMIN"); + // @formatter:on } - // @formatter:on } } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java index 23c19d12b6..9c34d662df 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/secured/WithUserDetailsClassLevelAuthenticationTests.java @@ -97,14 +97,14 @@ public class WithUserDetailsClassLevelAuthenticationTests { return super.userDetailsServiceBean(); } - // @formatter:off @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + // @formatter:off auth .inMemoryAuthentication() .withUser("user").password("password").roles("USER").and() .withUser("admin").password("password").roles("USER", "ADMIN"); + // @formatter:on } - // @formatter:on } }