diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/AclClassIdUtils.java b/acl/src/main/java/org/springframework/security/acls/jdbc/AclClassIdUtils.java index 8f000bdd83..5d124d8b52 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/AclClassIdUtils.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/AclClassIdUtils.java @@ -142,7 +142,7 @@ class AclClassIdUtils { return object.getClass().isAssignableFrom(String.class); } - public void setConversionService(ConversionService conversionService) { + void setConversionService(ConversionService conversionService) { Assert.notNull(conversionService, "conversionService must not be null"); this.conversionService = conversionService; } diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java index 6258b27495..4ebf564588 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java @@ -655,15 +655,15 @@ public class BasicLookupStrategy implements LookupStrategy { this.id = id; } + Long getId() { + return this.id; + } + @Override public List getEntries() { throw new UnsupportedOperationException("Stub only"); } - public Long getId() { - return this.id; - } - @Override public ObjectIdentity getObjectIdentity() { throw new UnsupportedOperationException("Stub only"); diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java index d76f888c08..3e5e09c2f7 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java @@ -175,29 +175,29 @@ public class JdbcAclServiceTests { .isEqualTo(UUID.fromString("25d93b3f-c3aa-4814-9d5e-c7c96ced7762")); } - private class MockLongIdDomainObject { + class MockLongIdDomainObject { private Object id; - public Object getId() { + Object getId() { return this.id; } - public void setId(Object id) { + void setId(Object id) { this.id = id; } } - private class MockUntypedIdDomainObject { + class MockUntypedIdDomainObject { private Object id; - public Object getId() { + Object getId() { return this.id; } - public void setId(Object id) { + void setId(Object id) { this.id = id; } 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 b51a4128b9..36d1d636ee 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 @@ -273,7 +273,7 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests { abstract static class BaseLdapServerConfig extends BaseLdapProviderConfig { @Bean - public ApacheDSContainer ldapServer() throws Exception { + ApacheDSContainer ldapServer() throws Exception { ApacheDSContainer apacheDSContainer = new ApacheDSContainer("dc=springframework,dc=org", "classpath:/test-server.ldif"); apacheDSContainer.setPort(getPort()); @@ -288,7 +288,7 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests { abstract static class BaseLdapProviderConfig extends WebSecurityConfigurerAdapter { @Bean - public BaseLdapPathContextSource contextSource() throws Exception { + BaseLdapPathContextSource contextSource() throws Exception { DefaultSpringSecurityContextSource contextSource = new DefaultSpringSecurityContextSource( "ldap://127.0.0.1:" + getPort() + "/dc=springframework,dc=org"); contextSource.setUserDn("uid=admin,ou=system"); @@ -298,7 +298,7 @@ public class LdapAuthenticationProviderBuilderSecurityBuilderTests { } @Bean - public AuthenticationManager authenticationManager(AuthenticationManagerBuilder auth) throws Exception { + AuthenticationManager authenticationManager(AuthenticationManagerBuilder auth) throws Exception { configure(auth); return auth.build(); } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java index ebe5e52d23..a6809b8574 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/HelloRSocketITests.java @@ -116,19 +116,19 @@ public class HelloRSocketITests { static class Config { @Bean - public ServerController controller() { + ServerController controller() { return new ServerController(); } @Bean - public RSocketMessageHandler messageHandler() { + RSocketMessageHandler messageHandler() { RSocketMessageHandler handler = new RSocketMessageHandler(); handler.setRSocketStrategies(rsocketStrategies()); return handler; } @Bean - public RSocketStrategies rsocketStrategies() { + RSocketStrategies rsocketStrategies() { return RSocketStrategies.builder().encoder(new BasicAuthenticationEncoder()).build(); } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java index 4ef09c80d9..12e27e88c9 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/JwtITests.java @@ -137,19 +137,19 @@ public class JwtITests { static class Config { @Bean - public ServerController controller() { + ServerController controller() { return new ServerController(); } @Bean - public RSocketMessageHandler messageHandler() { + RSocketMessageHandler messageHandler() { RSocketMessageHandler handler = new RSocketMessageHandler(); handler.setRSocketStrategies(rsocketStrategies()); return handler; } @Bean - public RSocketStrategies rsocketStrategies() { + RSocketStrategies rsocketStrategies() { return RSocketStrategies.builder().encoder(new BearerTokenAuthenticationEncoder()).build(); } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java index 01c3095b9f..1a73888c74 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerConnectionITests.java @@ -204,19 +204,19 @@ public class RSocketMessageHandlerConnectionITests { static class Config { @Bean - public ServerController controller() { + ServerController controller() { return new ServerController(); } @Bean - public RSocketMessageHandler messageHandler() { + RSocketMessageHandler messageHandler() { RSocketMessageHandler handler = new RSocketMessageHandler(); handler.setRSocketStrategies(rsocketStrategies()); return handler; } @Bean - public RSocketStrategies rsocketStrategies() { + RSocketStrategies rsocketStrategies() { return RSocketStrategies.builder().encoder(new BasicAuthenticationEncoder()).build(); } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java index 53e11a1c77..eb22782c00 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/RSocketMessageHandlerITests.java @@ -186,19 +186,19 @@ public class RSocketMessageHandlerITests { static class Config { @Bean - public ServerController controller() { + ServerController controller() { return new ServerController(); } @Bean - public RSocketMessageHandler messageHandler() { + RSocketMessageHandler messageHandler() { RSocketMessageHandler handler = new RSocketMessageHandler(); handler.setRSocketStrategies(rsocketStrategies()); return handler; } @Bean - public RSocketStrategies rsocketStrategies() { + RSocketStrategies rsocketStrategies() { return RSocketStrategies.builder().encoder(new BasicAuthenticationEncoder()).build(); } diff --git a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java index 2598c152cb..fc3d4e01ed 100644 --- a/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java +++ b/config/src/integration-test/java/org/springframework/security/config/annotation/rsocket/SimpleAuthenticationITests.java @@ -121,19 +121,19 @@ public class SimpleAuthenticationITests { static class Config { @Bean - public ServerController controller() { + ServerController controller() { return new ServerController(); } @Bean - public RSocketMessageHandler messageHandler() { + RSocketMessageHandler messageHandler() { RSocketMessageHandler handler = new RSocketMessageHandler(); handler.setRSocketStrategies(rsocketStrategies()); return handler; } @Bean - public RSocketStrategies rsocketStrategies() { + RSocketStrategies rsocketStrategies() { return RSocketStrategies.builder().encoder(new SimpleAuthenticationEncoder()).build(); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java index 0cfea53ac4..6acd120958 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/userdetails/AbstractDaoAuthenticationConfigurer.java @@ -33,7 +33,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; * @author Rob Winch * @since 3.2 */ -abstract class AbstractDaoAuthenticationConfigurer, C extends AbstractDaoAuthenticationConfigurer, U extends UserDetailsService> +public abstract class AbstractDaoAuthenticationConfigurer, C extends AbstractDaoAuthenticationConfigurer, U extends UserDetailsService> extends UserDetailsAwareConfigurer { private DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); @@ -44,7 +44,7 @@ abstract class AbstractDaoAuthenticationConfigurer { */ private static final class RequestMatchers { + private RequestMatchers() { + } + /** * Create a {@link List} of {@link AntPathRequestMatcher} instances. * @param httpMethod the {@link HttpMethod} to use or {@code null} for any @@ -243,7 +246,7 @@ public abstract class AbstractRequestMatcherRegistry { * from * @return a {@link List} of {@link AntPathRequestMatcher} instances */ - public static List antMatchers(HttpMethod httpMethod, String... antPatterns) { + static List antMatchers(HttpMethod httpMethod, String... antPatterns) { String method = httpMethod == null ? null : httpMethod.toString(); List matchers = new ArrayList<>(); for (String pattern : antPatterns) { @@ -259,7 +262,7 @@ public abstract class AbstractRequestMatcherRegistry { * from * @return a {@link List} of {@link AntPathRequestMatcher} instances */ - public static List antMatchers(String... antPatterns) { + static List antMatchers(String... antPatterns) { return antMatchers(null, antPatterns); } @@ -271,7 +274,7 @@ public abstract class AbstractRequestMatcherRegistry { * {@link RegexRequestMatcher} from * @return a {@link List} of {@link RegexRequestMatcher} instances */ - public static List regexMatchers(HttpMethod httpMethod, String... regexPatterns) { + static List regexMatchers(HttpMethod httpMethod, String... regexPatterns) { String method = httpMethod == null ? null : httpMethod.toString(); List matchers = new ArrayList<>(); for (String pattern : regexPatterns) { @@ -287,13 +290,10 @@ public abstract class AbstractRequestMatcherRegistry { * {@link RegexRequestMatcher} from * @return a {@link List} of {@link RegexRequestMatcher} instances */ - public static List regexMatchers(String... regexPatterns) { + static List regexMatchers(String... regexPatterns) { return regexMatchers(null, regexPatterns); } - private RequestMatchers() { - } - } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java index 49352164cc..d143aab14c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java @@ -125,7 +125,7 @@ final class FilterComparator implements Comparator, Serializable { * @param filter * @return */ - public boolean isRegistered(Class filter) { + boolean isRegistered(Class filter) { return getOrder(filter) != null; } @@ -136,7 +136,7 @@ final class FilterComparator implements Comparator, Serializable { * @param afterFilter the {@link Filter} that is already registered and that * {@code filter} should be placed after. */ - public void registerAfter(Class filter, Class afterFilter) { + void registerAfter(Class filter, Class afterFilter) { Integer position = getOrder(afterFilter); if (position == null) { throw new IllegalArgumentException("Cannot register after unregistered Filter " + afterFilter); @@ -151,7 +151,7 @@ final class FilterComparator implements Comparator, Serializable { * @param atFilter the {@link Filter} that is already registered and that * {@code filter} should be placed at. */ - public void registerAt(Class filter, Class atFilter) { + void registerAt(Class filter, Class atFilter) { Integer position = getOrder(atFilter); if (position == null) { throw new IllegalArgumentException("Cannot register after unregistered Filter " + atFilter); @@ -167,7 +167,7 @@ final class FilterComparator implements Comparator, Serializable { * @param beforeFilter the {@link Filter} that is already registered and that * {@code filter} should be placed before. */ - public void registerBefore(Class filter, Class beforeFilter) { + void registerBefore(Class filter, Class beforeFilter) { Integer position = getOrder(beforeFilter); if (position == null) { throw new IllegalArgumentException("Cannot register after unregistered Filter " + beforeFilter); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java index 7297f22f3e..dec674d305 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java @@ -35,9 +35,8 @@ import org.springframework.util.Assert; * {@link ApplicationContext} but ignoring the parent. * * @author Rob Winch - * */ -final class AutowiredWebSecurityConfigurersIgnoreParents { +public final class AutowiredWebSecurityConfigurersIgnoreParents { private final ConfigurableListableBeanFactory beanFactory; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java index 1a38a58bf0..90f2cf9f03 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfiguration.java @@ -56,7 +56,7 @@ class HttpSecurityConfiguration { private ApplicationContext context; @Autowired - public void setObjectPostProcessor(ObjectPostProcessor objectPostProcessor) { + void setObjectPostProcessor(ObjectPostProcessor objectPostProcessor) { this.objectPostProcessor = objectPostProcessor; } @@ -66,18 +66,18 @@ class HttpSecurityConfiguration { } @Autowired - public void setAuthenticationConfiguration(AuthenticationConfiguration authenticationConfiguration) { + void setAuthenticationConfiguration(AuthenticationConfiguration authenticationConfiguration) { this.authenticationConfiguration = authenticationConfiguration; } @Autowired - public void setApplicationContext(ApplicationContext context) { + void setApplicationContext(ApplicationContext context) { this.context = context; } @Bean(HTTPSECURITY_BEAN_NAME) @Scope("prototype") - public HttpSecurity httpSecurity() throws Exception { + HttpSecurity httpSecurity() throws Exception { WebSecurityConfigurerAdapter.LazyPasswordEncoder passwordEncoder = new WebSecurityConfigurerAdapter.LazyPasswordEncoder( this.context); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java index 583ed45c92..0e72157de2 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfiguration.java @@ -66,7 +66,7 @@ class WebMvcSecurityConfiguration implements WebMvcConfigurer, ApplicationContex } @Bean - public RequestDataValueProcessor requestDataValueProcessor() { + RequestDataValueProcessor requestDataValueProcessor() { return new CsrfRequestDataValueProcessor(); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java index 9ffbaf7680..9385feb21e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java @@ -122,20 +122,20 @@ public abstract class AbstractConfigAttributeRequestMatcherRegistry extends A */ static final class UrlMapping { - private RequestMatcher requestMatcher; + private final RequestMatcher requestMatcher; - private Collection configAttrs; + private final Collection configAttrs; UrlMapping(RequestMatcher requestMatcher, Collection configAttrs) { this.requestMatcher = requestMatcher; this.configAttrs = configAttrs; } - public RequestMatcher getRequestMatcher() { + RequestMatcher getRequestMatcher() { return this.requestMatcher; } - public Collection getConfigAttrs() { + Collection getConfigAttrs() { return this.configAttrs; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java index 3c4b687f1e..fb0d0e089e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java @@ -61,13 +61,16 @@ import org.springframework.security.web.access.intercept.FilterSecurityIntercept * @see ExpressionUrlAuthorizationConfigurer * @see UrlAuthorizationConfigurer */ -abstract class AbstractInterceptUrlConfigurer, H extends HttpSecurityBuilder> +public abstract class AbstractInterceptUrlConfigurer, H extends HttpSecurityBuilder> extends AbstractHttpConfigurer { private Boolean filterSecurityInterceptorOncePerRequest; private AccessDecisionManager accessDecisionManager; + AbstractInterceptUrlConfigurer() { + } + @Override public void configure(H http) throws Exception { FilterInvocationSecurityMetadataSource metadataSource = createMetadataSource(http); @@ -145,9 +148,12 @@ abstract class AbstractInterceptUrlConfigurer, T> + public abstract class AbstractInterceptUrlRegistry, T> extends AbstractConfigAttributeRequestMatcherRegistry { + AbstractInterceptUrlRegistry() { + } + /** * Allows setting the {@link AccessDecisionManager}. If none is provided, a * default {@link AccessDecisionManager} is created. diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java index 44f7dd85b7..6ead1c38c4 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java @@ -338,7 +338,7 @@ public final class CsrfConfigurer> return mvcMatchers(null, mvcPatterns); } - public CsrfConfigurer and() { + CsrfConfigurer and() { return CsrfConfigurer.this; } @@ -366,7 +366,7 @@ public final class CsrfConfigurer> this.mvcMatchers = mvcMatchers; } - public IgnoreCsrfProtectionRegistry servletPath(String servletPath) { + IgnoreCsrfProtectionRegistry servletPath(String servletPath) { for (MvcRequestMatcher matcher : this.mvcMatchers) { matcher.setServletPath(servletPath); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java index 3f2a83a00b..c1c9152954 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PermitAllSupport.java @@ -31,7 +31,10 @@ import org.springframework.security.web.util.matcher.RequestMatcher; */ final class PermitAllSupport { - public static void permitAll(HttpSecurityBuilder> http, String... urls) { + private PermitAllSupport() { + } + + static void permitAll(HttpSecurityBuilder> http, String... urls) { for (String url : urls) { if (url != null) { permitAll(http, new ExactUrlRequestMatcher(url)); @@ -40,7 +43,7 @@ final class PermitAllSupport { } @SuppressWarnings("unchecked") - public static void permitAll(HttpSecurityBuilder> http, + static void permitAll(HttpSecurityBuilder> http, RequestMatcher... requestMatchers) { ExpressionUrlAuthorizationConfigurer configurer = http .getConfigurer(ExpressionUrlAuthorizationConfigurer.class); @@ -90,7 +93,4 @@ final class PermitAllSupport { } - private PermitAllSupport() { - } - } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java index 53db1292f7..03053952f3 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurer.java @@ -511,7 +511,7 @@ public final class OAuth2ResourceServerConfigurer authorizedClientService) { + void setAuthorizedClientService(List authorizedClientService) { if (authorizedClientService.size() == 1) { this.authorizedClientService = authorizedClientService.get(0); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfiguration.java index bfef35ed7a..728b893475 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/reactive/ServerHttpSecurityConfiguration.java @@ -89,18 +89,20 @@ class ServerHttpSecurityConfiguration { } @Bean - public WebFluxConfigurer authenticationPrincipalArgumentResolverConfigurer( + WebFluxConfigurer authenticationPrincipalArgumentResolverConfigurer( ObjectProvider authenticationPrincipalArgumentResolver) { return new WebFluxConfigurer() { + @Override public void configureArgumentResolvers(ArgumentResolverConfigurer configurer) { configurer.addCustomResolver(authenticationPrincipalArgumentResolver.getObject()); } + }; } @Bean - public AuthenticationPrincipalArgumentResolver authenticationPrincipalArgumentResolver() { + AuthenticationPrincipalArgumentResolver authenticationPrincipalArgumentResolver() { AuthenticationPrincipalArgumentResolver resolver = new AuthenticationPrincipalArgumentResolver( this.adapterRegistry); if (this.beanFactory != null) { @@ -110,7 +112,7 @@ class ServerHttpSecurityConfiguration { } @Bean - public CurrentSecurityContextArgumentResolver reactiveCurrentSecurityContextArgumentResolver() { + CurrentSecurityContextArgumentResolver reactiveCurrentSecurityContextArgumentResolver() { CurrentSecurityContextArgumentResolver resolver = new CurrentSecurityContextArgumentResolver( this.adapterRegistry); if (this.beanFactory != null) { @@ -121,7 +123,7 @@ class ServerHttpSecurityConfiguration { @Bean(HTTPSECURITY_BEAN_NAME) @Scope("prototype") - public ServerHttpSecurity httpSecurity() { + ServerHttpSecurity httpSecurity() { ContextAwareServerHttpSecurity http = new ContextAwareServerHttpSecurity(); return http.authenticationManager(authenticationManager()).headers().and().logout().and(); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java index 39e160f19b..de54752001 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/reactive/WebFluxSecurityConfiguration.java @@ -65,17 +65,17 @@ class WebFluxSecurityConfiguration { @Bean(SPRING_SECURITY_WEBFILTERCHAINFILTER_BEAN_NAME) @Order(WEB_FILTER_CHAIN_FILTER_ORDER) - public WebFilterChainProxy springSecurityWebFilterChainFilter() { + WebFilterChainProxy springSecurityWebFilterChainFilter() { return new WebFilterChainProxy(getSecurityWebFilterChains()); } @Bean(name = AbstractView.REQUEST_DATA_VALUE_PROCESSOR_BEAN_NAME) - public CsrfRequestDataValueProcessor requestDataValueProcessor() { + CsrfRequestDataValueProcessor requestDataValueProcessor() { return new CsrfRequestDataValueProcessor(); } @Bean - public static BeanFactoryPostProcessor conversionServicePostProcessor() { + static BeanFactoryPostProcessor conversionServicePostProcessor() { return new RsaKeyConversionServicePostProcessor(); } diff --git a/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java index cfb767531c..c63a70eab9 100644 --- a/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java @@ -459,7 +459,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser { * cannot determine if it should be on or off). * @return */ - public boolean isEraseCredentialsAfterAuthentication() { + boolean isEraseCredentialsAfterAuthentication() { return false; } diff --git a/config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java index 40bad1103b..673e26fb8c 100644 --- a/config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/OAuth2LoginBeanDefinitionParser.java @@ -455,7 +455,7 @@ final class OAuth2LoginBeanDefinitionParser implements BeanDefinitionParser { } @SuppressWarnings({ "unchecked", "unused" }) - public Map getLoginLinks() { + Map getLoginLinks() { Iterable clientRegistrations = null; ClientRegistrationRepository clientRegistrationRepository = this.context .getBean(ClientRegistrationRepository.class); diff --git a/config/src/main/java/org/springframework/security/config/http/WebConfigUtils.java b/config/src/main/java/org/springframework/security/config/http/WebConfigUtils.java index 2f5932176a..64aa026c36 100644 --- a/config/src/main/java/org/springframework/security/config/http/WebConfigUtils.java +++ b/config/src/main/java/org/springframework/security/config/http/WebConfigUtils.java @@ -27,17 +27,18 @@ import org.springframework.util.StringUtils; * @author Luke Taylor * @author Ben Alex */ -abstract class WebConfigUtils { +final class WebConfigUtils { - public static int countNonEmpty(String[] objects) { + private WebConfigUtils() { + } + + static int countNonEmpty(String[] objects) { int nonNulls = 0; - for (String object : objects) { if (StringUtils.hasText(object)) { nonNulls++; } } - return nonNulls; } diff --git a/config/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java b/config/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java index 79bb46734d..b97dd909a1 100644 --- a/config/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/ldap/ContextSourceSettingPostProcessor.java @@ -35,7 +35,7 @@ import org.springframework.util.ClassUtils; * @author Luke Taylor * @since 3.0 */ -class ContextSourceSettingPostProcessor implements BeanFactoryPostProcessor, Ordered { +public class ContextSourceSettingPostProcessor implements BeanFactoryPostProcessor, Ordered { private static final String REQUIRED_CONTEXT_SOURCE_CLASS_NAME = "org.springframework.ldap.core.support.BaseLdapPathContextSource"; @@ -45,6 +45,9 @@ class ContextSourceSettingPostProcessor implements BeanFactoryPostProcessor, Ord */ private boolean defaultNameRequired; + ContextSourceSettingPostProcessor() { + } + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory bf) throws BeansException { Class contextSourceClass; diff --git a/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java index 6a459cdc19..62b0ed5286 100644 --- a/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java @@ -514,7 +514,7 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP private Jsr250MethodSecurityMetadataSource source = new Jsr250MethodSecurityMetadataSource(); - public Jsr250MethodSecurityMetadataSource getBean() { + Jsr250MethodSecurityMetadataSource getBean() { this.source.setDefaultRolePrefix(this.rolePrefix); return this.source; } @@ -525,7 +525,7 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP private DefaultMethodSecurityExpressionHandler handler = new DefaultMethodSecurityExpressionHandler(); - public DefaultMethodSecurityExpressionHandler getBean() { + DefaultMethodSecurityExpressionHandler getBean() { this.handler.setDefaultRolePrefix(this.rolePrefix); return this.handler; } diff --git a/config/src/main/java/org/springframework/security/config/web/server/AbstractServerWebExchangeMatcherRegistry.java b/config/src/main/java/org/springframework/security/config/web/server/AbstractServerWebExchangeMatcherRegistry.java index 0364626347..aa3382f1f0 100644 --- a/config/src/main/java/org/springframework/security/config/web/server/AbstractServerWebExchangeMatcherRegistry.java +++ b/config/src/main/java/org/springframework/security/config/web/server/AbstractServerWebExchangeMatcherRegistry.java @@ -28,7 +28,10 @@ import org.springframework.security.web.server.util.matcher.ServerWebExchangeMat * @author Rob Winch * @since 5.0 */ -abstract class AbstractServerWebExchangeMatcherRegistry { +public abstract class AbstractServerWebExchangeMatcherRegistry { + + AbstractServerWebExchangeMatcherRegistry() { + } /** * Maps any request. diff --git a/config/src/test/java/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java b/config/src/test/java/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java index dbf8250fc1..05c6425ff2 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java +++ b/config/src/test/java/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java @@ -32,7 +32,7 @@ class ConcereteSecurityConfigurerAdapter extends SecurityConfigurerAdapter l) { + ConcereteSecurityConfigurerAdapter list(List l) { this.list = l; return this; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/ObjectPostProcessorTests.java b/config/src/test/java/org/springframework/security/config/annotation/ObjectPostProcessorTests.java index 67c29ea4e9..5df8bf1433 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/ObjectPostProcessorTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/ObjectPostProcessorTests.java @@ -47,7 +47,7 @@ public class ObjectPostProcessorTests { static class PerformConversion { - public static List perform(ArrayList l) { + static List perform(ArrayList l) { return new ListToLinkedListObjectPostProcessor().postProcess(l); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterClosureTests.java b/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterClosureTests.java index 028d28f089..c1cf8715e9 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterClosureTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterClosureTests.java @@ -59,7 +59,7 @@ public class SecurityConfigurerAdapterClosureTests { this.list = postProcess(this.list); } - public ConcereteSecurityConfigurerAdapter list(List l) { + ConcereteSecurityConfigurerAdapter list(List l) { this.list = l; return this; } 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 ff15268852..fd6749db83 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 @@ -235,19 +235,19 @@ public class AuthenticationManagerBuilderTests { Resource users; @Bean - public AuthenticationManager authenticationManager() throws Exception { + AuthenticationManager authenticationManager() throws Exception { return new ProviderManager(Arrays.asList(authenticationProvider())); } @Bean - public AuthenticationProvider authenticationProvider() throws Exception { + AuthenticationProvider authenticationProvider() throws Exception { DaoAuthenticationProvider provider = new DaoAuthenticationProvider(); provider.setUserDetailsService(userDetailsService()); return provider; } @Bean - public UserDetailsService userDetailsService() throws Exception { + UserDetailsService userDetailsService() throws Exception { Properties properties = new Properties(); properties.load(this.users.getInputStream()); return new InMemoryUserDetailsManager(properties); 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 3ec92265b7..a4ca8c40b1 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 @@ -81,7 +81,7 @@ public class NamespaceAuthenticationManagerTests { static class EraseCredentialsTrueDefaultConfig extends WebSecurityConfigurerAdapter { @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() @@ -110,7 +110,7 @@ public class NamespaceAuthenticationManagerTests { static class GlobalEraseCredentialsFalseConfig extends WebSecurityConfigurerAdapter { @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .eraseCredentials(false) 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 aa3853f0f6..61d1e1e660 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 @@ -73,7 +73,7 @@ public class NamespaceAuthenticationProviderTests { } @Bean - public DaoAuthenticationProvider authenticationProvider() { + DaoAuthenticationProvider authenticationProvider() { DaoAuthenticationProvider result = new DaoAuthenticationProvider(); result.setUserDetailsService(new InMemoryUserDetailsManager(PasswordEncodedUser.user())); return result; 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 64c6c455e2..e8a4d77abe 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 @@ -87,7 +87,7 @@ public class NamespaceJdbcUserServiceTests { static class DataSourceConfig { @Bean - public DataSource dataSource() { + DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder(); return builder.setType(EmbeddedDatabaseType.HSQL).build(); } @@ -144,7 +144,7 @@ public class NamespaceJdbcUserServiceTests { static class CustomDataSourceConfig { @Bean - public DataSource dataSource() { + DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder() // simulate that the DB already has the schema loaded and users in it .addScript("CustomJdbcUserServiceSampleConfig.sql"); 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 a535a1874b..1068e37d13 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 @@ -104,7 +104,7 @@ public class NamespacePasswordEncoderTests { } @Bean - public DataSource dataSource() { + DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder(); return builder.setType(EmbeddedDatabaseType.HSQL).build(); } @@ -133,7 +133,7 @@ public class NamespacePasswordEncoderTests { } @Bean - public DataSource dataSource() { + DataSource dataSource() { EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder(); return builder.setType(EmbeddedDatabaseType.HSQL).build(); } 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 85c46ab747..086f7cbc00 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 @@ -74,7 +74,7 @@ public class PasswordEncoderConfigurerTests { } @Bean - public BCryptPasswordEncoder passwordEncoder() { + BCryptPasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } @@ -95,7 +95,7 @@ public class PasswordEncoderConfigurerTests { } @Bean - public BCryptPasswordEncoder passwordEncoder() { + BCryptPasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } 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 a9e3c0ae0e..e02f237cd8 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 @@ -356,7 +356,7 @@ public class AuthenticationConfigurationTests { AuthenticationManager authenticationManager = mock(AuthenticationManager.class); @Bean - public AuthenticationManager authenticationManager() { + AuthenticationManager authenticationManager() { return this.authenticationManager; } @@ -366,7 +366,7 @@ public class AuthenticationConfigurationTests { static class ServicesConfig { @Bean - public Service service() { + Service service() { return new ServiceImpl(); } @@ -466,12 +466,12 @@ public class AuthenticationConfigurationTests { static class Sec2531Config { @Bean - public ObjectPostProcessor objectPostProcessor() { + ObjectPostProcessor objectPostProcessor() { return mock(ObjectPostProcessor.class); } @Bean - public AuthenticationManager manager() { + AuthenticationManager manager() { return null; } @@ -488,7 +488,7 @@ public class AuthenticationConfigurationTests { static class Sec2822WebSecurity extends WebSecurityConfigurerAdapter { @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { auth.inMemoryAuthentication(); } @@ -498,14 +498,14 @@ public class AuthenticationConfigurationTests { static class Sec2822UseAuth { @Autowired - public void useAuthenticationManager(AuthenticationConfiguration auth) throws Exception { + void useAuthenticationManager(AuthenticationConfiguration auth) throws Exception { auth.getAuthenticationManager(); } // Ensures that Sec2822UseAuth is initialized before Sec2822WebSecurity // must have additional GlobalAuthenticationConfigurerAdapter to trigger SEC-2822 @Bean - public static GlobalAuthenticationConfigurerAdapter bootGlobalAuthenticationConfigurerAdapter() { + static GlobalAuthenticationConfigurerAdapter bootGlobalAuthenticationConfigurerAdapter() { return new BootGlobalAuthenticationConfigurerAdapter(); } @@ -621,12 +621,12 @@ public class AuthenticationConfigurationTests { @Bean @Primary - public AuthenticationManager manager1() { + AuthenticationManager manager1() { return mock(AuthenticationManager.class); } @Bean - public AuthenticationManager manager2() { + AuthenticationManager manager2() { return mock(AuthenticationManager.class); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthenticationTests.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthenticationTests.java index e69d1f88c8..4f6d9e735f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthenticationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/configuration/EnableGlobalAuthenticationTests.java @@ -71,7 +71,7 @@ public class EnableGlobalAuthenticationTests { static class Config { @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { auth.inMemoryAuthentication().withUser("user").password("password").roles("USER"); } @@ -81,12 +81,12 @@ public class EnableGlobalAuthenticationTests { static class BeanProxyEnabledByDefaultConfig { @Bean - public Child child() { + Child child() { return new Child(); } @Bean - public Parent parent() { + Parent parent() { return new Parent(child()); } @@ -97,12 +97,12 @@ public class EnableGlobalAuthenticationTests { static class BeanProxyDisabledConfig { @Bean - public Child child() { + Child child() { return new Child(); } @Bean - public Parent parent() { + Parent parent() { return new Parent(child()); } @@ -116,7 +116,7 @@ public class EnableGlobalAuthenticationTests { this.child = child; } - public Child getChild() { + Child getChild() { return this.child; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessorTests.java b/config/src/test/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessorTests.java index 7820acb3e1..78d24959c0 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessorTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessorTests.java @@ -150,7 +150,7 @@ public class AutowireBeanFactoryObjectPostProcessorTests { static class Config { @Bean - public ObjectPostProcessor objectPostProcessor(AutowireCapableBeanFactory beanFactory) { + ObjectPostProcessor objectPostProcessor(AutowireCapableBeanFactory beanFactory) { return new AutowireBeanFactoryObjectPostProcessor(beanFactory); } @@ -162,7 +162,7 @@ public class AutowireBeanFactoryObjectPostProcessorTests { SmartInitializingSingleton toTest = mock(SmartInitializingSingleton.class); @Autowired - public void configure(ObjectPostProcessor p) { + void configure(ObjectPostProcessor p) { p.postProcess(this.toTest); } @@ -172,12 +172,12 @@ public class AutowireBeanFactoryObjectPostProcessorTests { static class WithBeanNameAutoProxyCreatorConfig { @Bean - public ObjectPostProcessor objectPostProcessor(AutowireCapableBeanFactory beanFactory) { + ObjectPostProcessor objectPostProcessor(AutowireCapableBeanFactory beanFactory) { return new AutowireBeanFactoryObjectPostProcessor(beanFactory); } @Autowired - public void configure(ObjectPostProcessor p) { + void configure(ObjectPostProcessor p) { p.postProcess(new Object()); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java index 3b5b47c9fb..751199fb55 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/EnableReactiveMethodSecurityTests.java @@ -470,12 +470,12 @@ public class EnableReactiveMethodSecurityTests { ReactiveMessageService delegate = mock(ReactiveMessageService.class); @Bean - public DelegatingReactiveMessageService defaultMessageService() { + DelegatingReactiveMessageService defaultMessageService() { return new DelegatingReactiveMessageService(this.delegate); } @Bean - public Authz authz() { + Authz authz() { return new Authz(); } 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 cadb3c8982..d5a8b8ef35 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 @@ -340,12 +340,12 @@ public class GlobalMethodSecurityConfigurationTests { static class CustomTrustResolverConfig { @Bean - public AuthenticationTrustResolver trustResolver() { + AuthenticationTrustResolver trustResolver() { return mock(AuthenticationTrustResolver.class); } @Bean - public MethodSecurityServiceImpl service() { + MethodSecurityServiceImpl service() { return new MethodSecurityServiceImpl(); } @@ -355,12 +355,12 @@ public class GlobalMethodSecurityConfigurationTests { static class ExpressionHandlerHasBeanResolverSetConfig { @Bean - public MethodSecurityServiceImpl service() { + MethodSecurityServiceImpl service() { return new MethodSecurityServiceImpl(); } @Bean - public Authz authz() { + Authz authz() { return new Authz(); } @@ -370,7 +370,7 @@ public class GlobalMethodSecurityConfigurationTests { static class MethodSecurityServiceConfig { @Bean - public MethodSecurityService service() { + MethodSecurityService service() { return new MethodSecurityServiceImpl(); } @@ -380,12 +380,12 @@ public class GlobalMethodSecurityConfigurationTests { public static class AutowirePermissionEvaluatorConfig { @Bean - public PermissionEvaluator permissionEvaluator() { + PermissionEvaluator permissionEvaluator() { return mock(PermissionEvaluator.class); } @Bean - public MethodSecurityService service() { + MethodSecurityService service() { return new MethodSecurityServiceImpl(); } @@ -395,12 +395,12 @@ public class GlobalMethodSecurityConfigurationTests { public static class MultiPermissionEvaluatorConfig { @Bean - public PermissionEvaluator permissionEvaluator() { + PermissionEvaluator permissionEvaluator() { return mock(PermissionEvaluator.class); } @Bean - public PermissionEvaluator permissionEvaluator2() { + PermissionEvaluator permissionEvaluator2() { return mock(PermissionEvaluator.class); } @@ -415,7 +415,7 @@ public class GlobalMethodSecurityConfigurationTests { static class ParentConfig { @Bean - public MethodSecurityService service() { + MethodSecurityService service() { return new MethodSecurityServiceImpl(); } @@ -425,7 +425,7 @@ public class GlobalMethodSecurityConfigurationTests { static class Sec2479ParentConfig { @Bean - public AuthenticationManager am() { + AuthenticationManager am() { return mock(AuthenticationManager.class); } @@ -435,7 +435,7 @@ public class GlobalMethodSecurityConfigurationTests { static class Sec2479ChildConfig { @Bean - public MethodSecurityService service() { + MethodSecurityService service() { return new MethodSecurityServiceImpl(); } @@ -445,17 +445,17 @@ public class GlobalMethodSecurityConfigurationTests { static class Sec2815Config { @Bean - public MethodSecurityService service() { + MethodSecurityService service() { return new MethodSecurityServiceImpl(); } @Bean - public MockBeanPostProcessor mockBeanPostProcessor() { + MockBeanPostProcessor mockBeanPostProcessor() { return new MockBeanPostProcessor(); } @Bean - public DataSource dataSource() { + DataSource dataSource() { return mock(DataSource.class); } @@ -499,12 +499,12 @@ public class GlobalMethodSecurityConfigurationTests { static class Sec3005Config { @Bean - public MethodSecurityService service() { + MethodSecurityService service() { return new MethodSecurityServiceImpl(); } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { auth.inMemoryAuthentication(); } @@ -548,24 +548,24 @@ public class GlobalMethodSecurityConfigurationTests { static class CustomGrantedAuthorityConfig { @Bean - public GrantedAuthorityDefaults ga() { + GrantedAuthorityDefaults ga() { return new GrantedAuthorityDefaults("ROLE:"); } @Bean - public CustomAuthorityService service() { + CustomAuthorityService service() { return new CustomAuthorityService(); } @Bean - public MethodSecurityServiceImpl methodSecurityService() { + MethodSecurityServiceImpl methodSecurityService() { return new MethodSecurityServiceImpl(); } static class CustomAuthorityService { @PreAuthorize("hasRole('ROLE:USER')") - public void customPrefixRoleUser() { + void customPrefixRoleUser() { } } @@ -576,24 +576,24 @@ public class GlobalMethodSecurityConfigurationTests { static class EmptyRolePrefixGrantedAuthorityConfig { @Bean - public GrantedAuthorityDefaults ga() { + GrantedAuthorityDefaults ga() { return new GrantedAuthorityDefaults(""); } @Bean - public CustomAuthorityService service() { + CustomAuthorityService service() { return new CustomAuthorityService(); } @Bean - public MethodSecurityServiceImpl methodSecurityService() { + MethodSecurityServiceImpl methodSecurityService() { return new MethodSecurityServiceImpl(); } static class CustomAuthorityService { @Secured("USER") - public void emptyPrefixRoleUser() { + void emptyPrefixRoleUser() { } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/ReactiveMethodSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/ReactiveMethodSecurityConfigurationTests.java index 13f45b1ca8..961e0e3bf1 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/ReactiveMethodSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/ReactiveMethodSecurityConfigurationTests.java @@ -109,7 +109,7 @@ public class ReactiveMethodSecurityConfigurationTests { } - private static class Foo { + static class Foo { public void bar(String param) { } 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 9698da38b8..91ad7a5c96 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 @@ -81,7 +81,7 @@ public class SampleEnableGlobalMethodSecurityTests { static class SampleWebSecurityConfig { @Bean - public MethodSecurityService methodSecurityService() { + MethodSecurityService methodSecurityService() { return new MethodSecurityServiceImpl(); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/sec2758/Sec2758Tests.java b/config/src/test/java/org/springframework/security/config/annotation/sec2758/Sec2758Tests.java index 5b9df02190..80472bb588 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/sec2758/Sec2758Tests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/sec2758/Sec2758Tests.java @@ -99,7 +99,7 @@ public class Sec2758Tests { } @Bean - public Service service() { + Service service() { return new Service(); } @@ -112,7 +112,7 @@ public class Sec2758Tests { static class RootController { @GetMapping("/") - public String ok() { + String ok() { return "ok"; } @@ -123,11 +123,11 @@ public class Sec2758Tests { static class Service { @PreAuthorize("hasRole('CUSTOM')") - public void doPreAuthorize() { + void doPreAuthorize() { } @RolesAllowed("CUSTOM") - public void doJsr250() { + void doJsr250() { } } 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 53dfedfc5d..8c0d1914f5 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 @@ -284,7 +284,7 @@ public class WebSecurityConfigurerAdapterTests { static class InMemoryConfigureGlobalConfig extends WebSecurityConfigurerAdapter { @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() @@ -308,7 +308,7 @@ public class WebSecurityConfigurerAdapterTests { private ContentNegotiationStrategy contentNegotiationStrategySharedObject; @Bean - public ContentNegotiationStrategy contentNegotiationStrategy() { + ContentNegotiationStrategy contentNegotiationStrategy() { return CONTENT_NEGOTIATION_STRATEGY_BEAN; } @@ -337,7 +337,7 @@ public class WebSecurityConfigurerAdapterTests { static class RequiresUserDetailsServiceConfig { @Bean - public MyFilter myFilter(UserDetailsService userDetailsService) { + MyFilter myFilter(UserDetailsService userDetailsService) { return new MyFilter(userDetailsService); } @@ -408,7 +408,7 @@ public class WebSecurityConfigurerAdapterTests { private AuthenticationTrustResolver authenticationTrustResolverSharedObject; @Bean - public AuthenticationTrustResolver authenticationTrustResolver() { + AuthenticationTrustResolver authenticationTrustResolver() { return AUTHENTICATION_TRUST_RESOLVER_BEAN; } @@ -439,7 +439,7 @@ public class WebSecurityConfigurerAdapterTests { } @Bean - public AuthenticationEventPublisher authenticationEventPublisher() { + AuthenticationEventPublisher authenticationEventPublisher() { return mock(AuthenticationEventPublisher.class); } 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 8d4f8ae302..3ae4b97201 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 @@ -613,7 +613,7 @@ public class NamespaceHttpTests { static Class HTTP_SERVLET_REQUEST_TYPE; @GetMapping("/") - public String index(HttpServletRequest request) { + String index(HttpServletRequest request) { HTTP_SERVLET_REQUEST_TYPE = request.getClass(); return "index"; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/builders/WebSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/builders/WebSecurityTests.java index 223dabf3b2..25b5785f18 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/builders/WebSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/builders/WebSecurityTests.java @@ -183,7 +183,7 @@ public class WebSecurityTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @@ -228,7 +228,7 @@ public class WebSecurityTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } 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 275d829068..15594e6498 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 @@ -192,12 +192,12 @@ public class EnableWebSecurityTests { static class BeanProxyEnabledByDefaultConfig extends WebSecurityConfigurerAdapter { @Bean - public Child child() { + Child child() { return new Child(); } @Bean - public Parent parent() { + Parent parent() { return new Parent(child()); } @@ -208,12 +208,12 @@ public class EnableWebSecurityTests { static class BeanProxyDisabledConfig extends WebSecurityConfigurerAdapter { @Bean - public Child child() { + Child child() { return new Child(); } @Bean - public Parent parent() { + Parent parent() { return new Parent(child()); } @@ -227,7 +227,7 @@ public class EnableWebSecurityTests { this.child = child; } - public Child getChild() { + Child getChild() { return this.child; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java index 83bb042a5b..732eebe133 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/HttpSecurityConfigurationTests.java @@ -168,7 +168,7 @@ public class HttpSecurityConfigurationTests { static class NameController { @GetMapping("/name") - public Callable name() { + Callable name() { return () -> SecurityContextHolder.getContext().getAuthentication().getName(); } @@ -178,7 +178,7 @@ public class HttpSecurityConfigurationTests { static class DefaultWithFilterChainConfig { @Bean - public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + SecurityFilterChain filterChain(HttpSecurity http) throws Exception { return http.build(); } @@ -188,7 +188,7 @@ public class HttpSecurityConfigurationTests { static class AuthorizeRequestsConfig { @Bean - public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + SecurityFilterChain filterChain(HttpSecurity http) throws Exception { return http.authorizeRequests((authorize) -> authorize.anyRequest().permitAll()).build(); } @@ -198,7 +198,7 @@ public class HttpSecurityConfigurationTests { static class SecurityEnabledConfig { @Bean - public SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + SecurityFilterChain filterChain(HttpSecurity http) throws Exception { return http.authorizeRequests((authorize) -> authorize.anyRequest().authenticated()) .formLogin(withDefaults()).build(); } @@ -209,7 +209,7 @@ public class HttpSecurityConfigurationTests { static class UserDetailsConfig { @Bean - public UserDetailsService userDetailsService() { + UserDetailsService userDetailsService() { UserDetails user = User.withDefaultPasswordEncoder().username("user").password("password").roles("USER") .build(); return new InMemoryUserDetailsManager(user); @@ -221,7 +221,7 @@ public class HttpSecurityConfigurationTests { static class BaseController { @GetMapping("/") - public void index() { + void index() { } } @@ -230,7 +230,7 @@ public class HttpSecurityConfigurationTests { static class UserController { @GetMapping("/user") - public void user(HttpServletRequest request) { + void user(HttpServletRequest request) { if (!request.isUserInRole("USER")) { throw new AccessDeniedException("This resource is only available to users"); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfigurationTests.java index 77b1f0f460..1b6955367d 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/OAuth2ClientConfigurationTests.java @@ -217,25 +217,25 @@ public class OAuth2ClientConfigurationTests { } @Bean - public ClientRegistrationRepository clientRegistrationRepository() { + ClientRegistrationRepository clientRegistrationRepository() { return CLIENT_REGISTRATION_REPOSITORY; } @Bean - public OAuth2AuthorizedClientRepository authorizedClientRepository() { + OAuth2AuthorizedClientRepository authorizedClientRepository() { return AUTHORIZED_CLIENT_REPOSITORY; } @Bean - public OAuth2AccessTokenResponseClient accessTokenResponseClient() { + OAuth2AccessTokenResponseClient accessTokenResponseClient() { return ACCESS_TOKEN_RESPONSE_CLIENT; } @RestController - public class Controller { + class Controller { @GetMapping("/authorized-client") - public String authorizedClient( + String authorizedClient( @RegisteredOAuth2AuthorizedClient("client1") OAuth2AuthorizedClient authorizedClient) { return authorizedClient != null ? "resolved" : "not-resolved"; } @@ -260,22 +260,22 @@ public class OAuth2ClientConfigurationTests { } @Bean - public ClientRegistrationRepository clientRegistrationRepository() { + ClientRegistrationRepository clientRegistrationRepository() { return mock(ClientRegistrationRepository.class); } @Bean - public OAuth2AuthorizedClientRepository authorizedClientRepository1() { + OAuth2AuthorizedClientRepository authorizedClientRepository1() { return mock(OAuth2AuthorizedClientRepository.class); } @Bean - public OAuth2AuthorizedClientRepository authorizedClientRepository2() { + OAuth2AuthorizedClientRepository authorizedClientRepository2() { return mock(OAuth2AuthorizedClientRepository.class); } @Bean - public OAuth2AccessTokenResponseClient accessTokenResponseClient() { + OAuth2AccessTokenResponseClient accessTokenResponseClient() { return mock(OAuth2AccessTokenResponseClient.class); } @@ -314,22 +314,22 @@ public class OAuth2ClientConfigurationTests { } @Bean - public ClientRegistrationRepository clientRegistrationRepository1() { + ClientRegistrationRepository clientRegistrationRepository1() { return mock(ClientRegistrationRepository.class); } @Bean - public ClientRegistrationRepository clientRegistrationRepository2() { + ClientRegistrationRepository clientRegistrationRepository2() { return mock(ClientRegistrationRepository.class); } @Bean - public OAuth2AuthorizedClientRepository authorizedClientRepository() { + OAuth2AuthorizedClientRepository authorizedClientRepository() { return mock(OAuth2AuthorizedClientRepository.class); } @Bean - public OAuth2AccessTokenResponseClient accessTokenResponseClient() { + OAuth2AccessTokenResponseClient accessTokenResponseClient() { return mock(OAuth2AccessTokenResponseClient.class); } @@ -351,22 +351,22 @@ public class OAuth2ClientConfigurationTests { } @Bean - public ClientRegistrationRepository clientRegistrationRepository() { + ClientRegistrationRepository clientRegistrationRepository() { return mock(ClientRegistrationRepository.class); } @Bean - public OAuth2AuthorizedClientRepository authorizedClientRepository() { + OAuth2AuthorizedClientRepository authorizedClientRepository() { return mock(OAuth2AuthorizedClientRepository.class); } @Bean - public OAuth2AccessTokenResponseClient accessTokenResponseClient1() { + OAuth2AccessTokenResponseClient accessTokenResponseClient1() { return mock(OAuth2AccessTokenResponseClient.class); } @Bean - public OAuth2AccessTokenResponseClient accessTokenResponseClient2() { + OAuth2AccessTokenResponseClient accessTokenResponseClient2() { return mock(OAuth2AccessTokenResponseClient.class); } @@ -385,25 +385,25 @@ public class OAuth2ClientConfigurationTests { } @Bean - public ClientRegistrationRepository clientRegistrationRepository() { + ClientRegistrationRepository clientRegistrationRepository() { return CLIENT_REGISTRATION_REPOSITORY; } @Bean - public OAuth2AuthorizedClientRepository authorizedClientRepository() { + OAuth2AuthorizedClientRepository authorizedClientRepository() { return AUTHORIZED_CLIENT_REPOSITORY; } @Bean - public OAuth2AuthorizedClientManager authorizedClientManager() { + OAuth2AuthorizedClientManager authorizedClientManager() { return AUTHORIZED_CLIENT_MANAGER; } @RestController - public class Controller { + class Controller { @GetMapping("/authorized-client") - public String authorizedClient( + String authorizedClient( @RegisteredOAuth2AuthorizedClient("client1") OAuth2AuthorizedClient authorizedClient) { return authorizedClient != null ? "resolved" : "not-resolved"; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfigurationResourceServerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfigurationResourceServerTests.java index 1dbe5abdce..a870dbc6e9 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfigurationResourceServerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/SecurityReactorContextConfigurationResourceServerTests.java @@ -121,7 +121,7 @@ public class SecurityReactorContextConfigurationResourceServerTests { } @GetMapping("/token") - public String token() { + String token() { return this.rest.get().uri(this.uri).retrieve().bodyToMono(String.class) .flatMap((result) -> this.rest.get().uri(this.uri).retrieve().bodyToMono(String.class)).block(); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfigurationTests.java index 9ae507255d..d3e2f8cce2 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebMvcSecurityConfigurationTests.java @@ -106,18 +106,18 @@ public class WebMvcSecurityConfigurationTests { static class TestController { @RequestMapping("/authentication-principal") - public ModelAndView authenticationPrincipal(@AuthenticationPrincipal String principal) { + ModelAndView authenticationPrincipal(@AuthenticationPrincipal String principal) { return new ModelAndView("authentication-principal-view", "result", principal); } @RequestMapping("/deprecated-authentication-principal") - public ModelAndView deprecatedAuthenticationPrincipal( + ModelAndView deprecatedAuthenticationPrincipal( @org.springframework.security.web.bind.annotation.AuthenticationPrincipal String principal) { return new ModelAndView("deprecated-authentication-principal-view", "result", principal); } @RequestMapping("/csrf") - public ModelAndView csrf(CsrfToken token) { + ModelAndView csrf(CsrfToken token) { return new ModelAndView("view", "result", token); } @@ -129,7 +129,7 @@ public class WebMvcSecurityConfigurationTests { static class Config { @Bean - public TestController testController() { + TestController testController() { return new TestController(); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.java index 384db38440..534425c175 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurationTests.java @@ -516,7 +516,7 @@ public class WebSecurityConfigurationTests { }; @Bean - public PermissionEvaluator permissionEvaluator() { + PermissionEvaluator permissionEvaluator() { return PERMIT_ALL_PERMISSION_EVALUATOR; } @@ -564,10 +564,10 @@ public class WebSecurityConfigurationTests { } @RestController - public class HomeController { + class HomeController { @GetMapping("/") - public String home() { + String home() { return "home"; } @@ -591,7 +591,7 @@ public class WebSecurityConfigurationTests { static class ParentConfig extends WebSecurityConfigurerAdapter { @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { auth.inMemoryAuthentication(); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java index 1ff7e6d757..935e4c62d4 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/AuthorizeRequestsTests.java @@ -480,7 +480,7 @@ public class AuthorizeRequestsTests { } @Bean - public RoleHierarchy roleHiearchy() { + RoleHierarchy roleHiearchy() { RoleHierarchyImpl result = new RoleHierarchyImpl(); result.setHierarchy("ROLE_USER > ROLE_ADMIN"); return result; @@ -515,7 +515,7 @@ public class AuthorizeRequestsTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @@ -552,7 +552,7 @@ public class AuthorizeRequestsTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @@ -587,7 +587,7 @@ public class AuthorizeRequestsTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @@ -624,7 +624,7 @@ public class AuthorizeRequestsTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @@ -659,7 +659,7 @@ public class AuthorizeRequestsTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @@ -696,7 +696,7 @@ public class AuthorizeRequestsTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @@ -731,7 +731,7 @@ public class AuthorizeRequestsTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java index cf627bb33e..387ec6a009 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerNoWebMvcTests.java @@ -90,7 +90,7 @@ public class CsrfConfigurerNoWebMvcTests { @Bean @Primary - public RequestDataValueProcessor requestDataValueProcessor() { + RequestDataValueProcessor requestDataValueProcessor() { return mock(RequestDataValueProcessor.class); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerTests.java index 1c147877e2..2162872879 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurerTests.java @@ -738,11 +738,11 @@ public class CsrfConfigurerTests { static class BasicController { @GetMapping("/") - public void rootGet() { + void rootGet() { } @PostMapping("/") - public void rootPost() { + void rootPost() { } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java index 558a0cb400..ef9220d001 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/DefaultFiltersTests.java @@ -139,7 +139,7 @@ public class DefaultFiltersTests { static class FilterChainProxyBuilderMissingConfig { @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() @@ -153,7 +153,7 @@ public class DefaultFiltersTests { static class UserDetailsServiceConfig { @Bean - public UserDetailsService userDetailsService() { + UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager(PasswordEncodedUser.user(), PasswordEncodedUser.admin()); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerTests.java index 3e3b532066..bc22565be6 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurerTests.java @@ -267,7 +267,7 @@ public class ExceptionHandlingConfigurerTests { static class DefaultSecurityConfig { @Bean - public InMemoryUserDetailsManager userDetailsManager() { + InMemoryUserDetailsManager userDetailsManager() { // @formatter:off return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() .username("user") @@ -310,7 +310,7 @@ public class ExceptionHandlingConfigurerTests { static ContentNegotiationStrategy CNS = mock(ContentNegotiationStrategy.class); @Bean - public static ContentNegotiationStrategy cns() { + static ContentNegotiationStrategy cns() { return CNS; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerTests.java index b2cbe23e82..d4fb8ebf88 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerTests.java @@ -805,7 +805,7 @@ public class ExpressionUrlAuthorizationConfigurerTests { } @Bean - public ApplicationListener applicationListener() { + ApplicationListener applicationListener() { return AL; } @@ -827,7 +827,7 @@ public class ExpressionUrlAuthorizationConfigurerTests { } @Bean - public Checker permission() { + Checker permission() { return new Checker(); } @@ -858,7 +858,7 @@ public class ExpressionUrlAuthorizationConfigurerTests { } @Bean - public CustomExpressionHandler expressionHandler() { + CustomExpressionHandler expressionHandler() { return new CustomExpressionHandler(); } @@ -937,8 +937,9 @@ public class ExpressionUrlAuthorizationConfigurerTests { } @Bean - public PermissionEvaluator permissionEvaluator() { + PermissionEvaluator permissionEvaluator() { return new PermissionEvaluator() { + @Override public boolean hasPermission(Authentication authentication, Object targetDomainObject, Object permission) { @@ -950,6 +951,7 @@ public class ExpressionUrlAuthorizationConfigurerTests { Object permission) { return "ID".equals(targetId) && "TYPE".equals(targetType) && "PERMISSION".equals(permission); } + }; } @@ -970,7 +972,7 @@ public class ExpressionUrlAuthorizationConfigurerTests { } @Bean - public RoleHierarchy roleHierarchy() { + RoleHierarchy roleHierarchy() { RoleHierarchyImpl roleHierarchy = new RoleHierarchyImpl(); roleHierarchy.setHierarchy("ROLE_USER > ROLE_MEMBER"); return roleHierarchy; @@ -982,11 +984,11 @@ public class ExpressionUrlAuthorizationConfigurerTests { static class BasicController { @GetMapping("/") - public void rootGet() { + void rootGet() { } @PostMapping("/") - public void rootPost() { + void rootPost() { } } @@ -995,7 +997,7 @@ public class ExpressionUrlAuthorizationConfigurerTests { static class WildcardController { @GetMapping("/{path}") - public void wildcard(@PathVariable String path) { + void wildcard(@PathVariable String path) { } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java index 8ec6163509..652e5852aa 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/HttpSecurityRequestMatchersTests.java @@ -247,7 +247,7 @@ public class HttpSecurityRequestMatchersTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @@ -285,7 +285,7 @@ public class HttpSecurityRequestMatchersTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @@ -318,7 +318,7 @@ public class HttpSecurityRequestMatchersTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @@ -357,7 +357,7 @@ public class HttpSecurityRequestMatchersTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @@ -391,7 +391,7 @@ public class HttpSecurityRequestMatchersTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java index 8eed33342d..1d66dfce56 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpBasicTests.java @@ -162,7 +162,7 @@ public class NamespaceHttpBasicTests { static class UserConfig { @Bean - public UserDetailsService userDetailsService() { + UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( // @formatter:off User.withDefaultPasswordEncoder() diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpCustomFilterTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpCustomFilterTests.java index 4e8ab99a6d..817792742f 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpCustomFilterTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpCustomFilterTests.java @@ -192,15 +192,9 @@ public class NamespaceHttpCustomFilterTests { static class UserDetailsServiceConfig { @Bean - public UserDetailsService userDetailsService() { + UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( - // @formatter:off - User.withDefaultPasswordEncoder() - .username("user") - .password("password") - .roles("USER") - .build()); - // @formatter:on + User.withDefaultPasswordEncoder().username("user").password("password").roles("USER").build()); } } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpFormLoginTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpFormLoginTests.java index 565d67e9e9..b080cf6754 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpFormLoginTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpFormLoginTests.java @@ -178,7 +178,7 @@ public class NamespaceHttpFormLoginTests { static class UserDetailsServiceConfig { @Bean - public UserDetailsService userDetailsService() { + UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( // @formatter:off User.withDefaultPasswordEncoder() 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 2de270cea9..e88dd304e4 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 @@ -152,27 +152,27 @@ public class NamespaceHttpInterceptUrlTests { static class BaseController { @GetMapping("/users") - public String users() { + String users() { return "ok"; } @GetMapping("/sessions") - public String sessions() { + String sessions() { return "sessions"; } @RequestMapping("/admin/post") - public String adminPost() { + String adminPost() { return "adminPost"; } @GetMapping("/admin/another-post") - public String adminAnotherPost() { + String adminAnotherPost() { return "adminAnotherPost"; } @GetMapping("/signup") - public String signup() { + String signup() { return "signup"; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpJeeTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpJeeTests.java index 47cd62b4c3..96a9287fe8 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpJeeTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpJeeTests.java @@ -147,12 +147,12 @@ public class NamespaceHttpJeeTests { static class BaseController { @GetMapping("/authenticated") - public String authenticated(Authentication authentication) { + String authenticated(Authentication authentication) { return authentication.getName(); } @GetMapping("/roles") - public String roles(Authentication authentication) { + String roles(Authentication authentication) { return authentication.getAuthorities().stream().map(Object::toString).collect(Collectors.joining(",")); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.java index 8200697010..373c29186a 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpOpenIDLoginTests.java @@ -293,15 +293,9 @@ public class NamespaceHttpOpenIDLoginTests { static class UserDetailsServiceConfig { @Bean - public UserDetailsService userDetailsService() { + UserDetailsService userDetailsService() { return new InMemoryUserDetailsManager( - // @formatter:off - User.withDefaultPasswordEncoder() - .username("user") - .password("password") - .roles("USER") - .build()); - // @formatter:on + User.withDefaultPasswordEncoder().username("user").password("password").roles("USER").build()); } } 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 7f24ed7f73..a67380193c 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 @@ -106,7 +106,7 @@ public class NamespaceHttpRequestCacheTests { } @Bean - public RequestCache requestCache() { + RequestCache requestCache() { return mock(RequestCache.class); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.java index 8fccfcd006..6f08c7290a 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceSessionManagementTests.java @@ -371,7 +371,7 @@ public class NamespaceSessionManagementTests { } @Bean - public MockEventListener eventListener() { + MockEventListener eventListener() { return spy(new MockEventListener()); } @@ -425,12 +425,12 @@ public class NamespaceSessionManagementTests { static class BasicController { @GetMapping("/") - public String ok() { + String ok() { return "ok"; } @GetMapping("/auth") - public String auth(Principal principal) { + String auth(Principal principal) { return principal.getName(); } @@ -444,17 +444,17 @@ public class NamespaceSessionManagementTests { private Boolean exists = true; - public ResultMatcher exists(boolean exists) { + ResultMatcher exists(boolean exists) { this.exists = exists; return this; } - public ResultMatcher valid(boolean valid) { + ResultMatcher valid(boolean valid) { this.valid = valid; return this.exists(true); } - public ResultMatcher id(String id) { + ResultMatcher id(String id) { this.id = id; return this.exists(true); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java index 8c10fa0d5a..8ec6c1b5a7 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RememberMeConfigurerTests.java @@ -317,7 +317,7 @@ public class RememberMeConfigurerTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() @@ -344,7 +344,7 @@ public class RememberMeConfigurerTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() @@ -372,7 +372,7 @@ public class RememberMeConfigurerTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() @@ -402,7 +402,7 @@ public class RememberMeConfigurerTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() @@ -434,7 +434,7 @@ public class RememberMeConfigurerTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java index a385089f9a..d769b5869d 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurerTests.java @@ -387,7 +387,7 @@ public class RequestCacheConfigurerTests { static class DefaultSecurityConfig { @Bean - public InMemoryUserDetailsManager userDetailsManager() { + InMemoryUserDetailsManager userDetailsManager() { // @formatter:off return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() .username("user") diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.java index 05236e3742..274b156c11 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/ServletApiConfigurerTests.java @@ -256,7 +256,7 @@ public class ServletApiConfigurerTests { } @Bean - public AuthenticationManager customAuthenticationManager() throws Exception { + AuthenticationManager customAuthenticationManager() throws Exception { return super.authenticationManagerBean(); } @@ -356,7 +356,7 @@ public class ServletApiConfigurerTests { static class AdminController { @GetMapping("/admin") - public void admin(HttpServletRequest request) { + void admin(HttpServletRequest request) { if (!request.isUserInRole("ADMIN")) { throw new AccessDeniedException("This resource is only available to admins"); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerSessionCreationPolicyTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerSessionCreationPolicyTests.java index ff7d81bae3..11f60b1e9e 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerSessionCreationPolicyTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerSessionCreationPolicyTests.java @@ -111,7 +111,7 @@ public class SessionManagementConfigurerSessionCreationPolicyTests { static class BasicController { @GetMapping("/") - public String root() { + String root() { return "ok"; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.java index 36c2b9aeba..095c01d59c 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurerTests.java @@ -515,7 +515,7 @@ public class SessionManagementConfigurerTests { } @Bean - public SessionRegistry sessionRegistry() { + SessionRegistry sessionRegistry() { return SESSION_REGISTRY; } @@ -538,12 +538,12 @@ public class SessionManagementConfigurerTests { } @Bean - public SessionRegistry sessionRegistryOne() { + SessionRegistry sessionRegistryOne() { return SESSION_REGISTRY_ONE; } @Bean - public SessionRegistry sessionRegistryTwo() { + SessionRegistry sessionRegistryTwo() { return SESSION_REGISTRY_TWO; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurerTests.java index f7b7b77681..b9b61ad579 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurerTests.java @@ -183,7 +183,7 @@ public class UrlAuthorizationConfigurerTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @@ -218,7 +218,7 @@ public class UrlAuthorizationConfigurerTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerTests.java index 2fd0b699a8..7e96a853e8 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/OAuth2ClientConfigurerTests.java @@ -265,20 +265,20 @@ public class OAuth2ClientConfigurerTests { } @Bean - public ClientRegistrationRepository clientRegistrationRepository() { + ClientRegistrationRepository clientRegistrationRepository() { return clientRegistrationRepository; } @Bean - public OAuth2AuthorizedClientRepository authorizedClientRepository() { + OAuth2AuthorizedClientRepository authorizedClientRepository() { return authorizedClientRepository; } @RestController - public class ResourceController { + class ResourceController { @GetMapping("/resource1") - public String resource1( + String resource1( @RegisteredOAuth2AuthorizedClient("registration-1") OAuth2AuthorizedClient authorizedClient) { return "resource1"; } @@ -304,12 +304,12 @@ public class OAuth2ClientConfigurerTests { } @Bean - public ClientRegistrationRepository clientRegistrationRepository() { + ClientRegistrationRepository clientRegistrationRepository() { return clientRegistrationRepository; } @Bean - public OAuth2AuthorizedClientRepository authorizedClientRepository() { + OAuth2AuthorizedClientRepository authorizedClientRepository() { return authorizedClientRepository; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java index 82fbe70deb..407342ba0e 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java @@ -1907,7 +1907,7 @@ public class OAuth2ResourceServerConfigurerTests { } @Bean - public JwtDecoder decoder() { + JwtDecoder decoder() { return mock(JwtDecoder.class); } @@ -1930,7 +1930,7 @@ public class OAuth2ResourceServerConfigurerTests { } @Bean - public AuthenticationProvider authenticationProvider() { + AuthenticationProvider authenticationProvider() { return mock(AuthenticationProvider.class); } @@ -1955,7 +1955,7 @@ public class OAuth2ResourceServerConfigurerTests { // @formatter:on } - public OAuth2TokenValidator getJwtValidator() { + OAuth2TokenValidator getJwtValidator() { return this.jwtValidator; } @@ -2122,7 +2122,7 @@ public class OAuth2ResourceServerConfigurerTests { } @Bean - public AuthenticationProvider authenticationProvider() { + AuthenticationProvider authenticationProvider() { return mock(AuthenticationProvider.class); } @@ -2150,7 +2150,7 @@ public class OAuth2ResourceServerConfigurerTests { } @Bean - public AuthenticationProvider authenticationProvider() { + AuthenticationProvider authenticationProvider() { return mock(AuthenticationProvider.class); } @@ -2234,7 +2234,7 @@ public class OAuth2ResourceServerConfigurerTests { static class JwtDecoderConfig { @Bean - public JwtDecoder jwtDecoder() { + JwtDecoder jwtDecoder() { return mock(JwtDecoder.class); } @@ -2244,35 +2244,35 @@ public class OAuth2ResourceServerConfigurerTests { static class BasicController { @GetMapping("/") - public String get() { + String get() { return "ok"; } @PostMapping("/post") - public String post() { + String post() { return "post"; } @RequestMapping(value = "/authenticated", method = { RequestMethod.GET, RequestMethod.POST }) - public String authenticated(Authentication authentication) { + String authenticated(Authentication authentication) { return authentication.getName(); } @GetMapping("/requires-read-scope") - public String requiresReadScope(JwtAuthenticationToken token) { + String requiresReadScope(JwtAuthenticationToken token) { return token.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList()) .toString(); } @GetMapping("/ms-requires-read-scope") @PreAuthorize("hasAuthority('SCOPE_message:read')") - public String msRequiresReadScope(JwtAuthenticationToken token) { + String msRequiresReadScope(JwtAuthenticationToken token) { return requiresReadScope(token); } @GetMapping("/ms-deny") @PreAuthorize("denyAll") - public String deny() { + String deny() { return "hmm, that's odd"; } @@ -2284,7 +2284,7 @@ public class OAuth2ResourceServerConfigurerTests { private final MockWebServer server = new MockWebServer(); @PreDestroy - public void shutdown() throws IOException { + void shutdown() throws IOException { this.server.shutdown(); } @@ -2297,7 +2297,7 @@ public class OAuth2ResourceServerConfigurerTests { } @Bean - public MockWebServer web() { + MockWebServer web() { return this.server; } @@ -2354,7 +2354,7 @@ public class OAuth2ResourceServerConfigurerTests { this.token = token; } - public BearerTokenRequestPostProcessor asParam() { + BearerTokenRequestPostProcessor asParam() { this.asRequestParameter = true; return this; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java index 9ef91dc752..f4024587df 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/reactive/EnableWebFluxSecurityTests.java @@ -270,13 +270,13 @@ public class EnableWebFluxSecurityTests { static class CustomPasswordEncoderConfig { @Bean - public ReactiveUserDetailsService userDetailsService(PasswordEncoder encoder) { + ReactiveUserDetailsService userDetailsService(PasswordEncoder encoder) { return new MapReactiveUserDetailsService( User.withUsername("user").password(encoder.encode("password")).roles("USER").build()); } @Bean - public static PasswordEncoder passwordEncoder() { + static PasswordEncoder passwordEncoder() { return new BCryptPasswordEncoder(); } @@ -286,7 +286,7 @@ public class EnableWebFluxSecurityTests { static class MapReactiveUserDetailsServiceConfig { @Bean - public MapReactiveUserDetailsService userDetailsService() { + MapReactiveUserDetailsService userDetailsService() { // @formatter:off return new MapReactiveUserDetailsService(User.withUsername("user") .password("{noop}password") @@ -304,14 +304,14 @@ public class EnableWebFluxSecurityTests { @Order(Ordered.HIGHEST_PRECEDENCE) @Bean - public SecurityWebFilterChain apiHttpSecurity(ServerHttpSecurity http) { + SecurityWebFilterChain apiHttpSecurity(ServerHttpSecurity http) { http.securityMatcher(new PathPatternParserServerWebExchangeMatcher("/api/**")).authorizeExchange() .anyExchange().denyAll(); return http.build(); } @Bean - public SecurityWebFilterChain httpSecurity(ServerHttpSecurity http) { + SecurityWebFilterChain httpSecurity(ServerHttpSecurity http) { return http.build(); } @@ -323,7 +323,7 @@ public class EnableWebFluxSecurityTests { static class AuthenticationPrincipalConfig { @Bean - public PrincipalBean principalBean() { + PrincipalBean principalBean() { return new PrincipalBean(); } @@ -336,7 +336,7 @@ public class EnableWebFluxSecurityTests { } @RestController - public static class AuthenticationPrincipalResolver { + static class AuthenticationPrincipalResolver { @GetMapping("/spel") String username(@AuthenticationPrincipal(expression = "@principalBean.username(#this)") String username) { @@ -352,12 +352,12 @@ public class EnableWebFluxSecurityTests { static class BeanProxyEnabledByDefaultConfig { @Bean - public Child child() { + Child child() { return new Child(); } @Bean - public Parent parent() { + Parent parent() { return new Parent(child()); } @@ -369,12 +369,12 @@ public class EnableWebFluxSecurityTests { static class BeanProxyDisabledConfig { @Bean - public Child child() { + Child child() { return new Child(); } @Bean - public Parent parent() { + Parent parent() { return new Parent(child()); } @@ -388,7 +388,7 @@ public class EnableWebFluxSecurityTests { this.child = child; } - public Child getChild() { + Child getChild() { return this.child; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java index 2bb6965eb8..5b38a0668c 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java @@ -120,7 +120,7 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerDocTests { static class MyController { @MessageMapping("/authentication") - public void authentication(@AuthenticationPrincipal String un) { + void authentication(@AuthenticationPrincipal String un) { // ... do something ... } @@ -161,7 +161,7 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerDocTests { } @Bean - public MyController myController() { + MyController myController() { return new MyController(); } @@ -171,7 +171,7 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerDocTests { static class SyncExecutorConfig { @Bean - public static SyncExecutorSubscribableChannelPostProcessor postProcessor() { + static SyncExecutorSubscribableChannelPostProcessor postProcessor() { return new SyncExecutorSubscribableChannelPostProcessor(); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java index c840cbc282..4aecda3869 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java @@ -441,7 +441,7 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { } @Bean - public TestHandshakeHandler testHandshakeHandler() { + TestHandshakeHandler testHandshakeHandler() { return new TestHandshakeHandler(); } @@ -480,7 +480,7 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { } @Bean - public TestHandshakeHandler testHandshakeHandler() { + TestHandshakeHandler testHandshakeHandler() { return new TestHandshakeHandler(); } @@ -516,7 +516,7 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { } @Bean - public TestHandshakeHandler testHandshakeHandler() { + TestHandshakeHandler testHandshakeHandler() { return new TestHandshakeHandler(); } @@ -545,18 +545,22 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { // @formatter:on @Bean - public static SecurityExpressionHandler> messageSecurityExpressionHandler() { + static SecurityExpressionHandler> messageSecurityExpressionHandler() { return new DefaultMessageSecurityExpressionHandler() { + @Override protected SecurityExpressionOperations createSecurityExpressionRoot(Authentication authentication, Message invocation) { return new MessageSecurityExpressionRoot(authentication, invocation) { + public boolean denyRob() { Authentication auth = getAuthentication(); return auth != null && !"rob".equals(auth.getName()); } + }; } + }; } diff --git a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationConfigurationGh3935Tests.java b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationConfigurationGh3935Tests.java index c1a5d9125e..b688bba746 100644 --- a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationConfigurationGh3935Tests.java +++ b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationConfigurationGh3935Tests.java @@ -113,7 +113,7 @@ public class AuthenticationConfigurationGh3935Tests { } @Bean - public UserDetailsService userDetailsService() { + UserDetailsService userDetailsService() { return mock(UserDetailsService.class); } 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 2e5ef45289..14298cf186 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 @@ -166,7 +166,7 @@ public class GrantedAuthorityDefaultsJcTests { static class Config extends WebSecurityConfigurerAdapter { @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() @@ -184,12 +184,12 @@ public class GrantedAuthorityDefaultsJcTests { } @Bean - public MessageService messageService() { + MessageService messageService() { return new HelloWorldMessageService(); } @Bean - public static GrantedAuthorityDefaults grantedAuthorityDefaults() { + static GrantedAuthorityDefaults grantedAuthorityDefaults() { return new GrantedAuthorityDefaults(""); } diff --git a/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceITests.java b/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceITests.java index 1cbe52e40d..77bbef169f 100644 --- a/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceITests.java +++ b/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceITests.java @@ -47,7 +47,7 @@ public class ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceITes static class Config { @Bean - public ReactiveUserDetailsServiceResourceFactoryBean userDetailsService() { + ReactiveUserDetailsServiceResourceFactoryBean userDetailsService() { return ReactiveUserDetailsServiceResourceFactoryBean .fromResource(new InMemoryResource("user=password,ROLE_USER")); } diff --git a/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceLocationITests.java b/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceLocationITests.java index effd00c71e..cd720f1b7b 100644 --- a/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceLocationITests.java +++ b/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceLocationITests.java @@ -46,7 +46,7 @@ public class ReactiveUserDetailsServiceResourceFactoryBeanPropertiesResourceLoca static class Config { @Bean - public ReactiveUserDetailsServiceResourceFactoryBean userDetailsService() { + ReactiveUserDetailsServiceResourceFactoryBean userDetailsService() { return ReactiveUserDetailsServiceResourceFactoryBean.fromResourceLocation("classpath:users.properties"); } diff --git a/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanStringITests.java b/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanStringITests.java index 76bccac1ba..f257138526 100644 --- a/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanStringITests.java +++ b/config/src/test/java/org/springframework/security/config/core/userdetails/ReactiveUserDetailsServiceResourceFactoryBeanStringITests.java @@ -46,7 +46,7 @@ public class ReactiveUserDetailsServiceResourceFactoryBeanStringITests { static class Config { @Bean - public ReactiveUserDetailsServiceResourceFactoryBean userDetailsService() { + ReactiveUserDetailsServiceResourceFactoryBean userDetailsService() { return ReactiveUserDetailsServiceResourceFactoryBean.fromString("user=password,ROLE_USER"); } diff --git a/config/src/test/java/org/springframework/security/config/http/InterceptUrlConfigTests.java b/config/src/test/java/org/springframework/security/config/http/InterceptUrlConfigTests.java index 5a3860ddae..07b4708f9e 100644 --- a/config/src/test/java/org/springframework/security/config/http/InterceptUrlConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/InterceptUrlConfigTests.java @@ -228,12 +228,12 @@ public class InterceptUrlConfigTests { static class PathController { @RequestMapping("/path") - public String path() { + String path() { return "path"; } @RequestMapping("/path/{un}/path") - public String path(@PathVariable("un") String name) { + String path(@PathVariable("un") String name) { return name; } diff --git a/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java b/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java index d77ce6517e..56c9106964 100644 --- a/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java @@ -751,12 +751,12 @@ public class MiscHttpConfigTests { static class BasicController { @RequestMapping("/unprotected") - public String unprotected() { + String unprotected() { return "ok"; } @RequestMapping("/protected") - public String protectedMethod(@AuthenticationPrincipal String name) { + String protectedMethod(@AuthenticationPrincipal String name) { return name; } @@ -766,7 +766,7 @@ public class MiscHttpConfigTests { static class CustomKeyController { @GetMapping("/customKey") - public String customKey() { + String customKey() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); if (authentication != null && authentication instanceof AnonymousAuthenticationToken) { @@ -782,18 +782,18 @@ public class MiscHttpConfigTests { static class AuthenticationController { @GetMapping("/password") - public String password(@AuthenticationPrincipal Authentication authentication) { + String password(@AuthenticationPrincipal Authentication authentication) { return (String) authentication.getCredentials(); } @GetMapping("/roles") - public String roles(@AuthenticationPrincipal Authentication authentication) { + String roles(@AuthenticationPrincipal Authentication authentication) { return authentication.getAuthorities().stream().map(GrantedAuthority::getAuthority) .collect(Collectors.joining(",")); } @GetMapping("/details") - public String details(@AuthenticationPrincipal Authentication authentication) { + String details(@AuthenticationPrincipal Authentication authentication) { return authentication.getDetails().getClass().getName(); } @@ -803,7 +803,7 @@ public class MiscHttpConfigTests { static class JaasController { @GetMapping("/username") - public String username() { + String username() { Subject subject = Subject.getSubject(AccessController.getContext()); return subject.getPrincipals().iterator().next().getName(); } diff --git a/config/src/test/java/org/springframework/security/config/http/MultiHttpBlockConfigTests.java b/config/src/test/java/org/springframework/security/config/http/MultiHttpBlockConfigTests.java index 5259123a9a..dd3fb990e3 100644 --- a/config/src/test/java/org/springframework/security/config/http/MultiHttpBlockConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/MultiHttpBlockConfigTests.java @@ -97,7 +97,7 @@ public class MultiHttpBlockConfigTests { static class BasicController { @GetMapping("/first") - public String first() { + String first() { return "ok"; } diff --git a/config/src/test/java/org/springframework/security/config/http/OpenIDConfigTests.java b/config/src/test/java/org/springframework/security/config/http/OpenIDConfigTests.java index 3de4472b57..fad993004f 100644 --- a/config/src/test/java/org/springframework/security/config/http/OpenIDConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/OpenIDConfigTests.java @@ -194,7 +194,7 @@ public class OpenIDConfigTests { static class CustomLoginController { @GetMapping("/login") - public String custom() { + String custom() { return "a custom login page"; } diff --git a/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTests.java b/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTests.java index 19f7b33547..f7bd58f0b0 100644 --- a/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTests.java @@ -534,12 +534,12 @@ public class SessionManagementConfigTests { static class BasicController { @GetMapping("/") - public String ok() { + String ok() { return "ok"; } @GetMapping("/auth") - public String auth(Principal principal) { + String auth(Principal principal) { return principal.getName(); } @@ -553,17 +553,17 @@ public class SessionManagementConfigTests { private Boolean exists = true; - public ResultMatcher exists(boolean exists) { + ResultMatcher exists(boolean exists) { this.exists = exists; return this; } - public ResultMatcher valid(boolean valid) { + ResultMatcher valid(boolean valid) { this.valid = valid; return this.exists(true); } - public ResultMatcher id(String id) { + ResultMatcher id(String id) { this.id = id; return this.exists(true); } diff --git a/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomHttpSecurityConfigurerTests.java b/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomHttpSecurityConfigurerTests.java index 5a76fc998d..9f715ddce9 100644 --- a/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomHttpSecurityConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomHttpSecurityConfigurerTests.java @@ -132,7 +132,7 @@ public class CustomHttpSecurityConfigurerTests { } @Bean - public static PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() { + static PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() { // Typically externalize this as a properties file Properties properties = new Properties(); properties.setProperty("permitAllPattern", "/public/**"); @@ -160,7 +160,7 @@ public class CustomHttpSecurityConfigurerTests { } @Bean - public static PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() { + static PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() { // Typically externalize this as a properties file Properties properties = new Properties(); properties.setProperty("permitAllPattern", "/public/**"); diff --git a/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceITests.java b/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceITests.java index 4baab7a972..d1c937dd65 100644 --- a/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceITests.java +++ b/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceITests.java @@ -47,7 +47,7 @@ public class UserDetailsManagerResourceFactoryBeanPropertiesResourceITests { static class Config { @Bean - public UserDetailsManagerResourceFactoryBean userDetailsService() { + UserDetailsManagerResourceFactoryBean userDetailsService() { return UserDetailsManagerResourceFactoryBean.fromResource(new InMemoryResource("user=password,ROLE_USER")); } diff --git a/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceLocationITests.java b/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceLocationITests.java index d02a00723c..5138dd984d 100644 --- a/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceLocationITests.java +++ b/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanPropertiesResourceLocationITests.java @@ -46,7 +46,7 @@ public class UserDetailsManagerResourceFactoryBeanPropertiesResourceLocationITes static class Config { @Bean - public UserDetailsManagerResourceFactoryBean userDetailsService() { + UserDetailsManagerResourceFactoryBean userDetailsService() { return UserDetailsManagerResourceFactoryBean.fromResourceLocation("classpath:users.properties"); } diff --git a/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanStringITests.java b/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanStringITests.java index cf85689257..af4fccbd23 100644 --- a/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanStringITests.java +++ b/config/src/test/java/org/springframework/security/config/provisioning/UserDetailsManagerResourceFactoryBeanStringITests.java @@ -46,7 +46,7 @@ public class UserDetailsManagerResourceFactoryBeanStringITests { static class Config { @Bean - public UserDetailsManagerResourceFactoryBean userDetailsService() { + UserDetailsManagerResourceFactoryBean userDetailsService() { return UserDetailsManagerResourceFactoryBean.fromString("user=password,ROLE_USER"); } diff --git a/config/src/test/java/org/springframework/security/config/web/server/HttpsRedirectSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/HttpsRedirectSpecTests.java index bd1c597808..f31818b22b 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/HttpsRedirectSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/HttpsRedirectSpecTests.java @@ -201,7 +201,7 @@ public class HttpsRedirectSpecTests { } @Bean - public PortMapper portMapper() { + PortMapper portMapper() { return mock(PortMapper.class); } @@ -225,7 +225,7 @@ public class HttpsRedirectSpecTests { } @Bean - public PortMapper portMapper() { + PortMapper portMapper() { return mock(PortMapper.class); } diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ClientSpecTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ClientSpecTests.java index 2392649dd4..6000f4da54 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2ClientSpecTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2ClientSpecTests.java @@ -256,7 +256,7 @@ public class OAuth2ClientSpecTests { ServerRequestCache requestCache = mock(ServerRequestCache.class); @Bean - public SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { + SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { // @formatter:off http .oauth2Client() @@ -284,7 +284,7 @@ public class OAuth2ClientSpecTests { ServerRequestCache requestCache = mock(ServerRequestCache.class); @Bean - public SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { + SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { // @formatter:off http .oauth2Client((oauth2Client) -> diff --git a/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java b/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java index ad3da58441..c6809ca45b 100644 --- a/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java +++ b/config/src/test/java/org/springframework/security/config/web/server/OAuth2LoginTests.java @@ -566,7 +566,7 @@ public class OAuth2LoginTests { ServerAuthenticationFailureHandler failureHandler = mock(ServerAuthenticationFailureHandler.class); @Bean - public SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { + SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { // @formatter:off http .authorizeExchange() @@ -599,7 +599,7 @@ public class OAuth2LoginTests { ServerAuthenticationSuccessHandler successHandler = mock(ServerAuthenticationSuccessHandler.class); @Bean - public SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { + SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { // @formatter:off http .authorizeExchange((exchanges) -> @@ -635,7 +635,7 @@ public class OAuth2LoginTests { ServerSecurityContextRepository securityContextRepository = mock(ServerSecurityContextRepository.class); @Bean - public SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { + SecurityWebFilterChain springSecurityFilter(ServerHttpSecurity http) { // @formatter:off http .authorizeExchange() @@ -657,12 +657,12 @@ public class OAuth2LoginTests { } @Bean - public ReactiveJwtDecoderFactory jwtDecoderFactory() { + ReactiveJwtDecoderFactory jwtDecoderFactory() { return this.jwtDecoderFactory; } @Bean - public ReactiveOAuth2AccessTokenResponseClient accessTokenResponseClient() { + ReactiveOAuth2AccessTokenResponseClient accessTokenResponseClient() { return this.tokenResponseClient; } @@ -700,7 +700,7 @@ public class OAuth2LoginTests { .build(); @Bean - public SecurityWebFilterChain springSecurity(ServerHttpSecurity http) { + SecurityWebFilterChain springSecurity(ServerHttpSecurity http) { // @formatter:off http .csrf().disable() diff --git a/config/src/test/java/org/springframework/security/config/websocket/WebSocketMessageBrokerConfigTests.java b/config/src/test/java/org/springframework/security/config/websocket/WebSocketMessageBrokerConfigTests.java index 19cefb2791..4bd2d1e9f3 100644 --- a/config/src/test/java/org/springframework/security/config/websocket/WebSocketMessageBrokerConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/websocket/WebSocketMessageBrokerConfigTests.java @@ -444,7 +444,7 @@ public class WebSocketMessageBrokerConfigTests { String username; @MessageMapping("/message") - public void authentication(@AuthenticationPrincipal String username) { + void authentication(@AuthenticationPrincipal String username) { this.username = username; } @@ -456,7 +456,7 @@ public class WebSocketMessageBrokerConfigTests { MessageArgument messageArgument; @MessageMapping("/message-with-argument") - public void myCustom(MessageArgument messageArgument) { + void myCustom(MessageArgument messageArgument) { this.messageArgument = messageArgument; } @@ -531,10 +531,12 @@ public class WebSocketMessageBrokerConfigTests { Message invocation) { return new MessageSecurityExpressionRoot(authentication, invocation) { + public boolean denyNile() { Authentication auth = getAuthentication(); return auth != null && !"nile".equals(auth.getName()); } + }; } diff --git a/config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java b/config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java index 1859625ce4..53c2b86913 100644 --- a/config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java +++ b/config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java @@ -58,7 +58,7 @@ final class HtmlUnitWebTestClient { this.webTestClient = webTestClient.mutate().filter(new FollowRedirects()).filter(new CookieManager()).build(); } - public FluxExchangeResult getResponse(WebRequest webRequest) { + FluxExchangeResult getResponse(WebRequest webRequest) { WebTestClient.RequestBodySpec request = this.webTestClient.method(httpMethod(webRequest)).uri(uri(webRequest)); contentType(request, webRequest); cookies(request, webRequest); diff --git a/config/src/test/java/org/springframework/security/htmlunit/server/MockWebResponseBuilder.java b/config/src/test/java/org/springframework/security/htmlunit/server/MockWebResponseBuilder.java index fe634597b0..ef1253c08d 100644 --- a/config/src/test/java/org/springframework/security/htmlunit/server/MockWebResponseBuilder.java +++ b/config/src/test/java/org/springframework/security/htmlunit/server/MockWebResponseBuilder.java @@ -50,7 +50,7 @@ final class MockWebResponseBuilder { this.exchangeResult = exchangeResult; } - public WebResponse build() throws IOException { + WebResponse build() throws IOException { WebResponseData webResponseData = webResponseData(); long endTime = System.currentTimeMillis(); return new WebResponse(webResponseData, this.webRequest, endTime - this.startTime); diff --git a/config/src/test/java/org/springframework/security/htmlunit/server/WebTestClientHtmlUnitDriverBuilderTests.java b/config/src/test/java/org/springframework/security/htmlunit/server/WebTestClientHtmlUnitDriverBuilderTests.java index c1c02565db..7f509d7f1a 100644 --- a/config/src/test/java/org/springframework/security/htmlunit/server/WebTestClientHtmlUnitDriverBuilderTests.java +++ b/config/src/test/java/org/springframework/security/htmlunit/server/WebTestClientHtmlUnitDriverBuilderTests.java @@ -71,7 +71,7 @@ public class WebTestClientHtmlUnitDriverBuilderTests { @ResponseBody @GetMapping(produces = MediaType.TEXT_HTML_VALUE) - public String index() { + String index() { return "\n" + "\n" + "Hello World\n" + "\n" + "\n" + "

Hello World

\n" + "\n" + ""; } @@ -83,13 +83,13 @@ public class WebTestClientHtmlUnitDriverBuilderTests { class CookieController { @GetMapping(path = "/", produces = MediaType.TEXT_HTML_VALUE) - public String view(@CookieValue(required = false) String cookieName) { + String view(@CookieValue(required = false) String cookieName) { return "\n" + "\n" + "Hello World\n" + "\n" + "\n" + "

" + TextEscapeUtils.escapeEntities(cookieName) + "

\n" + "\n" + ""; } @GetMapping("/cookie") - public Mono setCookie(ServerHttpResponse response) { + Mono setCookie(ServerHttpResponse response) { response.addCookie(ResponseCookie.from("cookieName", "theCookie").build()); return redirect(response); } @@ -101,7 +101,7 @@ public class WebTestClientHtmlUnitDriverBuilderTests { } @GetMapping("/cookie/delete") - public Mono deleteCookie(ServerHttpResponse response) { + Mono deleteCookie(ServerHttpResponse response) { response.addCookie(ResponseCookie.from("cookieName", "").maxAge(Duration.ofSeconds(0)).build()); return redirect(response); } diff --git a/core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java b/core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java index e59794a237..f2f1047f61 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/DefaultMethodSecurityExpressionHandlerTests.java @@ -178,9 +178,9 @@ public class DefaultMethodSecurityExpressionHandlerTests { verify(upstream).close(); } - private static class Foo { + static class Foo { - public void bar() { + void bar() { } } diff --git a/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java b/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java index de5f8cd1d3..67f6e1aa86 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/AbstractSecurityInterceptorTests.java @@ -70,7 +70,7 @@ public class AbstractSecurityInterceptorTests { return this.securityMetadataSource; } - public void setSecurityMetadataSource(SecurityMetadataSource securityMetadataSource) { + void setSecurityMetadataSource(SecurityMetadataSource securityMetadataSource) { this.securityMetadataSource = securityMetadataSource; } @@ -90,7 +90,7 @@ public class AbstractSecurityInterceptorTests { return this.securityMetadataSource; } - public void setSecurityMetadataSource(SecurityMetadataSource securityMetadataSource) { + void setSecurityMetadataSource(SecurityMetadataSource securityMetadataSource) { this.securityMetadataSource = securityMetadataSource; } diff --git a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java index 90bbd2336f..ca50e2d215 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java @@ -719,7 +719,7 @@ public class DaoAuthenticationProviderTests { throw new UsernameNotFoundException("Could not find: " + username); } - public void setPassword(String password) { + void setPassword(String password) { this.password = password; } diff --git a/core/src/test/java/org/springframework/security/jackson2/SecurityJackson2ModulesTests.java b/core/src/test/java/org/springframework/security/jackson2/SecurityJackson2ModulesTests.java index 305c22adc8..d053a451b9 100644 --- a/core/src/test/java/org/springframework/security/jackson2/SecurityJackson2ModulesTests.java +++ b/core/src/test/java/org/springframework/security/jackson2/SecurityJackson2ModulesTests.java @@ -107,11 +107,11 @@ public class SecurityJackson2ModulesTests { private String property = "bar"; - public String getProperty() { + String getProperty() { return this.property; } - public void setProperty(String property) { + void setProperty(String property) { } } @@ -121,11 +121,11 @@ public class SecurityJackson2ModulesTests { private String property = "bar"; - public String getProperty() { + String getProperty() { return this.property; } - public void setProperty(String property) { + void setProperty(String property) { } } diff --git a/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2EncodingUtils.java b/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2EncodingUtils.java index dcc0a5d478..1cdeb21016 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2EncodingUtils.java +++ b/crypto/src/main/java/org/springframework/security/crypto/argon2/Argon2EncodingUtils.java @@ -56,7 +56,7 @@ final class Argon2EncodingUtils { * @return the encoded Argon2-hash-string as described above * @throws IllegalArgumentException if the Argon2Parameters are invalid */ - public static String encode(byte[] hash, Argon2Parameters parameters) throws IllegalArgumentException { + static String encode(byte[] hash, Argon2Parameters parameters) throws IllegalArgumentException { StringBuilder stringBuilder = new StringBuilder(); switch (parameters.getType()) { @@ -104,7 +104,7 @@ final class Argon2EncodingUtils { * {@link Argon2Parameters}. * @throws IllegalArgumentException if the encoded hash is malformed */ - public static Argon2Hash decode(String encodedHash) throws IllegalArgumentException { + static Argon2Hash decode(String encodedHash) throws IllegalArgumentException { Argon2Parameters.Builder paramsBuilder; String[] parts = encodedHash.split("\\$"); diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/CipherUtils.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/CipherUtils.java index e8cadac13c..723208caff 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/CipherUtils.java +++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/CipherUtils.java @@ -45,14 +45,14 @@ final class CipherUtils { /** * Generates a SecretKey. */ - public static SecretKey newSecretKey(String algorithm, String password) { + static SecretKey newSecretKey(String algorithm, String password) { return newSecretKey(algorithm, new PBEKeySpec(password.toCharArray())); } /** * Generates a SecretKey. */ - public static SecretKey newSecretKey(String algorithm, PBEKeySpec keySpec) { + static SecretKey newSecretKey(String algorithm, PBEKeySpec keySpec) { try { SecretKeyFactory factory = SecretKeyFactory.getInstance(algorithm); return factory.generateSecret(keySpec); @@ -68,7 +68,7 @@ final class CipherUtils { /** * Constructs a new Cipher. */ - public static Cipher newCipher(String algorithm) { + static Cipher newCipher(String algorithm) { try { return Cipher.getInstance(algorithm); } @@ -83,7 +83,7 @@ final class CipherUtils { /** * Initializes the Cipher for use. */ - public static T getParameterSpec(Cipher cipher, Class parameterSpecClass) { + static T getParameterSpec(Cipher cipher, Class parameterSpecClass) { try { return cipher.getParameters().getParameterSpec(parameterSpecClass); } @@ -95,21 +95,21 @@ final class CipherUtils { /** * Initializes the Cipher for use. */ - public static void initCipher(Cipher cipher, int mode, SecretKey secretKey) { + static void initCipher(Cipher cipher, int mode, SecretKey secretKey) { initCipher(cipher, mode, secretKey, null); } /** * Initializes the Cipher for use. */ - public static void initCipher(Cipher cipher, int mode, SecretKey secretKey, byte[] salt, int iterationCount) { + static void initCipher(Cipher cipher, int mode, SecretKey secretKey, byte[] salt, int iterationCount) { initCipher(cipher, mode, secretKey, new PBEParameterSpec(salt, iterationCount)); } /** * Initializes the Cipher for use. */ - public static void initCipher(Cipher cipher, int mode, SecretKey secretKey, AlgorithmParameterSpec parameterSpec) { + static void initCipher(Cipher cipher, int mode, SecretKey secretKey, AlgorithmParameterSpec parameterSpec) { try { if (parameterSpec != null) { cipher.init(mode, secretKey, parameterSpec); @@ -130,7 +130,7 @@ final class CipherUtils { * Invokes the Cipher to perform encryption or decryption (depending on the * initialized mode). */ - public static byte[] doFinal(Cipher cipher, byte[] input) { + static byte[] doFinal(Cipher cipher, byte[] input) { try { return cipher.doFinal(input); } diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/Digester.java b/crypto/src/main/java/org/springframework/security/crypto/password/Digester.java index 3ef2c768fb..e7c8dffd3c 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/password/Digester.java +++ b/crypto/src/main/java/org/springframework/security/crypto/password/Digester.java @@ -46,7 +46,7 @@ final class Digester { setIterations(iterations); } - public byte[] digest(byte[] value) { + byte[] digest(byte[] value) { MessageDigest messageDigest = createDigest(this.algorithm); for (int i = 0; i < this.iterations; i++) { value = messageDigest.digest(value); diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/Md4.java b/crypto/src/main/java/org/springframework/security/crypto/password/Md4.java index ee43131e79..29511f2358 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/password/Md4.java +++ b/crypto/src/main/java/org/springframework/security/crypto/password/Md4.java @@ -42,7 +42,7 @@ class Md4 { reset(); } - public void reset() { + void reset() { this.bufferOffset = 0; this.byteCount = 0; this.state[0] = 0x67452301; @@ -51,7 +51,7 @@ class Md4 { this.state[3] = 0x10325476; } - public byte[] digest() { + byte[] digest() { byte[] resBuf = new byte[HASH_SIZE]; digest(resBuf, 0, HASH_SIZE); return resBuf; @@ -90,7 +90,7 @@ class Md4 { digest(buffer, offset); } - public void update(byte[] input, int offset, int length) { + void update(byte[] input, int offset, int length) { this.byteCount += length; int todo; while (length >= (todo = BLOCK_SIZE - this.bufferOffset)) { diff --git a/etc/checkstyle/checkstyle-suppressions.xml b/etc/checkstyle/checkstyle-suppressions.xml index d36fa62d5a..1a11e02cca 100644 --- a/etc/checkstyle/checkstyle-suppressions.xml +++ b/etc/checkstyle/checkstyle-suppressions.xml @@ -3,7 +3,6 @@ "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd"> - @@ -32,4 +31,25 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/ldap/src/main/java/org/springframework/security/ldap/LdapEncoder.java b/ldap/src/main/java/org/springframework/security/ldap/LdapEncoder.java index af2f1f1a36..5727f668af 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/LdapEncoder.java +++ b/ldap/src/main/java/org/springframework/security/ldap/LdapEncoder.java @@ -95,7 +95,7 @@ final class LdapEncoder { * @param value the value to escape. * @return a properly escaped representation of the supplied value. */ - public static String filterEncode(String value) { + static String filterEncode(String value) { if (value == null) { return null; @@ -140,7 +140,7 @@ final class LdapEncoder { * @param value the value to escape. * @return The escaped value. */ - public static String nameEncode(String value) { + static String nameEncode(String value) { if (value == null) { return null; @@ -187,7 +187,7 @@ final class LdapEncoder { * @return The decoded value as a string. * @throws BadLdapGrammarException */ - public static String nameDecode(String value) throws BadLdapGrammarException { + static String nameDecode(String value) throws BadLdapGrammarException { if (value == null) { return null; diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapEncoder.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapEncoder.java index dc439704bf..ae6d6c67c7 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapEncoder.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/LdapEncoder.java @@ -95,7 +95,7 @@ final class LdapEncoder { * @param value the value to escape. * @return a properly escaped representation of the supplied value. */ - public static String filterEncode(String value) { + static String filterEncode(String value) { if (value == null) { return null; @@ -140,7 +140,7 @@ final class LdapEncoder { * @param value the value to escape. * @return The escaped value. */ - public static String nameEncode(String value) { + static String nameEncode(String value) { if (value == null) { return null; @@ -187,7 +187,7 @@ final class LdapEncoder { * @return The decoded value as a string. * @throws BadLdapGrammarException */ - public static String nameDecode(String value) throws BadLdapGrammarException { + static String nameDecode(String value) throws BadLdapGrammarException { if (value == null) { return null; diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java index aae2465ed5..fc1ca1f2c0 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java +++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/AbstractMessageMatcherComposite.java @@ -29,7 +29,7 @@ import org.springframework.util.Assert; * * @since 4.0 */ -abstract class AbstractMessageMatcherComposite implements MessageMatcher { +public abstract class AbstractMessageMatcherComposite implements MessageMatcher { protected final Log LOGGER = LogFactory.getLog(getClass()); diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java index 70e0695c05..27b49841c2 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/endpoint/AbstractWebClientReactiveOAuth2AccessTokenResponseClient.java @@ -57,11 +57,14 @@ import org.springframework.web.reactive.function.client.WebClient; * @see WebClientReactivePasswordTokenResponseClient * @see WebClientReactiveRefreshTokenTokenResponseClient */ -abstract class AbstractWebClientReactiveOAuth2AccessTokenResponseClient +public abstract class AbstractWebClientReactiveOAuth2AccessTokenResponseClient implements ReactiveOAuth2AccessTokenResponseClient { private WebClient webClient = WebClient.builder().build(); + AbstractWebClientReactiveOAuth2AccessTokenResponseClient() { + } + @Override public Mono getTokenResponse(T grantRequest) { Assert.notNull(grantRequest, "grantRequest cannot be null"); diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/ReactiveRemoteJWKSource.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/ReactiveRemoteJWKSource.java index 8ee61a32f8..28b4640b68 100644 --- a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/ReactiveRemoteJWKSource.java +++ b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/ReactiveRemoteJWKSource.java @@ -129,7 +129,7 @@ class ReactiveRemoteJWKSource implements ReactiveJWKSource { return null; // No kid in matcher } - public void setWebClient(WebClient webClient) { + void setWebClient(WebClient webClient) { this.webClient = webClient; } diff --git a/rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadSocketAcceptor.java b/rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadSocketAcceptor.java index 9809fa788e..71e4383b50 100644 --- a/rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadSocketAcceptor.java +++ b/rsocket/src/main/java/org/springframework/security/rsocket/core/PayloadSocketAcceptor.java @@ -93,11 +93,11 @@ class PayloadSocketAcceptor implements SocketAcceptor { return StringUtils.hasText(str) ? MimeTypeUtils.parseMimeType(str) : defaultMimeType; } - public void setDefaultDataMimeType(@Nullable MimeType defaultDataMimeType) { + void setDefaultDataMimeType(@Nullable MimeType defaultDataMimeType) { this.defaultDataMimeType = defaultDataMimeType; } - public void setDefaultMetadataMimeType(MimeType defaultMetadataMimeType) { + void setDefaultMetadataMimeType(MimeType defaultMetadataMimeType) { Assert.notNull(defaultMetadataMimeType, "defaultMetadataMimeType cannot be null"); this.defaultMetadataMimeType = defaultMetadataMimeType; } diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java b/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java index c68cce9196..e1effd435f 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/authentication/AuthenticationPayloadInterceptorChain.java @@ -37,11 +37,11 @@ class AuthenticationPayloadInterceptorChain implements PayloadInterceptorChain { .doOnNext((a) -> this.setAuthentication(a)).then(); } - public Authentication getAuthentication() { + Authentication getAuthentication() { return this.authentication; } - public void setAuthentication(Authentication authentication) { + void setAuthentication(Authentication authentication) { this.authentication = authentication; } diff --git a/rsocket/src/test/java/org/springframework/security/rsocket/core/CaptureSecurityContextSocketAcceptor.java b/rsocket/src/test/java/org/springframework/security/rsocket/core/CaptureSecurityContextSocketAcceptor.java index 6c6e25e608..b8e54b7aa0 100644 --- a/rsocket/src/test/java/org/springframework/security/rsocket/core/CaptureSecurityContextSocketAcceptor.java +++ b/rsocket/src/test/java/org/springframework/security/rsocket/core/CaptureSecurityContextSocketAcceptor.java @@ -46,7 +46,7 @@ class CaptureSecurityContextSocketAcceptor implements SocketAcceptor { .doOnNext((securityContext) -> this.securityContext = securityContext).thenReturn(this.accept); } - public SecurityContext getSecurityContext() { + SecurityContext getSecurityContext() { return this.securityContext; } diff --git a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/AbstractSaml2AuthenticationRequest.java b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/AbstractSaml2AuthenticationRequest.java index 49884728bc..028ecd6bae 100644 --- a/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/AbstractSaml2AuthenticationRequest.java +++ b/saml2/saml2-service-provider/src/main/java/org/springframework/security/saml2/provider/service/authentication/AbstractSaml2AuthenticationRequest.java @@ -34,7 +34,7 @@ import org.springframework.util.Assert; * @see Saml2AuthenticationRequestFactory#createPostAuthenticationRequest(Saml2AuthenticationRequestContext) * @see Saml2AuthenticationRequestFactory#createRedirectAuthenticationRequest(Saml2AuthenticationRequestContext) */ -abstract class AbstractSaml2AuthenticationRequest { +public abstract class AbstractSaml2AuthenticationRequest { private final String samlRequest; @@ -96,7 +96,7 @@ abstract class AbstractSaml2AuthenticationRequest { /** * A builder for {@link AbstractSaml2AuthenticationRequest} and its subclasses. */ - static class Builder> { + public static class Builder> { String authenticationRequestUri; diff --git a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java index 09ee82c7dd..779d9e340e 100644 --- a/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java +++ b/taglibs/src/test/java/org/springframework/security/taglibs/authz/AuthenticationTagTests.java @@ -144,7 +144,7 @@ public class AuthenticationTagTests { String lastMessage = null; - public String getLastMessage() { + String getLastMessage() { return this.lastMessage; } diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java b/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java index 439c0519b2..0a5bb40de4 100644 --- a/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java +++ b/test/src/main/java/org/springframework/security/test/context/support/WithSecurityContextTestExecutionListener.java @@ -186,11 +186,11 @@ public class WithSecurityContextTestExecutionListener extends AbstractTestExecut this.testExecutionEvent = testExecutionEvent; } - public Supplier getSecurityContextSupplier() { + Supplier getSecurityContextSupplier() { return this.securityContextSupplier; } - public TestExecutionEvent getTestExecutionEvent() { + TestExecutionEvent getTestExecutionEvent() { return this.testExecutionEvent; } diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactory.java b/test/src/main/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactory.java index 68a26d123a..3816316ab1 100644 --- a/test/src/main/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactory.java +++ b/test/src/main/java/org/springframework/security/test/context/support/WithUserDetailsSecurityContextFactory.java @@ -77,7 +77,7 @@ final class WithUserDetailsSecurityContextFactory implements WithSecurityContext : this.beans.getBean(UserDetailsService.class); } - public UserDetailsService findAndAdaptReactiveUserDetailsService(String beanName) { + UserDetailsService findAndAdaptReactiveUserDetailsService(String beanName) { try { ReactiveUserDetailsService reactiveUserDetailsService = StringUtils.hasLength(beanName) ? this.beans.getBean(beanName, ReactiveUserDetailsService.class) diff --git a/test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java b/test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java index 49fe636a7c..98375bc6ee 100644 --- a/test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java +++ b/test/src/main/java/org/springframework/security/test/web/reactive/server/SecurityMockServerConfigurers.java @@ -1178,11 +1178,11 @@ public final class SecurityMockServerConfigurers { } } - public static void enable(ServerWebExchange exchange) { + static void enable(ServerWebExchange exchange) { exchange.getAttributes().put(ENABLED_ATTR_NAME, Boolean.TRUE); } - public boolean isEnabled(ServerWebExchange exchange) { + boolean isEnabled(ServerWebExchange exchange) { return Boolean.TRUE.equals(exchange.getAttribute(ENABLED_ATTR_NAME)); } @@ -1204,8 +1204,7 @@ public final class SecurityMockServerConfigurers { * @return the {@link ReactiveOAuth2AuthorizedClientManager} for the specified * {@link ServerWebExchange} */ - public static ReactiveOAuth2AuthorizedClientManager getOAuth2AuthorizedClientManager( - ServerWebExchange exchange) { + static ReactiveOAuth2AuthorizedClientManager getOAuth2AuthorizedClientManager(ServerWebExchange exchange) { OAuth2AuthorizedClientArgumentResolver resolver = findResolver(exchange, OAuth2AuthorizedClientArgumentResolver.class); if (resolver == null) { @@ -1223,7 +1222,7 @@ public final class SecurityMockServerConfigurers { * {@link ReactiveOAuth2AuthorizedClientManager} * @param manager the {@link ReactiveOAuth2AuthorizedClientManager} to set */ - public static void setOAuth2AuthorizedClientManager(ServerWebExchange exchange, + static void setOAuth2AuthorizedClientManager(ServerWebExchange exchange, ReactiveOAuth2AuthorizedClientManager manager) { OAuth2AuthorizedClientArgumentResolver resolver = findResolver(exchange, OAuth2AuthorizedClientArgumentResolver.class); diff --git a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java index d39845c055..846bc223c0 100644 --- a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java +++ b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java @@ -568,11 +568,11 @@ public final class SecurityMockMvcRequestPostProcessors { } } - public static void enable(HttpServletRequest request) { + static void enable(HttpServletRequest request) { request.setAttribute(ENABLED_ATTR_NAME, Boolean.TRUE); } - public boolean isEnabled(HttpServletRequest request) { + boolean isEnabled(HttpServletRequest request) { return Boolean.TRUE.equals(request.getAttribute(ENABLED_ATTR_NAME)); } @@ -1659,11 +1659,11 @@ public final class SecurityMockMvcRequestPostProcessors { } } - public static void enable(HttpServletRequest request) { + static void enable(HttpServletRequest request) { request.setAttribute(ENABLED_ATTR_NAME, Boolean.TRUE); } - public boolean isEnabled(HttpServletRequest request) { + boolean isEnabled(HttpServletRequest request) { return Boolean.TRUE.equals(request.getAttribute(ENABLED_ATTR_NAME)); } @@ -1673,6 +1673,9 @@ public final class SecurityMockMvcRequestPostProcessors { private static final OAuth2AuthorizedClientRepository DEFAULT_CLIENT_REPO = new HttpSessionOAuth2AuthorizedClientRepository(); + private OAuth2ClientServletTestUtils() { + } + /** * Gets the {@link OAuth2AuthorizedClientManager} for the specified * {@link HttpServletRequest}. If one is not found, one based off of @@ -1682,7 +1685,7 @@ public final class SecurityMockMvcRequestPostProcessors { * @return the {@link OAuth2AuthorizedClientManager} for the specified * {@link HttpServletRequest} */ - public static OAuth2AuthorizedClientManager getOAuth2AuthorizedClientManager(HttpServletRequest request) { + static OAuth2AuthorizedClientManager getOAuth2AuthorizedClientManager(HttpServletRequest request) { OAuth2AuthorizedClientArgumentResolver resolver = findResolver(request, OAuth2AuthorizedClientArgumentResolver.class); if (resolver == null) { @@ -1700,7 +1703,7 @@ public final class SecurityMockMvcRequestPostProcessors { * {@link OAuth2AuthorizedClientManager} * @param manager the {@link OAuth2AuthorizedClientManager} to set */ - public static void setOAuth2AuthorizedClientManager(HttpServletRequest request, + static void setOAuth2AuthorizedClientManager(HttpServletRequest request, OAuth2AuthorizedClientManager manager) { OAuth2AuthorizedClientArgumentResolver resolver = findResolver(request, OAuth2AuthorizedClientArgumentResolver.class); @@ -1755,9 +1758,6 @@ public final class SecurityMockMvcRequestPostProcessors { } - private OAuth2ClientServletTestUtils() { - } - } } 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 a2d8f83802..d7294d510f 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 @@ -51,7 +51,7 @@ public class WithMockUserParentTests extends WithMockUserParent { static class Config { @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() 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 e857ea9f72..f4655f8718 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 @@ -81,7 +81,7 @@ public class WithMockUserTests { static class Config { @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() 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 1d9a341753..d279434416 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 @@ -86,15 +86,12 @@ public class WithUserDetailsTests { static class Config { @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { - // @formatter:off - auth - .userDetailsService(myUserDetailsService()); - // @formatter:on + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + auth.userDetailsService(myUserDetailsService()); } @Bean - public UserDetailsService myUserDetailsService() { + UserDetailsService myUserDetailsService() { return new CustomUserDetailsService(); } diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java index a9caddfbce..975b8b1ba2 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java @@ -163,12 +163,11 @@ public class WithSecurityContextTestExcecutionListenerTests { static class FakeTest { - public void testNoAnnotation() { + void testNoAnnotation() { } @WithMockUser - public void testWithMockUser() { - + void testWithMockUser() { } } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/Sec2935Tests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/Sec2935Tests.java index 7ba8965bc4..397f04b404 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/Sec2935Tests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/Sec2935Tests.java @@ -133,7 +133,7 @@ public class Sec2935Tests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { auth.inMemoryAuthentication(); } 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 c98a92bd03..63e7b6c177 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 @@ -85,7 +85,7 @@ public class SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication(); @@ -96,7 +96,7 @@ public class SecurityMockMvcRequestPostProcessorsAuthenticationStatelessTests { static class Controller { @RequestMapping - public String hello() { + String hello() { return "Hello"; } 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 7aa1d6e944..2ed0a2ffc7 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 @@ -83,18 +83,15 @@ public class SecurityMockMvcRequestPostProcessorsTestSecurityContextStatelessTes } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { - // @formatter:off - auth - .inMemoryAuthentication(); - // @formatter:on + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + auth.inMemoryAuthentication(); } @RestController static class Controller { @RequestMapping - public String hello() { + String hello() { return "Hello"; } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java index c789869b03..3441b8cbe8 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchersTests.java @@ -113,7 +113,7 @@ public class SecurityMockMvcResultMatchersTests { static class Controller { @RequestMapping("/") - public String ok() { + String ok() { return "ok"; } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java index 7f458d3970..82335524fb 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java @@ -93,7 +93,7 @@ public class SecurityMockWithAuthoritiesMvcResultMatchersTests { static class Controller { @RequestMapping("/") - public String ok() { + String ok() { return "ok"; } 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 69f5891d30..92a9e392ae 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 @@ -78,7 +78,7 @@ public class CsrfShowcaseTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() 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 c833a36aae..c0382f7eaa 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 @@ -86,7 +86,7 @@ public class CustomCsrfShowcaseTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() @@ -95,7 +95,7 @@ public class CustomCsrfShowcaseTests { } @Bean - public CsrfTokenRepository repo() { + CsrfTokenRepository repo() { HttpSessionCsrfTokenRepository repo = new HttpSessionCsrfTokenRepository(); repo.setParameterName("custom_csrf"); return 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 a5807986f5..136852f546 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 @@ -75,7 +75,7 @@ public class DefaultCsrfShowcaseTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java index ee3c177e55..ecc20e3f92 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/showcase/login/CustomConfigAuthenticationTests.java @@ -117,7 +117,7 @@ public class CustomConfigAuthenticationTests { // @formatter:on @Bean - public SecurityContextRepository securityContextRepository() { + SecurityContextRepository securityContextRepository() { HttpSessionSecurityContextRepository repo = new HttpSessionSecurityContextRepository(); repo.setSpringSecurityContextKey("CUSTOM"); return repo; 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 60494ca3fe..591042179d 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 @@ -101,7 +101,7 @@ public class DefaultfSecurityRequestsTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() 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 bfc31612c8..71f1947496 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 @@ -118,7 +118,7 @@ public class SecurityRequestsTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() 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 d841c86e25..e95bdd1816 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 @@ -102,7 +102,7 @@ public class WithUserAuthenticationTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() 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 59c010b741..d9906782c0 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 @@ -102,7 +102,7 @@ public class WithUserClassLevelAuthenticationTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() 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 3bcf82c0ff..eda6e95166 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 @@ -99,7 +99,7 @@ public class WithUserDetailsAuthenticationTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() 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 761950e47a..0fb8741231 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 @@ -98,7 +98,7 @@ public class WithUserDetailsClassLevelAuthenticationTests { } @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { + void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { // @formatter:off auth .inMemoryAuthentication() diff --git a/web/src/main/java/org/springframework/security/web/FilterInvocation.java b/web/src/main/java/org/springframework/security/web/FilterInvocation.java index 56037c47ac..5a0f90ab87 100644 --- a/web/src/main/java/org/springframework/security/web/FilterInvocation.java +++ b/web/src/main/java/org/springframework/security/web/FilterInvocation.java @@ -176,11 +176,11 @@ public class FilterInvocation { return null; } - public void setRequestURI(String requestURI) { + void setRequestURI(String requestURI) { this.requestURI = requestURI; } - public void setPathInfo(String pathInfo) { + void setPathInfo(String pathInfo) { this.pathInfo = pathInfo; } @@ -189,7 +189,7 @@ public class FilterInvocation { return this.requestURI; } - public void setContextPath(String contextPath) { + void setContextPath(String contextPath) { this.contextPath = contextPath; } @@ -198,7 +198,7 @@ public class FilterInvocation { return this.contextPath; } - public void setServletPath(String servletPath) { + void setServletPath(String servletPath) { this.servletPath = servletPath; } @@ -207,7 +207,7 @@ public class FilterInvocation { return this.servletPath; } - public void setMethod(String method) { + void setMethod(String method) { this.method = method; } @@ -226,7 +226,7 @@ public class FilterInvocation { return this.queryString; } - public void setQueryString(String queryString) { + void setQueryString(String queryString) { this.queryString = queryString; } @@ -261,7 +261,7 @@ public class FilterInvocation { } } - public void addHeader(String name, String value) { + void addHeader(String name, String value) { this.headers.add(name, value); } @@ -286,7 +286,7 @@ public class FilterInvocation { return this.parameters.get(name); } - public void setParameter(String name, String... values) { + void setParameter(String name, String... values) { this.parameters.put(name, values); } diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/AbstractSessionFixationProtectionStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/AbstractSessionFixationProtectionStrategy.java index 8e26c5f0c2..5ff51a6131 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/session/AbstractSessionFixationProtectionStrategy.java +++ b/web/src/main/java/org/springframework/security/web/authentication/session/AbstractSessionFixationProtectionStrategy.java @@ -36,7 +36,7 @@ import org.springframework.web.util.WebUtils; * @author Rob Winch * @since 3.2 */ -abstract class AbstractSessionFixationProtectionStrategy +public abstract class AbstractSessionFixationProtectionStrategy implements SessionAuthenticationStrategy, ApplicationEventPublisherAware { protected final Log logger = LogFactory.getLog(this.getClass()); @@ -53,6 +53,9 @@ abstract class AbstractSessionFixationProtectionStrategy */ private boolean alwaysCreateSession; + AbstractSessionFixationProtectionStrategy() { + } + /** * Called when a user is newly authenticated. *

diff --git a/web/src/main/java/org/springframework/security/web/debug/Logger.java b/web/src/main/java/org/springframework/security/web/debug/Logger.java index 1f178a1169..4fc51b4225 100644 --- a/web/src/main/java/org/springframework/security/web/debug/Logger.java +++ b/web/src/main/java/org/springframework/security/web/debug/Logger.java @@ -32,11 +32,11 @@ final class Logger { private static final Log logger = LogFactory.getLog("Spring Security Debugger"); - public void info(String message) { + void info(String message) { info(message, false); } - public void info(String message, boolean dumpStack) { + void info(String message, boolean dumpStack) { StringBuilder output = new StringBuilder(256); output.append("\n\n************************************************************\n\n"); output.append(message).append("\n"); diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategy.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategy.java index 151ae3d1fc..0426ccdec0 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategy.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/AbstractRequestParameterAllowFromStrategy.java @@ -37,7 +37,7 @@ import org.springframework.util.StringUtils; * directive. */ @Deprecated -abstract class AbstractRequestParameterAllowFromStrategy implements AllowFromStrategy { +public abstract class AbstractRequestParameterAllowFromStrategy implements AllowFromStrategy { private static final String DEFAULT_ORIGIN_REQUEST_PARAMETER = "x-frames-allow-from"; @@ -46,6 +46,9 @@ abstract class AbstractRequestParameterAllowFromStrategy implements AllowFromStr /** Logger for use by subclasses */ protected final Log log = LogFactory.getLog(getClass()); + AbstractRequestParameterAllowFromStrategy() { + } + @Override public String getAllowFromValue(HttpServletRequest request) { String allowFromOrigin = request.getParameter(this.allowFromParameterName); diff --git a/web/src/main/java/org/springframework/security/web/servletapi/HttpServlet3RequestFactory.java b/web/src/main/java/org/springframework/security/web/servletapi/HttpServlet3RequestFactory.java index dbd06835f8..22ca477e2d 100644 --- a/web/src/main/java/org/springframework/security/web/servletapi/HttpServlet3RequestFactory.java +++ b/web/src/main/java/org/springframework/security/web/servletapi/HttpServlet3RequestFactory.java @@ -107,7 +107,7 @@ final class HttpServlet3RequestFactory implements HttpServletRequestFactory { * is not authenticated. */ - public void setAuthenticationEntryPoint(AuthenticationEntryPoint authenticationEntryPoint) { + void setAuthenticationEntryPoint(AuthenticationEntryPoint authenticationEntryPoint) { this.authenticationEntryPoint = authenticationEntryPoint; } @@ -125,7 +125,7 @@ final class HttpServlet3RequestFactory implements HttpServletRequestFactory { * @param authenticationManager the {@link AuthenticationManager} to use when invoking * {@link HttpServletRequest#login(String, String)} */ - public void setAuthenticationManager(AuthenticationManager authenticationManager) { + void setAuthenticationManager(AuthenticationManager authenticationManager) { this.authenticationManager = authenticationManager; } @@ -144,7 +144,7 @@ final class HttpServlet3RequestFactory implements HttpServletRequestFactory { * @param logoutHandlers the {@code List}s when invoking * {@link HttpServletRequest#logout()}. */ - public void setLogoutHandlers(List logoutHandlers) { + void setLogoutHandlers(List logoutHandlers) { this.logoutHandlers = logoutHandlers; } @@ -154,7 +154,7 @@ final class HttpServlet3RequestFactory implements HttpServletRequestFactory { * @param trustResolver the {@link AuthenticationTrustResolver} to use. Cannot be * null. */ - public void setTrustResolver(AuthenticationTrustResolver trustResolver) { + void setTrustResolver(AuthenticationTrustResolver trustResolver) { Assert.notNull(trustResolver, "trustResolver cannot be null"); this.trustResolver = trustResolver; } diff --git a/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java index ebb95ceea6..2a3293e94a 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/DefaultLoginPageGeneratingFilterTests.java @@ -214,7 +214,7 @@ public class DefaultLoginPageGeneratingFilterTests { return null; } - public String getClaimedIdentityFieldName() { + String getClaimedIdentityFieldName() { return "unused"; } diff --git a/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java b/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java index ee0ba41e9b..2f35a7e449 100644 --- a/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/context/request/async/WebAsyncManagerIntegrationFilterTests.java @@ -137,7 +137,7 @@ public class WebAsyncManagerIntegrationFilterTests { return this.t; } - public void join() throws InterruptedException { + void join() throws InterruptedException { this.t.join(); } diff --git a/web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java b/web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java index 01976d0555..0f3c2edc97 100644 --- a/web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/csrf/CsrfFilterTests.java @@ -394,7 +394,7 @@ public class CsrfFilterTests { super(actual, CsrfTokenAssert.class); } - public CsrfTokenAssert isEqualTo(CsrfToken expected) { + CsrfTokenAssert isEqualTo(CsrfToken expected) { assertThat(this.actual.getHeaderName()).isEqualTo(expected.getHeaderName()); assertThat(this.actual.getParameterName()).isEqualTo(expected.getParameterName()); assertThat(this.actual.getToken()).isEqualTo(expected.getToken());