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 48050cab48e..17260480150 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 @@ -41,14 +41,14 @@ class AclClassIdUtils { private ConversionService conversionService; - public AclClassIdUtils() { + AclClassIdUtils() { GenericConversionService genericConversionService = new GenericConversionService(); genericConversionService.addConverter(String.class, Long.class, new StringToLongConverter()); genericConversionService.addConverter(String.class, UUID.class, new StringToUUIDConverter()); this.conversionService = genericConversionService; } - public AclClassIdUtils(ConversionService conversionService) { + AclClassIdUtils(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 153ba2492eb..ebd32632a7b 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 @@ -559,7 +559,7 @@ private class ProcessResultSet implements ResultSetExtractor> { private final Map acls; private final List sids; - public ProcessResultSet(Map acls, List sids) { + ProcessResultSet(Map acls, List sids) { Assert.notNull(acls, "ACLs cannot be null"); this.acls = acls; this.sids = sids; // can be null @@ -683,7 +683,7 @@ private void convertCurrentResultIntoObject(Map acls, private static class StubAclParent implements Acl { private final Long id; - public StubAclParent(Long id) { + StubAclParent(Long id) { this.id = id; } diff --git a/cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java b/cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java index f5fba44dcae..3085f92d95f 100644 --- a/cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java +++ b/cas/src/main/java/org/springframework/security/cas/jackson2/AssertionImplMixin.java @@ -55,8 +55,8 @@ class AssertionImplMixin { * @param attributes the key/value pairs for this attribute. */ @JsonCreator - public AssertionImplMixin(@JsonProperty("principal") AttributePrincipal principal, + AssertionImplMixin(@JsonProperty("principal") AttributePrincipal principal, @JsonProperty("validFromDate") Date validFromDate, @JsonProperty("validUntilDate") Date validUntilDate, @JsonProperty("authenticationDate") Date authenticationDate, @JsonProperty("attributes") Map attributes){ } -} \ No newline at end of file +} diff --git a/cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java b/cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java index ffb7ec4b6e3..ddc326704f6 100644 --- a/cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java +++ b/cas/src/main/java/org/springframework/security/cas/jackson2/AttributePrincipalImplMixin.java @@ -51,8 +51,8 @@ class AttributePrincipalImplMixin { * @param proxyRetriever the ProxyRetriever implementation to call back to the CAS server. */ @JsonCreator - public AttributePrincipalImplMixin(@JsonProperty("name") String name, @JsonProperty("attributes") Map attributes, + AttributePrincipalImplMixin(@JsonProperty("name") String name, @JsonProperty("attributes") Map attributes, @JsonProperty("proxyGrantingTicket") String proxyGrantingTicket, @JsonProperty("proxyRetriever") ProxyRetriever proxyRetriever) { } -} \ No newline at end of file +} diff --git a/cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java b/cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java index da909d9116d..dba9e0521ed 100644 --- a/cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java +++ b/cas/src/main/java/org/springframework/security/cas/jackson2/CasAuthenticationTokenMixin.java @@ -69,7 +69,7 @@ class CasAuthenticationTokenMixin { * principal and how to obtain a proxy ticket for the user. */ @JsonCreator - public CasAuthenticationTokenMixin(@JsonProperty("keyHash") Integer keyHash, @JsonProperty("principal") Object principal, + CasAuthenticationTokenMixin(@JsonProperty("keyHash") Integer keyHash, @JsonProperty("principal") Object principal, @JsonProperty("credentials") Object credentials, @JsonProperty("authorities") Collection authorities, @JsonProperty("userDetails") UserDetails userDetails, @JsonProperty("assertion") Assertion assertion) { diff --git a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java index cd91b84954a..7ff21e2480c 100644 --- a/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java +++ b/cas/src/main/java/org/springframework/security/cas/web/CasAuthenticationFilter.java @@ -415,7 +415,7 @@ private boolean proxyReceptorConfigured() { private class CasAuthenticationFailureHandler implements AuthenticationFailureHandler { private final AuthenticationFailureHandler serviceTicketFailureHandler; - public CasAuthenticationFailureHandler(AuthenticationFailureHandler failureHandler) { + CasAuthenticationFailureHandler(AuthenticationFailureHandler failureHandler) { Assert.notNull(failureHandler, "failureHandler"); this.serviceTicketFailureHandler = failureHandler; } @@ -432,4 +432,4 @@ public void onAuthenticationFailure(HttpServletRequest request, } } } -} \ No newline at end of file +} diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java index 37ff45557d5..230a29c0312 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java @@ -414,7 +414,7 @@ public void removeTicketFromCache(String serviceTicket) { private class MockTicketValidator implements TicketValidator { private boolean returnTicket; - public MockTicketValidator(boolean returnTicket) { + MockTicketValidator(boolean returnTicket) { this.returnTicket = returnTicket; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java index 9ee25268cf5..2e0567a817d 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java @@ -58,7 +58,7 @@ public abstract class AbstractConfiguredSecurityBuilder>, List>> configurers = new LinkedHashMap<>(); private final List> configurersAddedInInitializing = new ArrayList<>(); - private final Map, Object> sharedObjects = new HashMap<>(); + private final Map, Object> sharedObjects = new HashMap<>(); private final boolean allowConfigurersOfSameType; @@ -174,7 +174,7 @@ public C getSharedObject(Class sharedType) { * Gets the shared objects * @return the shared Objects */ - public Map, Object> getSharedObjects() { + public Map, Object> getSharedObjects() { return Collections.unmodifiableMap(this.sharedObjects); } @@ -409,7 +409,7 @@ private boolean isUnbuilt() { * @author Rob Winch * @since 3.2 */ - private static enum BuildState { + private enum BuildState { /** * This is the state before the {@link Builder#build()} is invoked */ diff --git a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java index a68dd2c409b..1d74d2c2022 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java @@ -111,7 +111,7 @@ public void setBuilder(B builder) { */ private static final class CompositeObjectPostProcessor implements ObjectPostProcessor { - private List> postProcessors = new ArrayList<>(); + private List> postProcessors = new ArrayList<>(); @SuppressWarnings({ "rawtypes", "unchecked" }) public Object postProcess(Object object) { @@ -132,7 +132,7 @@ public Object postProcess(Object object) { * @return true if the {@link ObjectPostProcessor} was added, else false */ private boolean addObjectPostProcessor( - ObjectPostProcessor objectPostProcessor) { + ObjectPostProcessor objectPostProcessor) { boolean result = this.postProcessors.add(objectPostProcessor); Collections.sort(postProcessors, AnnotationAwareOrderComparator.INSTANCE); return result; diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java index 56e0ecfd67f..17937f4402a 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java @@ -193,7 +193,7 @@ private static class EnableGlobalAuthenticationAutowiredConfigurer extends private static final Log logger = LogFactory .getLog(EnableGlobalAuthenticationAutowiredConfigurer.class); - public EnableGlobalAuthenticationAutowiredConfigurer(ApplicationContext context) { + EnableGlobalAuthenticationAutowiredConfigurer(ApplicationContext context) { this.context = context; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java index 555ba61ad9a..c24aa3ea24c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java @@ -42,7 +42,7 @@ class InitializeAuthenticationProviderBeanManagerConfigurer /** * @param context the ApplicationContext to look up beans. */ - public InitializeAuthenticationProviderBeanManagerConfigurer( + InitializeAuthenticationProviderBeanManagerConfigurer( ApplicationContext context) { this.context = context; } @@ -83,4 +83,4 @@ private T getBeanOrNull(Class type) { .getBean(userDetailsBeanNames[0], type); } } -} \ No newline at end of file +} diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java index 941ee9b2022..7266fbfa777 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java @@ -43,7 +43,7 @@ class InitializeUserDetailsBeanManagerConfigurer /** * @param context */ - public InitializeUserDetailsBeanManagerConfigurer(ApplicationContext context) { + InitializeUserDetailsBeanManagerConfigurer(ApplicationContext context) { this.context = context; } diff --git a/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java b/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java index 67e512fad43..a4c193b4a5e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java @@ -44,7 +44,7 @@ final class AutowireBeanFactoryObjectPostProcessor private final List disposableBeans = new ArrayList<>(); private final List smartSingletons = new ArrayList<>(); - public AutowireBeanFactoryObjectPostProcessor( + AutowireBeanFactoryObjectPostProcessor( AutowireCapableBeanFactory autowireBeanFactory) { Assert.notNull(autowireBeanFactory, "autowireBeanFactory cannot be null"); this.autowireBeanFactory = autowireBeanFactory; diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java index a27fbb24412..91aa83b20b2 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java @@ -241,7 +241,7 @@ protected RunAsManager runAsManager() { * @return the {@link AccessDecisionManager} to use */ protected AccessDecisionManager accessDecisionManager() { - List> decisionVoters = new ArrayList<>(); + List> decisionVoters = new ArrayList<>(); ExpressionBasedPreInvocationAdvice expressionAdvice = new ExpressionBasedPreInvocationAdvice(); expressionAdvice.setExpressionHandler(getExpressionHandler()); if (prePostEnabled()) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java index 70c3f7c8fb6..1ffa8256a2d 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java @@ -36,7 +36,7 @@ */ final class GlobalMethodSecuritySelector implements ImportSelector { - public final String[] selectImports(AnnotationMetadata importingClassMetadata) { + public String[] selectImports(AnnotationMetadata importingClassMetadata) { Class annoType = EnableGlobalMethodSecurity.class; Map annotationAttributes = importingClassMetadata .getAnnotationAttributes(annoType.getName(), false); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java index 69bc3ab70ce..cb713f9b5c7 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java @@ -138,11 +138,11 @@ public final class HttpSecurity extends @SuppressWarnings("unchecked") public HttpSecurity(ObjectPostProcessor objectPostProcessor, AuthenticationManagerBuilder authenticationBuilder, - Map, Object> sharedObjects) { + Map, Object> sharedObjects) { super(objectPostProcessor); Assert.notNull(authenticationBuilder, "authenticationBuilder cannot be null"); setSharedObject(AuthenticationManagerBuilder.class, authenticationBuilder); - for (Map.Entry, Object> entry : sharedObjects + for (Map.Entry, Object> entry : sharedObjects .entrySet()) { setSharedObject((Class) entry.getKey(), entry.getValue()); } 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 2e404968c2a..9195060ef1c 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 @@ -40,7 +40,7 @@ final class AutowiredWebSecurityConfigurersIgnoreParents { private final ConfigurableListableBeanFactory beanFactory; - public AutowiredWebSecurityConfigurersIgnoreParents( + AutowiredWebSecurityConfigurersIgnoreParents( ConfigurableListableBeanFactory beanFactory) { Assert.notNull(beanFactory, "beanFactory cannot be null"); this.beanFactory = beanFactory; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java index ecabda57c88..46e5fce86f8 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java @@ -201,7 +201,7 @@ protected final HttpSecurity getHttp() throws Exception { AuthenticationManager authenticationManager = authenticationManager(); authenticationBuilder.parentAuthenticationManager(authenticationManager); authenticationBuilder.authenticationEventPublisher(eventPublisher); - Map, Object> sharedObjects = createSharedObjects(); + Map, Object> sharedObjects = createSharedObjects(); http = new HttpSecurity(objectPostProcessor, authenticationBuilder, sharedObjects); @@ -412,8 +412,8 @@ public void setAuthenticationConfiguration( * * @return the shared Objects */ - private Map, Object> createSharedObjects() { - Map, Object> sharedObjects = new HashMap<>(); + private Map, Object> createSharedObjects() { + Map, Object> sharedObjects = new HashMap<>(); sharedObjects.putAll(localConfigureAuthenticationBldr.getSharedObjects()); sharedObjects.put(UserDetailsService.class, userDetailsService()); sharedObjects.put(ApplicationContext.class, context); 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 1a882c05f58..36f9f7b4811 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 @@ -108,7 +108,7 @@ public void configure(H http) throws Exception { * @return the {@link AccessDecisionVoter} instances used to create the default * {@link AccessDecisionManager} */ - abstract List> getDecisionVoters(H http); + abstract List> getDecisionVoters(H http); abstract class AbstractInterceptUrlRegistry, T> extends AbstractConfigAttributeRequestMatcherRegistry { @@ -195,4 +195,4 @@ private FilterSecurityInterceptor createFilterSecurityInterceptor(H http, securityInterceptor.afterPropertiesSet(); return securityInterceptor; } -} \ No newline at end of file +} diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java index dc2cd7200c6..d1df31e7f5b 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java @@ -183,8 +183,8 @@ private void interceptUrl(Iterable requestMatchers, @Override @SuppressWarnings("rawtypes") - final List> getDecisionVoters(H http) { - List> decisionVoters = new ArrayList<>(); + List> getDecisionVoters(H http) { + List> decisionVoters = new ArrayList<>(); WebExpressionVoter expressionVoter = new WebExpressionVoter(); expressionVoter.setExpressionHandler(getExpressionHandler(http)); decisionVoters.add(expressionVoter); @@ -192,7 +192,7 @@ final List> getDecisionVoters(H http) { } @Override - final ExpressionBasedFilterInvocationSecurityMetadataSource createMetadataSource( + ExpressionBasedFilterInvocationSecurityMetadataSource createMetadataSource( H http) { LinkedHashMap> requestMap = REGISTRY .createRequestMap(); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java index 6f68bc85f62..ec653cb5fbd 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java @@ -172,8 +172,8 @@ public H and() { */ @Override @SuppressWarnings("rawtypes") - final List> getDecisionVoters(H http) { - List> decisionVoters = new ArrayList<>(); + List> getDecisionVoters(H http) { + List> decisionVoters = new ArrayList<>(); decisionVoters.add(new RoleVoter()); decisionVoters.add(new AuthenticatedVoter()); return decisionVoters; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java index 97e43b27032..0bb45a614fc 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java @@ -159,7 +159,7 @@ public ChannelSecurityInterceptor inboundChannelSecurity(MessageSecurityMetadata MessageExpressionVoter voter = new MessageExpressionVoter<>(); voter.setExpressionHandler(getMessageExpressionHandler()); - List> voters = new ArrayList<>(); + List> voters = new ArrayList<>(); voters.add(voter); AffirmativeBased manager = new AffirmativeBased(voters); diff --git a/config/src/main/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessor.java b/config/src/main/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessor.java index c28d8db346d..b3cd7df87cd 100644 --- a/config/src/main/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessor.java @@ -133,7 +133,7 @@ private Converter pair(Converter one, Converter two) private static class ConverterPropertyEditorAdapter extends PropertyEditorSupport { private final Converter converter; - public ConverterPropertyEditorAdapter(Converter converter) { + ConverterPropertyEditorAdapter(Converter converter) { this.converter = converter; } diff --git a/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java b/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java index 15734b8e5eb..8489553f8ff 100644 --- a/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java +++ b/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java @@ -138,7 +138,7 @@ final class AuthenticationConfigBuilder { private String openIDLoginPage; - public AuthenticationConfigBuilder(Element element, boolean forceAutoConfig, + AuthenticationConfigBuilder(Element element, boolean forceAutoConfig, ParserContext pc, SessionCreationPolicy sessionPolicy, BeanReference requestCache, BeanReference authenticationManager, BeanReference sessionStrategy, BeanReference portMapper, diff --git a/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java b/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java index cdaf09b7bd4..24eb66974ed 100644 --- a/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java +++ b/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java @@ -152,7 +152,7 @@ class HttpConfigurationBuilder { private BeanDefinition invalidSession; private boolean addAllAuth; - public HttpConfigurationBuilder(Element element, boolean addAllAuth, + HttpConfigurationBuilder(Element element, boolean addAllAuth, ParserContext pc, BeanReference portMapper, BeanReference portResolver, BeanReference authenticationManager) { this.httpElt = element; 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 9506d3089be..fc3c4bbd764 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 @@ -415,12 +415,12 @@ class OrderDecorator implements Ordered { final BeanMetadataElement bean; final int order; - public OrderDecorator(BeanMetadataElement bean, SecurityFilters filterOrder) { + OrderDecorator(BeanMetadataElement bean, SecurityFilters filterOrder) { this.bean = bean; this.order = filterOrder.getOrder(); } - public OrderDecorator(BeanMetadataElement bean, int order) { + OrderDecorator(BeanMetadataElement bean, int order) { this.bean = bean; this.order = order; } diff --git a/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java index 3f070267a19..f694d6f3614 100644 --- a/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java @@ -48,7 +48,7 @@ class LogoutBeanDefinitionParser implements BeanDefinitionParser { private ManagedList logoutHandlers = new ManagedList<>(); private boolean csrfEnabled; - public LogoutBeanDefinitionParser(String loginPageUrl, String rememberMeServices, + LogoutBeanDefinitionParser(String loginPageUrl, String rememberMeServices, BeanMetadataElement csrfLogoutHandler) { this.defaultLogoutUrl = loginPageUrl + "?logout"; this.rememberMeServices = rememberMeServices; diff --git a/config/src/main/java/org/springframework/security/config/http/SecurityFilters.java b/config/src/main/java/org/springframework/security/config/http/SecurityFilters.java index 59a61121563..3c8d1561ccd 100644 --- a/config/src/main/java/org/springframework/security/config/http/SecurityFilters.java +++ b/config/src/main/java/org/springframework/security/config/http/SecurityFilters.java @@ -58,11 +58,11 @@ enum SecurityFilters { private static final int INTERVAL = 100; private final int order; - private SecurityFilters() { + SecurityFilters() { order = ordinal() * INTERVAL; } - private SecurityFilters(int order) { + SecurityFilters(int order) { this.order = order; } diff --git a/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java b/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java index 454d6835f07..1164a9682a8 100644 --- a/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java @@ -68,7 +68,7 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor { private final PointcutParser parser; private final Set processedBeans = new HashSet<>(); - public ProtectPointcutPostProcessor( + ProtectPointcutPostProcessor( MapBasedMethodSecurityMetadataSource mapBasedMethodSecurityMetadataSource) { Assert.notNull(mapBasedMethodSecurityMetadataSource, "MapBasedMethodSecurityMetadataSource to populate is required"); diff --git a/config/src/main/java/org/springframework/security/config/web/server/SecurityWebFiltersOrder.java b/config/src/main/java/org/springframework/security/config/web/server/SecurityWebFiltersOrder.java index 3a3b91b8504..4078ff5deba 100644 --- a/config/src/main/java/org/springframework/security/config/web/server/SecurityWebFiltersOrder.java +++ b/config/src/main/java/org/springframework/security/config/web/server/SecurityWebFiltersOrder.java @@ -72,11 +72,11 @@ public enum SecurityWebFiltersOrder { private final int order; - private SecurityWebFiltersOrder() { + SecurityWebFiltersOrder() { this.order = ordinal() * INTERVAL; } - private SecurityWebFiltersOrder(int order) { + SecurityWebFiltersOrder(int order) { this.order = order; } diff --git a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java index d708855cacc..40caf32841b 100644 --- a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java @@ -3645,7 +3645,7 @@ private static class OrderedWebFilter implements WebFilter, Ordered { private final WebFilter webFilter; private final int order; - public OrderedWebFilter(WebFilter webFilter, int order) { + OrderedWebFilter(WebFilter webFilter, int order) { this.webFilter = webFilter; this.order = order; } diff --git a/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java index e0006ab3d89..24fe2003dcc 100644 --- a/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java @@ -243,8 +243,7 @@ static class MessageSecurityPostProcessor implements private final boolean sameOriginDisabled; - public MessageSecurityPostProcessor(String inboundSecurityInterceptorId, - boolean sameOriginDisabled) { + MessageSecurityPostProcessor(String inboundSecurityInterceptorId, boolean sameOriginDisabled) { this.inboundSecurityInterceptorId = inboundSecurityInterceptorId; this.sameOriginDisabled = sameOriginDisabled; } diff --git a/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterTests.java b/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterTests.java index d28b24a5ecb..2b01f0137ff 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterTests.java @@ -41,7 +41,7 @@ public void postProcessObjectPostProcessorsAreSorted() { static class OrderedObjectPostProcessor implements ObjectPostProcessor, Ordered { private final int order; - public OrderedObjectPostProcessor(int order) { + OrderedObjectPostProcessor(int order) { this.order = order; } 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 cda09431f12..4f7844ca69e 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 @@ -847,7 +847,7 @@ protected SecurityExpressionOperations createSecurityExpressionRoot( static class CustomExpressionRoot extends WebSecurityExpressionRoot { - public CustomExpressionRoot(Authentication a, FilterInvocation fi) { + CustomExpressionRoot(Authentication a, FilterInvocation fi) { super(a, fi); } diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpExpressionHandlerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpExpressionHandlerTests.java index f4868cca3c4..c0318095543 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpExpressionHandlerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpExpressionHandlerTests.java @@ -73,7 +73,7 @@ public void getWhenHasCustomExpressionHandlerThenMatchesNamespace() throws Excep @EnableWebMvc @EnableWebSecurity private static class ExpressionHandlerConfig extends WebSecurityConfigurerAdapter { - public ExpressionHandlerConfig() {} + ExpressionHandlerConfig() {} @Override protected void configure(AuthenticationManagerBuilder auth) throws Exception { diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java index 142f4009a4a..6d2b21c65e5 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java @@ -129,7 +129,7 @@ public void securityContextWhenSecurityContextRepositoryNotConfiguredThenDoesNot @Configuration @EnableWebSecurity static class SecurityContextRepositoryDefaultsSecurityContextRepositoryConfig extends WebSecurityConfigurerAdapter { - public SecurityContextRepositoryDefaultsSecurityContextRepositoryConfig() { + SecurityContextRepositoryDefaultsSecurityContextRepositoryConfig() { super(true); } 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 ccf8e67897a..ee1e10997dd 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 @@ -2133,7 +2133,7 @@ public MockWebServer web() { private class MockWebServerPropertySource extends PropertySource { - public MockWebServerPropertySource() { + MockWebServerPropertySource() { super("mockwebserver"); } @@ -2178,7 +2178,7 @@ private static class BearerTokenRequestPostProcessor implements RequestPostProce private String token; - public BearerTokenRequestPostProcessor(String token) { + BearerTokenRequestPostProcessor(String token) { this.token = token; } diff --git a/config/src/test/java/org/springframework/security/config/http/CsrfConfigTests.java b/config/src/test/java/org/springframework/security/config/http/CsrfConfigTests.java index d7ff34c4810..d98f89227fd 100644 --- a/config/src/test/java/org/springframework/security/config/http/CsrfConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/CsrfConfigTests.java @@ -631,7 +631,7 @@ public void match(MvcResult result) throws Exception { static class CsrfReturnedResultMatcher implements ResultMatcher { ExceptionalFunction token; - public CsrfReturnedResultMatcher(ExceptionalFunction token) { + CsrfReturnedResultMatcher(ExceptionalFunction token) { this.token = token; } diff --git a/config/src/test/java/org/springframework/security/config/http/HttpConfigTests.java b/config/src/test/java/org/springframework/security/config/http/HttpConfigTests.java index 7f5de782066..f0da65eac7f 100644 --- a/config/src/test/java/org/springframework/security/config/http/HttpConfigTests.java +++ b/config/src/test/java/org/springframework/security/config/http/HttpConfigTests.java @@ -83,7 +83,7 @@ public void getWhenUsingMinimalConfigurationThenPreventsSessionAsUrlParameter() private static class EncodeUrlDenyingHttpServletResponseWrapper extends HttpServletResponseWrapper { - public EncodeUrlDenyingHttpServletResponseWrapper(HttpServletResponse response) { + EncodeUrlDenyingHttpServletResponseWrapper(HttpServletResponse response) { super(response); } 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 44b1da6261d..d42c37f15b9 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 @@ -907,7 +907,7 @@ public Authentication authenticate(Authentication authentication) { static class EncodeUrlDenyingHttpServletResponseWrapper extends HttpServletResponseWrapper { - public EncodeUrlDenyingHttpServletResponseWrapper(HttpServletResponse response) { + EncodeUrlDenyingHttpServletResponseWrapper(HttpServletResponse response) { super(response); } 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 0756f5edf7a..0adc2d66d94 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 @@ -610,7 +610,7 @@ private static MockHttpServletResponse request( private static class EncodeUrlDenyingHttpServletResponseWrapper extends HttpServletResponseWrapper { - public EncodeUrlDenyingHttpServletResponseWrapper(HttpServletResponse response) { + EncodeUrlDenyingHttpServletResponseWrapper(HttpServletResponse response) { super(response); } 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 8798b9b68cc..4543deaae4f 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 @@ -51,7 +51,7 @@ final class HtmlUnitWebTestClient { private final WebTestClient webTestClient; - public HtmlUnitWebTestClient(WebClient webClient, WebTestClient webTestClient) { + HtmlUnitWebTestClient(WebClient webClient, WebTestClient webTestClient) { Assert.notNull(webClient, "WebClient must not be null"); Assert.notNull(webTestClient, "WebTestClient must not be null"); this.webClient = webClient; 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 4b1078a8a03..e2c37fe390f 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 @@ -42,7 +42,7 @@ final class MockWebResponseBuilder { private final FluxExchangeResult exchangeResult; - public MockWebResponseBuilder(long startTime, WebRequest webRequest, FluxExchangeResult exchangeResult) { + MockWebResponseBuilder(long startTime, WebRequest webRequest, FluxExchangeResult exchangeResult) { Assert.notNull(webRequest, "WebRequest must not be null"); Assert.notNull(exchangeResult, "FluxExchangeResult must not be null"); this.startTime = startTime; diff --git a/core/src/main/java/org/springframework/security/access/annotation/Secured.java b/core/src/main/java/org/springframework/security/access/annotation/Secured.java index 5afc7c98804..28d509ed165 100644 --- a/core/src/main/java/org/springframework/security/access/annotation/Secured.java +++ b/core/src/main/java/org/springframework/security/access/annotation/Secured.java @@ -55,5 +55,5 @@ * * @return String[] The secure method attributes */ - public String[] value(); + String[] value(); } diff --git a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java index 791af548ae9..c28845a296f 100644 --- a/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java +++ b/core/src/main/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContext.java @@ -48,11 +48,11 @@ class MethodSecurityEvaluationContext extends StandardEvaluationContext { * for each instance. Use the constructor which takes the resolver, as an argument * thus allowing for caching. */ - public MethodSecurityEvaluationContext(Authentication user, MethodInvocation mi) { + MethodSecurityEvaluationContext(Authentication user, MethodInvocation mi) { this(user, mi, new DefaultSecurityParameterNameDiscoverer()); } - public MethodSecurityEvaluationContext(Authentication user, MethodInvocation mi, + MethodSecurityEvaluationContext(Authentication user, MethodInvocation mi, ParameterNameDiscoverer parameterNameDiscoverer) { this.mi = mi; this.parameterNameDiscoverer = parameterNameDiscoverer; diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java index bd9915af0dd..5ab09dda7b2 100755 --- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java +++ b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchy.java @@ -40,7 +40,7 @@ public interface RoleHierarchy { * @param authorities - List of the directly assigned authorities. * @return List of all reachable authorities given the assigned authorities. */ - public Collection getReachableGrantedAuthorities( + Collection getReachableGrantedAuthorities( Collection authorities); } diff --git a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java index a006cc3e1ba..9d85983e334 100644 --- a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java @@ -116,7 +116,7 @@ private static class DefaultCacheKey { private final Method method; private final Class targetClass; - public DefaultCacheKey(Method method, Class targetClass) { + DefaultCacheKey(Method method, Class targetClass) { this.method = method; this.targetClass = targetClass; } diff --git a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java index 7a67fd002d4..df79e47b1e1 100644 --- a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java @@ -287,7 +287,7 @@ private static class RegisteredMethod { private final Method method; private final Class registeredJavaType; - public RegisteredMethod(Method method, Class registeredJavaType) { + RegisteredMethod(Method method, Class registeredJavaType) { Assert.notNull(method, "Method required"); Assert.notNull(registeredJavaType, "Registered Java Type required"); this.method = method; diff --git a/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java index 4a47d183b51..adfc739ed71 100644 --- a/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/MethodSecurityMetadataSource.java @@ -29,5 +29,5 @@ * @author Ben Alex */ public interface MethodSecurityMetadataSource extends SecurityMetadataSource { - public Collection getAttributes(Method method, Class targetClass); + Collection getAttributes(Method method, Class targetClass); } diff --git a/core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java b/core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java index 80936dd5d14..18e5abe644d 100644 --- a/core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java +++ b/core/src/main/java/org/springframework/security/access/prepost/PostAuthorize.java @@ -38,5 +38,5 @@ * @return the Spring-EL expression to be evaluated after invoking the protected * method */ - public String value(); + String value(); } diff --git a/core/src/main/java/org/springframework/security/access/prepost/PostFilter.java b/core/src/main/java/org/springframework/security/access/prepost/PostFilter.java index 24c164f2b09..73efa4ad3b4 100644 --- a/core/src/main/java/org/springframework/security/access/prepost/PostFilter.java +++ b/core/src/main/java/org/springframework/security/access/prepost/PostFilter.java @@ -38,5 +38,5 @@ * @return the Spring-EL expression to be evaluated after invoking the protected * method */ - public String value(); + String value(); } diff --git a/core/src/main/java/org/springframework/security/access/prepost/PreFilter.java b/core/src/main/java/org/springframework/security/access/prepost/PreFilter.java index 4343b0b562b..0432936576e 100644 --- a/core/src/main/java/org/springframework/security/access/prepost/PreFilter.java +++ b/core/src/main/java/org/springframework/security/access/prepost/PreFilter.java @@ -50,12 +50,12 @@ * @return the Spring-EL expression to be evaluated before invoking the protected * method */ - public String value(); + String value(); /** * @return the name of the parameter which should be filtered (must be a non-null * collection instance) If the method contains a single collection argument, then this * attribute can be omitted. */ - public String filterTarget() default ""; + String filterTarget() default ""; } diff --git a/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java index f8c7cb362d7..e68629ab935 100644 --- a/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java +++ b/core/src/main/java/org/springframework/security/access/vote/AbstractAccessDecisionManager.java @@ -45,14 +45,14 @@ public abstract class AbstractAccessDecisionManager implements AccessDecisionMan // ================================================================================================ protected final Log logger = LogFactory.getLog(getClass()); - private List> decisionVoters; + private List> decisionVoters; protected MessageSourceAccessor messages = SpringSecurityMessageSource.getAccessor(); private boolean allowIfAllAbstainDecisions = false; protected AbstractAccessDecisionManager( - List> decisionVoters) { + List> decisionVoters) { Assert.notEmpty(decisionVoters, "A list of AccessDecisionVoters is required"); this.decisionVoters = decisionVoters; } @@ -72,7 +72,7 @@ protected final void checkAllowIfAllAbstainDecisions() { } } - public List> getDecisionVoters() { + public List> getDecisionVoters() { return this.decisionVoters; } diff --git a/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java b/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java index 3f685421104..30f27da0228 100644 --- a/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/AffirmativeBased.java @@ -30,7 +30,7 @@ */ public class AffirmativeBased extends AbstractAccessDecisionManager { - public AffirmativeBased(List> decisionVoters) { + public AffirmativeBased(List> decisionVoters) { super(decisionVoters); } diff --git a/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java b/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java index 7e97ba342db..2b4be013a36 100644 --- a/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/ConsensusBased.java @@ -38,7 +38,7 @@ public class ConsensusBased extends AbstractAccessDecisionManager { private boolean allowIfEqualGrantedDeniedDecisions = true; - public ConsensusBased(List> decisionVoters) { + public ConsensusBased(List> decisionVoters) { super(decisionVoters); } diff --git a/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java index aeb33ba3048..af7f8eae9d2 100644 --- a/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java @@ -32,7 +32,7 @@ */ public class UnanimousBased extends AbstractAccessDecisionManager { - public UnanimousBased(List> decisionVoters) { + public UnanimousBased(List> decisionVoters) { super(decisionVoters); } diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java index 1b92dceb280..54552a1e0f7 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java @@ -402,7 +402,7 @@ protected ApplicationEventPublisher getApplicationEventPublisher() { private class InternalCallbackHandler implements CallbackHandler { private final Authentication authentication; - public InternalCallbackHandler(Authentication authentication) { + InternalCallbackHandler(Authentication authentication) { this.authentication = authentication; } diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java index 02afea9cb97..f58fc68989d 100644 --- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java +++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextScheduledExecutorService.java @@ -61,24 +61,24 @@ public DelegatingSecurityContextScheduledExecutorService( this(delegate, null); } - public final ScheduledFuture schedule(Runnable command, long delay, TimeUnit unit) { + public ScheduledFuture schedule(Runnable command, long delay, TimeUnit unit) { command = wrap(command); return getDelegate().schedule(command, delay, unit); } - public final ScheduledFuture schedule(Callable callable, long delay, + public ScheduledFuture schedule(Callable callable, long delay, TimeUnit unit) { callable = wrap(callable); return getDelegate().schedule(callable, delay, unit); } - public final ScheduledFuture scheduleAtFixedRate(Runnable command, + public ScheduledFuture scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit) { command = wrap(command); return getDelegate().scheduleAtFixedRate(command, initialDelay, period, unit); } - public final ScheduledFuture scheduleWithFixedDelay(Runnable command, + public ScheduledFuture scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit) { command = wrap(command); return getDelegate().scheduleWithFixedDelay(command, initialDelay, delay, unit); @@ -87,4 +87,4 @@ public final ScheduledFuture scheduleWithFixedDelay(Runnable command, private ScheduledExecutorService getDelegate() { return (ScheduledExecutorService) getDelegateExecutor(); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/springframework/security/core/ComparableVersion.java b/core/src/main/java/org/springframework/security/core/ComparableVersion.java index 9be62fc8e05..e5b6f247c23 100644 --- a/core/src/main/java/org/springframework/security/core/ComparableVersion.java +++ b/core/src/main/java/org/springframework/security/core/ComparableVersion.java @@ -92,9 +92,9 @@ class ComparableVersion implements Comparable { private ListItem items; private interface Item { - final int INTEGER_ITEM = 0; - final int STRING_ITEM = 1; - final int LIST_ITEM = 2; + int INTEGER_ITEM = 0; + int STRING_ITEM = 1; + int LIST_ITEM = 2; int compareTo(Item item); @@ -117,7 +117,7 @@ private IntegerItem() { this.value = BigInteger_ZERO; } - public IntegerItem(String str) { + IntegerItem(String str) { this.value = new BigInteger(str); } @@ -184,7 +184,7 @@ private static class StringItem implements Item { private String value; - public StringItem(String value, boolean followedByDigit) { + StringItem(String value, boolean followedByDigit) { if (followedByDigit && value.length() == 1) { // a1 = alpha-1, b1 = beta-1, m1 = milestone-1 switch (value.charAt(0)) { @@ -341,7 +341,7 @@ public String toString() { } } - public ComparableVersion(String version) { + ComparableVersion(String version) { parseVersion(version); } diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java index 4782038e135..a375df225d5 100755 --- a/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java +++ b/core/src/main/java/org/springframework/security/core/authority/mapping/Attributes2GrantedAuthoritiesMapper.java @@ -37,6 +37,6 @@ public interface Attributes2GrantedAuthoritiesMapper { * @param attributes the attributes to be mapped * @return the collection of authorities created from the attributes */ - public Collection getGrantedAuthorities( + Collection getGrantedAuthorities( Collection attributes); } diff --git a/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java b/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java index 3e2b2ef82a4..4896e9d4b34 100644 --- a/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java +++ b/core/src/main/java/org/springframework/security/core/token/KeyBasedPersistenceTokenService.java @@ -83,7 +83,7 @@ public Token allocateToken(String extendedInformation) { long creationTime = new Date().getTime(); String serverSecret = computeServerSecretApplicableAt(creationTime); String pseudoRandomNumber = generatePseudoRandomNumber(); - String content = Long.toString(creationTime) + ":" + pseudoRandomNumber + ":" + String content = creationTime + ":" + pseudoRandomNumber + ":" + extendedInformation; // Compute key @@ -126,7 +126,7 @@ public Token verifyToken(String key) { String sha1Hex = tokens[tokens.length - 1]; // Verification - String content = Long.toString(creationTime) + ":" + pseudoRandomNumber + ":" + String content = creationTime + ":" + pseudoRandomNumber + ":" + extendedInfo.toString(); String expectedSha512Hex = Sha512DigestUtils.shaHex(content + ":" + serverSecret); Assert.isTrue(expectedSha512Hex.equals(sha1Hex), "Key verification failure"); diff --git a/core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java b/core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java index e0620d27179..02ad8851f44 100644 --- a/core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/AnonymousAuthenticationTokenMixin.java @@ -53,7 +53,7 @@ class AnonymousAuthenticationTokenMixin { * @param authorities the authorities granted to the principal */ @JsonCreator - public AnonymousAuthenticationTokenMixin(@JsonProperty("keyHash") Integer keyHash, @JsonProperty("principal") Object principal, + AnonymousAuthenticationTokenMixin(@JsonProperty("keyHash") Integer keyHash, @JsonProperty("principal") Object principal, @JsonProperty("authorities") Collection authorities) { } } diff --git a/core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java b/core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java index 98ff3558ce5..3274a2c7791 100644 --- a/core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java +++ b/core/src/main/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixin.java @@ -59,7 +59,7 @@ class RememberMeAuthenticationTokenMixin { * @param authorities the authorities granted to the principal */ @JsonCreator - public RememberMeAuthenticationTokenMixin(@JsonProperty("keyHash") Integer keyHash, + RememberMeAuthenticationTokenMixin(@JsonProperty("keyHash") Integer keyHash, @JsonProperty("principal") Object principal, @JsonProperty("authorities") Collection authorities) { } diff --git a/core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java b/core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java index c847b11f4b2..ef59d0a53e6 100644 --- a/core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java +++ b/core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java @@ -152,7 +152,7 @@ private static TypeResolverBuilder createWhitelis */ static class WhitelistTypeResolverBuilder extends ObjectMapper.DefaultTypeResolverBuilder { - public WhitelistTypeResolverBuilder(ObjectMapper.DefaultTyping defaultTyping) { + WhitelistTypeResolverBuilder(ObjectMapper.DefaultTyping defaultTyping) { super(defaultTyping); } diff --git a/core/src/main/java/org/springframework/security/provisioning/MutableUser.java b/core/src/main/java/org/springframework/security/provisioning/MutableUser.java index d8d823202c2..04d62b42fc8 100644 --- a/core/src/main/java/org/springframework/security/provisioning/MutableUser.java +++ b/core/src/main/java/org/springframework/security/provisioning/MutableUser.java @@ -33,7 +33,7 @@ class MutableUser implements MutableUserDetails { private String password; private final UserDetails delegate; - public MutableUser(UserDetails user) { + MutableUser(UserDetails user) { this.delegate = user; this.password = user.getPassword(); } diff --git a/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java b/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java index 736b3ffb24f..0d44a8b5763 100644 --- a/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java +++ b/core/src/test/java/org/springframework/security/access/SecurityConfigTests.java @@ -92,7 +92,7 @@ public void testToString() { private class MockConfigAttribute implements ConfigAttribute { private String attribute; - public MockConfigAttribute(String configuration) { + MockConfigAttribute(String configuration) { this.attribute = configuration; } diff --git a/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java b/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java index b26b20a7b9a..2494083b2ef 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java +++ b/core/src/test/java/org/springframework/security/access/annotation/BusinessService.java @@ -35,31 +35,31 @@ public interface BusinessService extends Serializable { @Secured({ "ROLE_ADMIN" }) @RolesAllowed({ "ROLE_ADMIN" }) @PreAuthorize("hasRole('ROLE_ADMIN')") - public void someAdminMethod(); + void someAdminMethod(); @Secured({ "ROLE_USER", "ROLE_ADMIN" }) @RolesAllowed({ "ROLE_USER", "ROLE_ADMIN" }) - public void someUserAndAdminMethod(); + void someUserAndAdminMethod(); @Secured({ "ROLE_USER" }) @RolesAllowed({ "ROLE_USER" }) - public void someUserMethod1(); + void someUserMethod1(); @Secured({ "ROLE_USER" }) @RolesAllowed({ "ROLE_USER" }) - public void someUserMethod2(); + void someUserMethod2(); @RolesAllowed({ "USER" }) - public void rolesAllowedUser(); + void rolesAllowedUser(); - public int someOther(String s); + int someOther(String s); - public int someOther(int input); + int someOther(int input); - public List methodReturningAList(List someList); + List methodReturningAList(List someList); - public Object[] methodReturningAnArray(Object[] someArray); + Object[] methodReturningAnArray(Object[] someArray); - public List methodReturningAList(String userName, String extraParam); + List methodReturningAList(String userName, String extraParam); } diff --git a/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java index a54c7f0f6e0..d8cd444d34f 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java @@ -218,7 +218,7 @@ public void proxyFactoryInterfaceAttributesFound() throws Exception { // Inner classes class Department extends Entity { - public Department(String name) { + Department(String name) { super(name); } } @@ -285,15 +285,15 @@ public Collection extractAttributes( public @interface AnnotatedAnnotation { } - public static interface ReturnVoid { + public interface ReturnVoid { - public void doSomething(List param); + void doSomething(List param); } @AnnotatedAnnotation - public static interface ReturnVoid2 { + public interface ReturnVoid2 { - public void doSomething(List param); + void doSomething(List param); } @AnnotatedAnnotation diff --git a/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java b/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java index dd4e5a382fc..18d7e9f787f 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/MethodSecurityEvaluationContextTests.java @@ -58,7 +58,7 @@ public void lookupVariableWhenParameterNameNullThenNotSet() { private static class NotNullVariableMethodSecurityEvaluationContext extends MethodSecurityEvaluationContext { - public NotNullVariableMethodSecurityEvaluationContext(Authentication auth, MethodInvocation mi, + NotNullVariableMethodSecurityEvaluationContext(Authentication auth, MethodInvocation mi, ParameterNameDiscoverer parameterNameDiscoverer) { super(auth, mi, parameterNameDiscoverer); } diff --git a/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java b/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java index 38a1d33e32b..27eed45a8dc 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/PrePostAnnotationSecurityMetadataSourceTests.java @@ -203,19 +203,19 @@ public void proxyFactoryInterfaceAttributesFound() throws Exception { // ~ Inner Classes // ================================================================================================== - public static interface ReturnVoid { - public void doSomething(List param); + public interface ReturnVoid { + void doSomething(List param); } - public static interface ReturnAList { - public List doSomething(List param); + public interface ReturnAList { + List doSomething(List param); } @PreAuthorize("interfaceAuthzExpression") - public static interface ReturnAnotherList { + public interface ReturnAnotherList { @PreAuthorize("interfaceMethodAuthzExpression") @PreFilter(filterTarget = "param", value = "interfacePreFilterExpression") - public List doSomething(List param); + List doSomething(List param); } @PreAuthorize("someExpression") @@ -275,8 +275,8 @@ public List doSomething(List param) { } @CustomAnnotation - public static interface ReturnVoid2 { - public void doSomething(List param); + public interface ReturnVoid2 { + void doSomething(List param); } @CustomAnnotation diff --git a/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java b/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java index 9e045b97ad9..90ce27038c6 100644 --- a/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java +++ b/core/src/test/java/org/springframework/security/access/intercept/AfterInvocationProviderManagerTests.java @@ -179,8 +179,7 @@ private class MockAfterInvocationProvider implements AfterInvocationProvider { private Object forceReturnObject; - public MockAfterInvocationProvider(Object forceReturnObject, Class secureObject, - ConfigAttribute configAttribute) { + MockAfterInvocationProvider(Object forceReturnObject, Class secureObject, ConfigAttribute configAttribute) { this.forceReturnObject = forceReturnObject; this.secureObject = secureObject; this.configAttribute = configAttribute; diff --git a/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java index dc84fcb3d21..dc6b6db183e 100644 --- a/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/AbstractAuthenticationTokenTests.java @@ -156,8 +156,7 @@ private class MockAuthenticationImpl extends AbstractAuthenticationToken { private Object credentials; private Object principal; - public MockAuthenticationImpl(Object principal, Object credentials, - List authorities) { + MockAuthenticationImpl(Object principal, Object credentials, List authorities) { super(authorities); this.principal = principal; this.credentials = credentials; diff --git a/core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java b/core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java index ce7d2cd29cf..fc7866e15c7 100644 --- a/core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java +++ b/core/src/test/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisherTests.java @@ -139,7 +139,7 @@ public void unknownFailureExceptionIsIgnored() throws Exception { private static final class MockAuthenticationException extends AuthenticationException { - public MockAuthenticationException(String msg) { + MockAuthenticationException(String msg) { super(msg); } } diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java index eb44e0b0576..ad1ff88ebc6 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/JaasAuthenticationProviderTests.java @@ -290,7 +290,7 @@ public void testUnsupportedAuthenticationObjectReturnsNull() { private static class MockLoginContext extends LoginContext { boolean loggedOut = false; - public MockLoginContext(String loginModule) throws LoginException { + MockLoginContext(String loginModule) throws LoginException { super(loginModule); } diff --git a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java index 2d3efd1c415..c66f3b503f8 100644 --- a/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rcp/RemoteAuthenticationProviderTests.java @@ -119,7 +119,7 @@ public void testSupports() { private class MockRemoteAuthenticationManager implements RemoteAuthenticationManager { private boolean grantAccess; - public MockRemoteAuthenticationManager(boolean grantAccess) { + MockRemoteAuthenticationManager(boolean grantAccess) { this.grantAccess = grantAccess; } diff --git a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java index a3260ab3404..f18ecb1c9ce 100644 --- a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextSupportTests.java @@ -62,8 +62,8 @@ public void wrapRunnableNullSecurityContext() throws Exception { private static class ConcreteDelegatingSecurityContextSupport extends AbstractDelegatingSecurityContextSupport { - public ConcreteDelegatingSecurityContextSupport(SecurityContext securityContext) { + ConcreteDelegatingSecurityContextSupport(SecurityContext securityContext) { super(securityContext); } } -} \ No newline at end of file +} diff --git a/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java b/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java index 81d435eb11c..e3b5cf58911 100644 --- a/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java +++ b/core/src/test/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscovererTests.java @@ -78,13 +78,13 @@ public void getParameterNamesClassNoAnnotation() { @Test public void getParameterNamesConstructor() throws Exception { - assertThat(discoverer.getParameterNames(Impl.class.getConstructor(String.class))) + assertThat(discoverer.getParameterNames(Impl.class.getDeclaredConstructor(String.class))) .isEqualTo(new String[] { "id" }); } @Test public void getParameterNamesConstructorNoAnnotation() throws Exception { - assertThat(discoverer.getParameterNames(Impl.class.getConstructor(Long.class))) + assertThat(discoverer.getParameterNames(Impl.class.getDeclaredConstructor(Long.class))) .isNull(); } @@ -148,10 +148,10 @@ public String findMessageByToAndFrom(@P("to") String to, @P("from") String from) } static class Impl { - public Impl(Long dataSourceId) { + Impl(Long dataSourceId) { } - public Impl(@P("id") String dataSourceId) { + Impl(@P("id") String dataSourceId) { } String findMessageByTo(@P("to") String to) { diff --git a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java index f6c677057ba..59ea9bb0590 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java +++ b/crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java @@ -13,7 +13,6 @@ // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. package org.springframework.security.crypto.bcrypt; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.util.Arrays; @@ -486,7 +485,7 @@ static byte[] decode_base64(String s, int maxolen) * @param lr an array containing the two 32-bit half blocks * @param off the position in the array of the blocks */ - private final void encipher(int lr[], int off) { + private void encipher(int lr[], int off) { int i, n, l = lr[off], r = lr[off + 1]; l ^= P[0]; @@ -733,11 +732,7 @@ private byte[] crypt_raw(byte password[], byte salt[], int log_rounds, public static String hashpw(String password, String salt) { byte passwordb[]; - try { - passwordb = password.getBytes("UTF-8"); - } catch (UnsupportedEncodingException uee) { - throw new AssertionError("UTF-8 is not supported"); - } + passwordb = password.getBytes(StandardCharsets.UTF_8); return hashpw(passwordb, salt); } diff --git a/crypto/src/main/java/org/springframework/security/crypto/codec/Utf8.java b/crypto/src/main/java/org/springframework/security/crypto/codec/Utf8.java index 1fe58f33d25..a2274fa75d4 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/codec/Utf8.java +++ b/crypto/src/main/java/org/springframework/security/crypto/codec/Utf8.java @@ -19,6 +19,7 @@ import java.nio.CharBuffer; import java.nio.charset.CharacterCodingException; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; /** * UTF-8 Charset encoder/decoder. @@ -28,7 +29,7 @@ * @author Luke Taylor */ public final class Utf8 { - private static final Charset CHARSET = Charset.forName("UTF-8"); + private static final Charset CHARSET = StandardCharsets.UTF_8; /** * Get the bytes of the String in UTF-8 encoded form. diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java index b6b3d9cb487..2d0008e0a13 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java +++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java @@ -65,7 +65,7 @@ public enum CipherAlgorithm { private BytesKeyGenerator ivGenerator; private String name; - private CipherAlgorithm(String name, BytesKeyGenerator ivGenerator) { + CipherAlgorithm(String name, BytesKeyGenerator ivGenerator) { this.name = name; this.ivGenerator = ivGenerator; } diff --git a/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java b/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java index 150572500c7..a4ed4c86994 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java +++ b/crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java @@ -28,7 +28,7 @@ final class HexEncodingTextEncryptor implements TextEncryptor { private final BytesEncryptor encryptor; - public HexEncodingTextEncryptor(BytesEncryptor encryptor) { + HexEncodingTextEncryptor(BytesEncryptor encryptor) { this.encryptor = encryptor; } diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java index bbe47b69613..005a8e6e63a 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java +++ b/crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java @@ -26,7 +26,7 @@ final class HexEncodingStringKeyGenerator implements StringKeyGenerator { private final BytesKeyGenerator keyGenerator; - public HexEncodingStringKeyGenerator(BytesKeyGenerator keyGenerator) { + HexEncodingStringKeyGenerator(BytesKeyGenerator keyGenerator) { this.keyGenerator = keyGenerator; } diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java index 8194bfa17d4..f04577802d3 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java +++ b/crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java @@ -34,14 +34,14 @@ final class SecureRandomBytesKeyGenerator implements BytesKeyGenerator { /** * Creates a secure random key generator using the defaults. */ - public SecureRandomBytesKeyGenerator() { + SecureRandomBytesKeyGenerator() { this(DEFAULT_KEY_LENGTH); } /** * Creates a secure random key generator with a custom key length. */ - public SecureRandomBytesKeyGenerator(int keyLength) { + SecureRandomBytesKeyGenerator(int keyLength) { this.random = new SecureRandom(); this.keyLength = keyLength; } diff --git a/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java b/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java index 93329a33eaa..5b9e7f56389 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java +++ b/crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java @@ -26,7 +26,7 @@ final class SharedKeyGenerator implements BytesKeyGenerator { private byte[] sharedKey; - public SharedKeyGenerator(byte[] sharedKey) { + SharedKeyGenerator(byte[] sharedKey) { this.sharedKey = sharedKey; } @@ -38,4 +38,4 @@ public byte[] generateKey() { return sharedKey; } -} \ No newline at end of file +} 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 df2add7e812..b0b57bc4b40 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 @@ -38,7 +38,7 @@ final class Digester { * @param algorithm the digest algorithm; for example, "SHA-1" or "SHA-256". * @param iterations the number of times to apply the digest algorithm to the input */ - public Digester(String algorithm, int iterations) { + Digester(String algorithm, int iterations) { // eagerly validate the algorithm createDigest(algorithm); this.algorithm = algorithm; @@ -53,7 +53,7 @@ public byte[] digest(byte[] value) { return value; } - final void setIterations(int iterations) { + void setIterations(int iterations) { if (iterations <= 0) { throw new IllegalArgumentException("Iterations value must be greater than zero"); } diff --git a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTest.java b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTest.java index e32d30aa794..cb6e12a0520 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTest.java +++ b/crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTest.java @@ -126,7 +126,7 @@ private static class PredictableRandomBytesKeyGenerator implements BytesKeyGener private final int keyLength; - public PredictableRandomBytesKeyGenerator(int keyLength) { + PredictableRandomBytesKeyGenerator(int keyLength) { this.random = new Random(1); this.keyLength = keyLength; } diff --git a/etc/checkstyle/checkstyle.xml b/etc/checkstyle/checkstyle.xml index 7ea49b17b96..d7b392014db 100644 --- a/etc/checkstyle/checkstyle.xml +++ b/etc/checkstyle/checkstyle.xml @@ -20,6 +20,7 @@ + diff --git a/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java b/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java index 4b8a4af500f..9155ef17941 100644 --- a/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java +++ b/itest/context/src/integration-test/java/org/springframework/security/performance/FilterChainPerformanceTests.java @@ -127,7 +127,7 @@ public void provideDataOnScalingWithNumberOfAuthoritiesUserHas() throws Exceptio HttpSessionSecurityContextRepository.SPRING_SECURITY_CONTEXT_KEY, SecurityContextHolder.getContext()); SecurityContextHolder.clearContext(); - sw.start(Integer.toString(nAuthorities) + " authorities"); + sw.start(nAuthorities + " authorities"); runWithStack(minimalStack); System.out.println(sw.shortSummary()); sw.stop(); diff --git a/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java b/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java index 3a73424a974..4d76711c8e0 100755 --- a/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java +++ b/itest/context/src/main/java/org/springframework/security/integration/UserRepository.java @@ -17,6 +17,6 @@ public interface UserRepository { - public void doSomething(); + void doSomething(); } diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/TestService.java b/itest/context/src/main/java/org/springframework/security/integration/python/TestService.java index 9aedc9ba441..7bc9b50628f 100644 --- a/itest/context/src/main/java/org/springframework/security/integration/python/TestService.java +++ b/itest/context/src/main/java/org/springframework/security/integration/python/TestService.java @@ -20,6 +20,6 @@ public interface TestService { @PreAuthorize("someMethod.py") - public void someMethod(); + void someMethod(); } diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java index c275565530d..cab242ab9d2 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java @@ -151,7 +151,7 @@ public void instantiationFailsWithIncorrectServerUrl() throws Exception { static class EnvExposingDefaultSpringSecurityContextSource extends DefaultSpringSecurityContextSource { - public EnvExposingDefaultSpringSecurityContextSource(String providerUrl) { + EnvExposingDefaultSpringSecurityContextSource(String providerUrl) { super(providerUrl); } diff --git a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyErrorStatus.java b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyErrorStatus.java index cd4a6533c6f..02a289e29ae 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyErrorStatus.java +++ b/ldap/src/main/java/org/springframework/security/ldap/ppolicy/PasswordPolicyErrorStatus.java @@ -55,7 +55,7 @@ public enum PasswordPolicyErrorStatus { private final String errorCode; private final String defaultMessage; - private PasswordPolicyErrorStatus(String errorCode, String defaultMessage) { + PasswordPolicyErrorStatus(String errorCode, String defaultMessage) { this.errorCode = errorCode; this.defaultMessage = defaultMessage; } diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java index 626a06ac197..73074f1f595 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java @@ -493,7 +493,7 @@ private static class PasswordModifyRequest implements ExtendedRequest { private final ByteArrayOutputStream value = new ByteArrayOutputStream(); - public PasswordModifyRequest(String userIdentity, String oldPassword, String newPassword) { + PasswordModifyRequest(String userIdentity, String oldPassword, String newPassword) { ByteArrayOutputStream elements = new ByteArrayOutputStream(); if (userIdentity != null) { diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java index 774341e4138..0241f08b15c 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java @@ -468,7 +468,7 @@ private void checkAuthentication(String rootDn, static class MockNamingEnumeration implements NamingEnumeration { private SearchResult sr; - public MockNamingEnumeration(SearchResult sr) { + MockNamingEnumeration(SearchResult sr) { this.sr = sr; } diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java index 5552583bf69..51a599c7f08 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionConfigAttribute.java @@ -44,7 +44,7 @@ class MessageExpressionConfigAttribute implements ConfigAttribute, EvaluationCon * @param authorizeExpression the {@link Expression} to use. Cannot be null * @param matcher the {@link MessageMatcher} used to match the messages. */ - public MessageExpressionConfigAttribute(Expression authorizeExpression, MessageMatcher matcher) { + MessageExpressionConfigAttribute(Expression authorizeExpression, MessageMatcher matcher) { Assert.notNull(authorizeExpression, "authorizeExpression cannot be null"); Assert.notNull(matcher, "matcher cannot be null"); this.authorizeExpression = authorizeExpression; 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 5bc71db6325..7f13a639ba9 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 @@ -38,7 +38,7 @@ abstract class AbstractMessageMatcherComposite implements MessageMatcher { * * @param messageMatchers the {@link MessageMatcher} instances to try */ - public AbstractMessageMatcherComposite(List> messageMatchers) { + AbstractMessageMatcherComposite(List> messageMatchers) { notEmpty(messageMatchers, "messageMatchers must contain a value"); if (messageMatchers.contains(null)) { throw new IllegalArgumentException( @@ -54,7 +54,7 @@ public AbstractMessageMatcherComposite(List> messageMatchers) * @param messageMatchers the {@link MessageMatcher} instances to try */ @SafeVarargs - public AbstractMessageMatcherComposite(MessageMatcher... messageMatchers) { + AbstractMessageMatcherComposite(MessageMatcher... messageMatchers) { this(asList(messageMatchers)); } diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/MessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/MessageMatcher.java index 2ca4d632e1e..41e2a362292 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/MessageMatcher.java +++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/MessageMatcher.java @@ -37,7 +37,7 @@ public interface MessageMatcher { */ MessageMatcher ANY_MESSAGE = new MessageMatcher() { @Override - public boolean matches(Message message) { + public boolean matches(Message message) { return true; } diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java index 625902a4045..0db50c19824 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java +++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpDestinationMessageMatcher.java @@ -120,7 +120,7 @@ private SimpDestinationMessageMatcher(String pattern, SimpMessageType type, this.pattern = pattern; } - public boolean matches(Message message) { + public boolean matches(Message message) { if (!messageTypeMatcher.matches(message)) { return false; } @@ -131,7 +131,7 @@ public boolean matches(Message message) { } - public Map extractPathVariables(Message message){ + public Map extractPathVariables(Message message){ final String destination = SimpMessageHeaderAccessor.getDestination(message .getHeaders()); return destination != null ? matcher.extractUriTemplateVariables(pattern, destination) diff --git a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcher.java b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcher.java index 7bf6b03f04f..24a66b8f3ec 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcher.java +++ b/messaging/src/main/java/org/springframework/security/messaging/util/matcher/SimpMessageTypeMatcher.java @@ -45,7 +45,7 @@ public SimpMessageTypeMatcher(SimpMessageType typeToMatch) { } @Override - public boolean matches(Message message) { + public boolean matches(Message message) { MessageHeaders headers = message.getHeaders(); SimpMessageType messageType = SimpMessageHeaderAccessor.getMessageType(headers); diff --git a/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java b/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java index f1d89a65698..a9c8dea4df8 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolverTests.java @@ -258,10 +258,10 @@ static class CustomUserPrincipal { public final String property = "property"; } - static class CopyUserPrincipal { + public static class CopyUserPrincipal { public final String property; - CopyUserPrincipal(String property) { + public CopyUserPrincipal(String property) { this.property = property; } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactory.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactory.java index c2f7b330390..0ca4312ebe9 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactory.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenDecoderFactory.java @@ -194,7 +194,7 @@ private NimbusJwtDecoder buildDecoder(ClientRegistration clientRegistration) { * * @param jwtValidatorFactory the factory that provides an {@link OAuth2TokenValidator} */ - public final void setJwtValidatorFactory(Function> jwtValidatorFactory) { + public void setJwtValidatorFactory(Function> jwtValidatorFactory) { Assert.notNull(jwtValidatorFactory, "jwtValidatorFactory cannot be null"); this.jwtValidatorFactory = jwtValidatorFactory; } @@ -207,7 +207,7 @@ public final void setJwtValidatorFactory(Function jwsAlgorithmResolver) { + public void setJwsAlgorithmResolver(Function jwsAlgorithmResolver) { Assert.notNull(jwsAlgorithmResolver, "jwsAlgorithmResolver cannot be null"); this.jwsAlgorithmResolver = jwsAlgorithmResolver; } @@ -219,7 +219,7 @@ public final void setJwsAlgorithmResolver(Function, Map>> claimTypeConverterFactory) { + public void setClaimTypeConverterFactory(Function, Map>> claimTypeConverterFactory) { Assert.notNull(claimTypeConverterFactory, "claimTypeConverterFactory cannot be null"); this.claimTypeConverterFactory = claimTypeConverterFactory; } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenValidator.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenValidator.java index 8d086a0d922..4cd9e3f90d5 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenValidator.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/OidcIdTokenValidator.java @@ -130,7 +130,7 @@ public OAuth2TokenValidatorResult validate(Jwt idToken) { * @since 5.2 * @param clockSkew the maximum acceptable clock skew */ - public final void setClockSkew(Duration clockSkew) { + public void setClockSkew(Duration clockSkew) { Assert.notNull(clockSkew, "clockSkew cannot be null"); Assert.isTrue(clockSkew.getSeconds() >= 0, "clockSkew must be >= 0"); this.clockSkew = clockSkew; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactory.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactory.java index 89125642602..adc6dea19c1 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactory.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/oidc/authentication/ReactiveOidcIdTokenDecoderFactory.java @@ -194,7 +194,7 @@ private NimbusReactiveJwtDecoder buildDecoder(ClientRegistration clientRegistrat * * @param jwtValidatorFactory the factory that provides an {@link OAuth2TokenValidator} */ - public final void setJwtValidatorFactory(Function> jwtValidatorFactory) { + public void setJwtValidatorFactory(Function> jwtValidatorFactory) { Assert.notNull(jwtValidatorFactory, "jwtValidatorFactory cannot be null"); this.jwtValidatorFactory = jwtValidatorFactory; } @@ -207,7 +207,7 @@ public final void setJwtValidatorFactory(Function jwsAlgorithmResolver) { + public void setJwsAlgorithmResolver(Function jwsAlgorithmResolver) { Assert.notNull(jwsAlgorithmResolver, "jwsAlgorithmResolver cannot be null"); this.jwsAlgorithmResolver = jwsAlgorithmResolver; } @@ -219,7 +219,7 @@ public final void setJwsAlgorithmResolver(Function, Map>> claimTypeConverterFactory) { + public void setClaimTypeConverterFactory(Function, Map>> claimTypeConverterFactory) { Assert.notNull(claimTypeConverterFactory, "claimTypeConverterFactory cannot be null"); this.claimTypeConverterFactory = claimTypeConverterFactory; } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthenticatedPrincipalOAuth2AuthorizedClientRepository.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthenticatedPrincipalOAuth2AuthorizedClientRepository.java index c2d4209c50d..fef8ffac713 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthenticatedPrincipalOAuth2AuthorizedClientRepository.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthenticatedPrincipalOAuth2AuthorizedClientRepository.java @@ -61,7 +61,7 @@ public AuthenticatedPrincipalOAuth2AuthorizedClientRepository(OAuth2AuthorizedCl * * @param anonymousAuthorizedClientRepository the repository used for requests that are unauthenticated (or anonymous) */ - public final void setAnonymousAuthorizedClientRepository(OAuth2AuthorizedClientRepository anonymousAuthorizedClientRepository) { + public void setAnonymousAuthorizedClientRepository(OAuth2AuthorizedClientRepository anonymousAuthorizedClientRepository) { Assert.notNull(anonymousAuthorizedClientRepository, "anonymousAuthorizedClientRepository cannot be null"); this.anonymousAuthorizedClientRepository = anonymousAuthorizedClientRepository; } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolver.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolver.java index de931ba5218..b88f2ecad6c 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolver.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/method/annotation/OAuth2AuthorizedClientArgumentResolver.java @@ -177,7 +177,7 @@ private String resolveClientRegistrationId(MethodParameter parameter) { * @param clientCredentialsTokenResponseClient the client used when requesting an access token credential at the Token Endpoint for the {@code client_credentials} grant */ @Deprecated - public final void setClientCredentialsTokenResponseClient( + public void setClientCredentialsTokenResponseClient( OAuth2AccessTokenResponseClient clientCredentialsTokenResponseClient) { Assert.notNull(clientCredentialsTokenResponseClient, "clientCredentialsTokenResponseClient cannot be null"); Assert.state(this.defaultAuthorizedClientManager, "The client cannot be set when the constructor used is \"OAuth2AuthorizedClientArgumentResolver(OAuth2AuthorizedClientManager)\". " + diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/OAuth2AuthorizedClientResolver.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/OAuth2AuthorizedClientResolver.java index bf13f5ca0dc..114e2e68c8f 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/OAuth2AuthorizedClientResolver.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/function/client/OAuth2AuthorizedClientResolver.java @@ -57,7 +57,7 @@ class OAuth2AuthorizedClientResolver { private String defaultClientRegistrationId; - public OAuth2AuthorizedClientResolver( + OAuth2AuthorizedClientResolver( ReactiveClientRegistrationRepository clientRegistrationRepository, ServerOAuth2AuthorizedClientRepository authorizedClientRepository) { Assert.notNull(clientRegistrationRepository, "clientRegistrationRepository cannot be null"); @@ -175,7 +175,7 @@ static class Request { private final Authentication authentication; private final ServerWebExchange exchange; - public Request(String clientRegistrationId, Authentication authentication, + Request(String clientRegistrationId, Authentication authentication, ServerWebExchange exchange) { this.clientRegistrationId = clientRegistrationId; this.authentication = authentication; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/result/method/annotation/OAuth2AuthorizedClientResolver.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/result/method/annotation/OAuth2AuthorizedClientResolver.java index f9ad2d12c92..8e402b4854b 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/result/method/annotation/OAuth2AuthorizedClientResolver.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/reactive/result/method/annotation/OAuth2AuthorizedClientResolver.java @@ -57,7 +57,7 @@ class OAuth2AuthorizedClientResolver { private String defaultClientRegistrationId; - public OAuth2AuthorizedClientResolver( + OAuth2AuthorizedClientResolver( ReactiveClientRegistrationRepository clientRegistrationRepository, ServerOAuth2AuthorizedClientRepository authorizedClientRepository) { Assert.notNull(clientRegistrationRepository, "clientRegistrationRepository cannot be null"); @@ -176,7 +176,7 @@ static class Request { private final Authentication authentication; private final ServerWebExchange exchange; - public Request(String clientRegistrationId, Authentication authentication, + Request(String clientRegistrationId, Authentication authentication, ServerWebExchange exchange) { this.clientRegistrationId = clientRegistrationId; this.authentication = authentication; diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/AuthenticatedPrincipalServerOAuth2AuthorizedClientRepository.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/AuthenticatedPrincipalServerOAuth2AuthorizedClientRepository.java index fc43527f7e5..6357dc38c91 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/AuthenticatedPrincipalServerOAuth2AuthorizedClientRepository.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/server/AuthenticatedPrincipalServerOAuth2AuthorizedClientRepository.java @@ -65,7 +65,7 @@ public AuthenticatedPrincipalServerOAuth2AuthorizedClientRepository(ReactiveOAut * * @param anonymousAuthorizedClientRepository the repository used for requests that are unauthenticated (or anonymous) */ - public final void setAnonymousAuthorizedClientRepository( + public void setAnonymousAuthorizedClientRepository( ServerOAuth2AuthorizedClientRepository anonymousAuthorizedClientRepository) { Assert.notNull(anonymousAuthorizedClientRepository, "anonymousAuthorizedClientRepository cannot be null"); this.anonymousAuthorizedClientRepository = anonymousAuthorizedClientRepository; diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java index 0f51c879eb4..8d698d01ae6 100644 --- a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java +++ b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java @@ -108,7 +108,7 @@ public void setJwtValidator(OAuth2TokenValidator jwtValidator) { * * @param claimSetConverter the {@link Converter} to use */ - public final void setClaimSetConverter(Converter, Map> claimSetConverter) { + public void setClaimSetConverter(Converter, Map> claimSetConverter) { Assert.notNull(claimSetConverter, "claimSetConverter cannot be null"); this.claimSetConverter = claimSetConverter; this.delegate.setClaimSetConverter(claimSetConverter); @@ -120,7 +120,7 @@ public final void setClaimSetConverter(Converter, Map getTokenAttributes() { } static class TestingOAuth2Token extends AbstractOAuth2Token { - public TestingOAuth2Token(String tokenValue) { + TestingOAuth2Token(String tokenValue) { super(tokenValue); } } diff --git a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/access/server/BearerTokenServerAccessDeniedHandlerTests.java b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/access/server/BearerTokenServerAccessDeniedHandlerTests.java index 04721e7538e..c4fb17ee65d 100644 --- a/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/access/server/BearerTokenServerAccessDeniedHandlerTests.java +++ b/oauth2/oauth2-resource-server/src/test/java/org/springframework/security/oauth2/server/resource/web/access/server/BearerTokenServerAccessDeniedHandlerTests.java @@ -114,7 +114,7 @@ public Map getTokenAttributes() { } static class TestingOAuth2Token extends AbstractOAuth2Token { - public TestingOAuth2Token(String tokenValue) { + TestingOAuth2Token(String tokenValue) { super(tokenValue); } } diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java index 66fa53092ff..b7a52a0aeae 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationStatus.java @@ -47,7 +47,7 @@ public enum OpenIDAuthenticationStatus { // ~ Constructors // =================================================================================================== - private OpenIDAuthenticationStatus(String name) { + OpenIDAuthenticationStatus(String name) { this.name = name; } diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java index aa70565ff6c..ed57b1256c9 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDConsumer.java @@ -36,10 +36,10 @@ public interface OpenIDConsumer { * @return String URI to redirect user to for authentication * @throws OpenIDConsumerException if anything bad happens */ - public String beginConsumption(HttpServletRequest req, String claimedIdentity, - String returnToUrl, String realm) throws OpenIDConsumerException; + String beginConsumption(HttpServletRequest req, String claimedIdentity, + String returnToUrl, String realm) throws OpenIDConsumerException; - public OpenIDAuthenticationToken endConsumption(HttpServletRequest req) + OpenIDAuthenticationToken endConsumption(HttpServletRequest req) throws OpenIDConsumerException; } diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java b/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java index f5d689cc59e..1bed997ea00 100644 --- a/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java +++ b/remoting/src/main/java/org/springframework/security/remoting/dns/DnsResolver.java @@ -33,7 +33,7 @@ public interface DnsResolver { * @throws DnsEntryNotFoundException No record found * @throws DnsLookupException Unknown DNS error */ - public String resolveIpAddress(String hostname) throws DnsEntryNotFoundException, + String resolveIpAddress(String hostname) throws DnsEntryNotFoundException, DnsLookupException; /** @@ -65,7 +65,7 @@ public String resolveIpAddress(String hostname) throws DnsEntryNotFoundException * @throws DnsEntryNotFoundException No record found * @throws DnsLookupException Unknown DNS error */ - public String resolveServiceEntry(String serviceType, String domain) + String resolveServiceEntry(String serviceType, String domain) throws DnsEntryNotFoundException, DnsLookupException; /** @@ -80,7 +80,7 @@ public String resolveServiceEntry(String serviceType, String domain) * @see #resolveServiceEntry(String, String) * @see #resolveIpAddress(String) */ - public String resolveServiceIpAddress(String serviceType, String domain) + String resolveServiceIpAddress(String serviceType, String domain) throws DnsEntryNotFoundException, DnsLookupException; } diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java b/remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java index 42132a0c2af..4169c8a739b 100644 --- a/remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java +++ b/remoting/src/main/java/org/springframework/security/remoting/dns/InitialContextFactory.java @@ -34,6 +34,6 @@ public interface InitialContextFactory { * Must return a DirContext which can be used for DNS queries * @return JNDI DirContext */ - public DirContext getCtx(); + DirContext getCtx(); } diff --git a/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java b/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java index 75ff09c9166..cff51e1d3c8 100644 --- a/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java +++ b/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java @@ -105,7 +105,7 @@ private class MockHttpURLConnection extends HttpURLConnection { private Map requestProperties = new HashMap<>(); - public MockHttpURLConnection(URL u) { + MockHttpURLConnection(URL u) { super(u); } diff --git a/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java b/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java index 80cbbe4e6d5..62d4f61504a 100644 --- a/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java +++ b/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java @@ -191,7 +191,7 @@ public UserDetailsService userDetailsService() { class IntrospectEndpoint { TokenStore tokenStore; - public IntrospectEndpoint(TokenStore tokenStore) { + IntrospectEndpoint(TokenStore tokenStore) { this.tokenStore = tokenStore; } @@ -226,7 +226,7 @@ public Map introspect(@RequestParam("token") String token) { class JwkSetEndpoint { KeyPair keyPair; - public JwkSetEndpoint(KeyPair keyPair) { + JwkSetEndpoint(KeyPair keyPair) { this.keyPair = keyPair; } diff --git a/samples/boot/oauth2resourceserver-jwe/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java b/samples/boot/oauth2resourceserver-jwe/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java index a004009c60f..b10249a2552 100644 --- a/samples/boot/oauth2resourceserver-jwe/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java +++ b/samples/boot/oauth2resourceserver-jwe/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java @@ -84,7 +84,7 @@ public void performWhenInsufficientlyScopedBearerTokenThenDeniesScopedMethodAcce private static class BearerTokenRequestPostProcessor implements RequestPostProcessor { private String token; - public BearerTokenRequestPostProcessor(String token) { + BearerTokenRequestPostProcessor(String token) { this.token = token; } diff --git a/samples/boot/oauth2resourceserver-multitenancy/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java b/samples/boot/oauth2resourceserver-multitenancy/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java index e747f3c6dff..2bca10f1ea9 100644 --- a/samples/boot/oauth2resourceserver-multitenancy/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java +++ b/samples/boot/oauth2resourceserver-multitenancy/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java @@ -132,7 +132,7 @@ public void invalidTenantPerformWhenValidBearerTokenThenThrowsException() private static class BearerTokenRequestPostProcessor implements RequestPostProcessor { private String token; - public BearerTokenRequestPostProcessor(String token) { + BearerTokenRequestPostProcessor(String token) { this.token = token; } diff --git a/samples/boot/oauth2resourceserver-opaque/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java b/samples/boot/oauth2resourceserver-opaque/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java index 8e5dd5a5b86..cbeeb8ebda0 100644 --- a/samples/boot/oauth2resourceserver-opaque/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java +++ b/samples/boot/oauth2resourceserver-opaque/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java @@ -84,7 +84,7 @@ public void performWhenInsufficientlyScopedBearerTokenThenDeniesScopedMethodAcce private static class BearerTokenRequestPostProcessor implements RequestPostProcessor { private String token; - public BearerTokenRequestPostProcessor(String token) { + BearerTokenRequestPostProcessor(String token) { this.token = token; } diff --git a/samples/boot/oauth2resourceserver-static/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java b/samples/boot/oauth2resourceserver-static/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java index 238cc83b07a..a5d644662a1 100644 --- a/samples/boot/oauth2resourceserver-static/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java +++ b/samples/boot/oauth2resourceserver-static/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java @@ -84,7 +84,7 @@ public void performWhenInsufficientlyScopedBearerTokenThenDeniesScopedMethodAcce private static class BearerTokenRequestPostProcessor implements RequestPostProcessor { private String token; - public BearerTokenRequestPostProcessor(String token) { + BearerTokenRequestPostProcessor(String token) { this.token = token; } diff --git a/samples/boot/oauth2resourceserver/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java b/samples/boot/oauth2resourceserver/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java index e2629f55a46..64794174990 100644 --- a/samples/boot/oauth2resourceserver/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java +++ b/samples/boot/oauth2resourceserver/src/integration-test/java/sample/OAuth2ResourceServerApplicationITests.java @@ -107,7 +107,7 @@ public void performPostWhenInsufficientlyScopedBearerTokenThenDeniesScopedMethod private static class BearerTokenRequestPostProcessor implements RequestPostProcessor { private String token; - public BearerTokenRequestPostProcessor(String token) { + BearerTokenRequestPostProcessor(String token) { this.token = token; } diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java b/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java index cf311f421d2..c882e2856b3 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java +++ b/samples/xml/contacts/src/main/java/sample/contact/ContactDao.java @@ -27,17 +27,17 @@ public interface ContactDao { // ~ Methods // ======================================================================================================== - public void create(Contact contact); + void create(Contact contact); - public void delete(Long contactId); + void delete(Long contactId); - public List findAll(); + List findAll(); - public List findAllPrincipals(); + List findAllPrincipals(); - public List findAllRoles(); + List findAllRoles(); - public Contact getById(Long id); + Contact getById(Long id); - public void update(Contact contact); + void update(Contact contact); } diff --git a/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java b/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java index 624f0f75030..924df446d2e 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java +++ b/samples/xml/contacts/src/main/java/sample/contact/ContactManager.java @@ -31,27 +31,27 @@ public interface ContactManager { // ~ Methods // ======================================================================================================== @PreAuthorize("hasPermission(#contact, admin)") - public void addPermission(Contact contact, Sid recipient, Permission permission); + void addPermission(Contact contact, Sid recipient, Permission permission); @PreAuthorize("hasPermission(#contact, admin)") - public void deletePermission(Contact contact, Sid recipient, Permission permission); + void deletePermission(Contact contact, Sid recipient, Permission permission); @PreAuthorize("hasRole('ROLE_USER')") - public void create(Contact contact); + void create(Contact contact); @PreAuthorize("hasPermission(#contact, 'delete') or hasPermission(#contact, admin)") - public void delete(Contact contact); + void delete(Contact contact); @PreAuthorize("hasRole('ROLE_USER')") @PostFilter("hasPermission(filterObject, 'read') or hasPermission(filterObject, admin)") - public List getAll(); + List getAll(); @PreAuthorize("hasRole('ROLE_USER')") - public List getAllRecipients(); + List getAllRecipients(); @PreAuthorize("hasPermission(#id, 'sample.contact.Contact', read) or " + "hasPermission(#id, 'sample.contact.Contact', admin)") - public Contact getById(Long id); + Contact getById(Long id); - public Contact getRandomContact(); + Contact getRandomContact(); } diff --git a/samples/xml/dms/src/main/java/sample/dms/DocumentDao.java b/samples/xml/dms/src/main/java/sample/dms/DocumentDao.java index 13b8938146c..46d27f4f56b 100755 --- a/samples/xml/dms/src/main/java/sample/dms/DocumentDao.java +++ b/samples/xml/dms/src/main/java/sample/dms/DocumentDao.java @@ -27,21 +27,21 @@ public interface DocumentDao { * @param element an unsaved element (the "id" will be updated after method is * invoked) */ - public void create(AbstractElement element); + void create(AbstractElement element); /** * Removes a file from the database for the specified element. * * @param file the file to remove (cannot be null) */ - public void delete(File file); + void delete(File file); /** * Modifies a file in the database. * * @param file the file to update (cannot be null) */ - public void update(File file); + void update(File file); /** * Locates elements in the database which appear under the presented directory @@ -51,5 +51,5 @@ public interface DocumentDao { * @return zero or more elements in the directory (an empty array may be returned - * never null) */ - public AbstractElement[] findElements(Directory directory); + AbstractElement[] findElements(Directory directory); } diff --git a/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java b/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java index 1f32b7fb6db..004e33c2987 100755 --- a/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java +++ b/samples/xml/dms/src/main/java/sample/dms/secured/SecureDocumentDao.java @@ -27,5 +27,5 @@ public interface SecureDocumentDao extends DocumentDao { /** * @return all the usernames existing in the system. */ - public String[] getUsers(); + String[] getUsers(); } diff --git a/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java b/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java index fa4931f7d88..e20e0984cbe 100644 --- a/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java +++ b/samples/xml/jaas/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java @@ -32,7 +32,7 @@ public class SecurePage { public static LoginPage to(WebDriver driver, int port) { driver.get("http://localhost:" + port + "/secure"); return PageFactory.initElements(driver, LoginPage.class); - }; + } private final WebDriver webDriver; diff --git a/samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java b/samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java index 28e3207cafd..d4d039414dd 100644 --- a/samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java +++ b/samples/xml/jaas/src/main/java/samples/jaas/UsernameEqualsPasswordLoginModule.java @@ -94,7 +94,7 @@ public boolean logout() throws LoginException { private static class UsernamePrincipal implements Principal, Serializable { private final String username; - public UsernamePrincipal(String username) { + UsernamePrincipal(String username) { this.username = username; } diff --git a/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java b/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java index 39e88c12d09..f03bdf38701 100644 --- a/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java +++ b/samples/xml/ldap/src/integration-test/java/org/springframework/security/samples/pages/SecurePage.java @@ -32,7 +32,7 @@ public class SecurePage { public static LoginPage to(WebDriver driver, int port) { driver.get("http://localhost:" + port + "/secure"); return PageFactory.initElements(driver, LoginPage.class); - }; + } private final WebDriver webDriver; diff --git a/samples/xml/tutorial/src/main/java/bigbank/BankDao.java b/samples/xml/tutorial/src/main/java/bigbank/BankDao.java index 0b7d9262bfb..4411896ee2d 100644 --- a/samples/xml/tutorial/src/main/java/bigbank/BankDao.java +++ b/samples/xml/tutorial/src/main/java/bigbank/BankDao.java @@ -16,9 +16,9 @@ package bigbank; public interface BankDao { - public Account readAccount(Long id); + Account readAccount(Long id); - public void createOrUpdateAccount(Account account); + void createOrUpdateAccount(Account account); - public Account[] findAccounts(); + Account[] findAccounts(); } diff --git a/samples/xml/tutorial/src/main/java/bigbank/BankService.java b/samples/xml/tutorial/src/main/java/bigbank/BankService.java index ed0eed0d291..d9558e27d3b 100644 --- a/samples/xml/tutorial/src/main/java/bigbank/BankService.java +++ b/samples/xml/tutorial/src/main/java/bigbank/BankService.java @@ -19,11 +19,11 @@ public interface BankService { - public Account readAccount(Long id); + Account readAccount(Long id); - public Account[] findAccounts(); + Account[] findAccounts(); @PreAuthorize("hasRole('supervisor') or " + "hasRole('teller') and (#account.balance + #amount >= -#account.overdraft)") - public Account post(Account account, double amount); + Account post(Account account, double amount); } diff --git a/test/src/main/java/org/springframework/security/test/context/support/DelegatingTestExecutionListener.java b/test/src/main/java/org/springframework/security/test/context/support/DelegatingTestExecutionListener.java index 76cc1e5b86f..3b34dda6bf7 100644 --- a/test/src/main/java/org/springframework/security/test/context/support/DelegatingTestExecutionListener.java +++ b/test/src/main/java/org/springframework/security/test/context/support/DelegatingTestExecutionListener.java @@ -30,7 +30,7 @@ class DelegatingTestExecutionListener private final TestExecutionListener delegate; - public DelegatingTestExecutionListener(TestExecutionListener delegate) { + DelegatingTestExecutionListener(TestExecutionListener delegate) { Assert.notNull(delegate, "delegate cannot be null"); this.delegate = delegate; } 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 f837e8a97cb..caa8dc63517 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 @@ -49,7 +49,7 @@ final class WithUserDetailsSecurityContextFactory implements private BeanFactory beans; @Autowired - public WithUserDetailsSecurityContextFactory(BeanFactory beans) { + WithUserDetailsSecurityContextFactory(BeanFactory beans) { this.beans = beans; } 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 2bef540d08c..2d3bf57a10f 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 @@ -17,7 +17,7 @@ import java.io.IOException; import java.io.InputStream; -import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; @@ -638,12 +638,7 @@ static String encodePasswordInA1Format(String username, String realm, } private static String md5Hex(String a2) { - try { - return DigestUtils.md5DigestAsHex(a2.getBytes("UTF-8")); - } - catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } + return DigestUtils.md5DigestAsHex(a2.getBytes(StandardCharsets.UTF_8)); } } @@ -831,7 +826,7 @@ private final static class UserDetailsRequestPostProcessor implements RequestPostProcessor { private final RequestPostProcessor delegate; - public UserDetailsRequestPostProcessor(UserDetails user) { + UserDetailsRequestPostProcessor(UserDetails user) { Authentication token = new UsernamePasswordAuthenticationToken(user, user.getPassword(), user.getAuthorities()); @@ -985,12 +980,7 @@ private static class HttpBasicRequestPostProcessor implements RequestPostProcess private HttpBasicRequestPostProcessor(String username, String password) { byte[] toEncode; - try { - toEncode = (username + ":" + password).getBytes("UTF-8"); - } - catch (UnsupportedEncodingException e) { - throw new RuntimeException(e); - } + toEncode = (username + ":" + password).getBytes(StandardCharsets.UTF_8); this.headerValue = "Basic " + new String(Base64.getEncoder().encode(toEncode)); } diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java index 7f4e8aed59d..6f85c3b11be 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessorsCsrfTests.java @@ -205,7 +205,7 @@ protected void doFilterInternal(HttpServletRequest request, static class SessionRequestWrapper extends HttpServletRequestWrapper { HttpSession session = new MockHttpSession(); - public SessionRequestWrapper(HttpServletRequest request) { + SessionRequestWrapper(HttpServletRequest request) { super(request); } 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 46c9e0486f2..7a52973f4dc 100644 --- a/web/src/main/java/org/springframework/security/web/FilterInvocation.java +++ b/web/src/main/java/org/springframework/security/web/FilterInvocation.java @@ -158,7 +158,7 @@ class DummyRequest extends HttpServletRequestWrapper { private String queryString; private String method; - public DummyRequest() { + DummyRequest() { super(UNSUPPORTED_REQUEST); } diff --git a/web/src/main/java/org/springframework/security/web/access/WebInvocationPrivilegeEvaluator.java b/web/src/main/java/org/springframework/security/web/access/WebInvocationPrivilegeEvaluator.java index 851e1a54aa9..8cfb892b0f7 100644 --- a/web/src/main/java/org/springframework/security/web/access/WebInvocationPrivilegeEvaluator.java +++ b/web/src/main/java/org/springframework/security/web/access/WebInvocationPrivilegeEvaluator.java @@ -33,7 +33,7 @@ public interface WebInvocationPrivilegeEvaluator { * @param uri the URI excluding the context path (a default context path setting will * be used) */ - public boolean isAllowed(String uri, Authentication authentication); + boolean isAllowed(String uri, Authentication authentication); /** * Determines whether the user represented by the supplied Authentication @@ -52,6 +52,5 @@ public interface WebInvocationPrivilegeEvaluator { * be used in evaluation whether access should be granted. * @return true if access is allowed, false if denied */ - public boolean isAllowed(String contextPath, String uri, String method, - Authentication authentication); + boolean isAllowed(String contextPath, String uri, String method, Authentication authentication); } diff --git a/web/src/main/java/org/springframework/security/web/access/expression/DelegatingEvaluationContext.java b/web/src/main/java/org/springframework/security/web/access/expression/DelegatingEvaluationContext.java index 2afd19390cd..f855a21a012 100644 --- a/web/src/main/java/org/springframework/security/web/access/expression/DelegatingEvaluationContext.java +++ b/web/src/main/java/org/springframework/security/web/access/expression/DelegatingEvaluationContext.java @@ -38,7 +38,7 @@ class DelegatingEvaluationContext implements EvaluationContext { private final EvaluationContext delegate; - public DelegatingEvaluationContext(EvaluationContext delegate) { + DelegatingEvaluationContext(EvaluationContext delegate) { this.delegate = delegate; } diff --git a/web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java index 02b2183d128..a7ec8291e73 100644 --- a/web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java +++ b/web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java @@ -99,7 +99,7 @@ static class AntPathMatcherEvaluationContextPostProcessor extends AbstractVariableEvaluationContextPostProcessor { private final AntPathRequestMatcher matcher; - public AntPathMatcherEvaluationContextPostProcessor( + AntPathMatcherEvaluationContextPostProcessor( AntPathRequestMatcher matcher) { this.matcher = matcher; } @@ -114,7 +114,7 @@ static class RequestVariablesExtractorEvaluationContextPostProcessor extends AbstractVariableEvaluationContextPostProcessor { private final RequestMatcher matcher; - public RequestVariablesExtractorEvaluationContextPostProcessor( + RequestVariablesExtractorEvaluationContextPostProcessor( RequestMatcher matcher) { this.matcher = matcher; } diff --git a/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java b/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java index 636b3b86907..7e3856f70f9 100644 --- a/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java +++ b/web/src/main/java/org/springframework/security/web/access/expression/WebExpressionConfigAttribute.java @@ -31,7 +31,7 @@ class WebExpressionConfigAttribute implements ConfigAttribute, private final Expression authorizeExpression; private final EvaluationContextPostProcessor postProcessor; - public WebExpressionConfigAttribute(Expression authorizeExpression, + WebExpressionConfigAttribute(Expression authorizeExpression, EvaluationContextPostProcessor postProcessor) { this.authorizeExpression = authorizeExpression; this.postProcessor = postProcessor; diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/DefaultWASUsernameAndGroupsExtractor.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/DefaultWASUsernameAndGroupsExtractor.java index b254440831c..6d38ceee915 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/DefaultWASUsernameAndGroupsExtractor.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/DefaultWASUsernameAndGroupsExtractor.java @@ -58,11 +58,11 @@ final class DefaultWASUsernameAndGroupsExtractor implements WASUsernameAndGroups // SEC-803 private static Class wsCredentialClass = null; - public final List getGroupsForCurrentUser() { + public List getGroupsForCurrentUser() { return getWebSphereGroups(getRunAsSubject()); } - public final String getCurrentUserName() { + public String getCurrentUserName() { return getSecurityName(getRunAsSubject()); } diff --git a/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java b/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java index b08ad8c1af6..f7bf77b885a 100644 --- a/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java +++ b/web/src/main/java/org/springframework/security/web/context/AbstractSecurityWebApplicationInitializer.java @@ -210,8 +210,8 @@ private void registerFilters(ServletContext servletContext, * @param filterName * @param filter */ - private final void registerFilter(ServletContext servletContext, - boolean insertBeforeOtherFilters, String filterName, Filter filter) { + private void registerFilter(ServletContext servletContext, + boolean insertBeforeOtherFilters, String filterName, Filter filter) { Dynamic registration = servletContext.addFilter(filterName, filter); if (registration == null) { throw new IllegalStateException( diff --git a/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java b/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java index 35282074d10..85f90e3f590 100644 --- a/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java +++ b/web/src/main/java/org/springframework/security/web/context/HttpSessionSecurityContextRepository.java @@ -269,7 +269,7 @@ private static class SaveToSessionRequestWrapper extends HttpServletRequestWrapper { private final SaveContextOnUpdateOrErrorResponseWrapper response; - public SaveToSessionRequestWrapper(HttpServletRequest request, + SaveToSessionRequestWrapper(HttpServletRequest request, SaveContextOnUpdateOrErrorResponseWrapper response) { super(request); this.response = response; diff --git a/web/src/main/java/org/springframework/security/web/debug/DebugFilter.java b/web/src/main/java/org/springframework/security/web/debug/DebugFilter.java index b841186504f..e0a53d30900 100644 --- a/web/src/main/java/org/springframework/security/web/debug/DebugFilter.java +++ b/web/src/main/java/org/springframework/security/web/debug/DebugFilter.java @@ -55,7 +55,7 @@ public DebugFilter(FilterChainProxy fcp) { this.fcp = fcp; } - public final void doFilter(ServletRequest srvltRequest, + public void doFilter(ServletRequest srvltRequest, ServletResponse srvltResponse, FilterChain filterChain) throws ServletException, IOException { @@ -153,7 +153,7 @@ public void destroy() { class DebugRequestWrapper extends HttpServletRequestWrapper { private static final Logger logger = new Logger(); - public DebugRequestWrapper(HttpServletRequest request) { + DebugRequestWrapper(HttpServletRequest request) { super(request); } diff --git a/web/src/main/java/org/springframework/security/web/firewall/FirewalledResponse.java b/web/src/main/java/org/springframework/security/web/firewall/FirewalledResponse.java index 6d7c3865635..afe0a58b0b1 100644 --- a/web/src/main/java/org/springframework/security/web/firewall/FirewalledResponse.java +++ b/web/src/main/java/org/springframework/security/web/firewall/FirewalledResponse.java @@ -31,7 +31,7 @@ class FirewalledResponse extends HttpServletResponseWrapper { private static final String LOCATION_HEADER = "Location"; private static final String SET_COOKIE_HEADER = "Set-Cookie"; - public FirewalledResponse(HttpServletResponse response) { + FirewalledResponse(HttpServletResponse response) { super(response); } diff --git a/web/src/main/java/org/springframework/security/web/firewall/RequestWrapper.java b/web/src/main/java/org/springframework/security/web/firewall/RequestWrapper.java index a5a1d76b350..5e3b2e08f9b 100644 --- a/web/src/main/java/org/springframework/security/web/firewall/RequestWrapper.java +++ b/web/src/main/java/org/springframework/security/web/firewall/RequestWrapper.java @@ -48,7 +48,7 @@ final class RequestWrapper extends FirewalledRequest { private final String strippedPathInfo; private boolean stripPaths = true; - public RequestWrapper(HttpServletRequest request) { + RequestWrapper(HttpServletRequest request) { super(request); strippedServletPath = strip(request.getServletPath()); String pathInfo = strip(request.getPathInfo()); @@ -144,7 +144,7 @@ private class FirewalledRequestAwareRequestDispatcher implements RequestDispatch * @param path the {@code path} that will be used to obtain the delegate * {@link RequestDispatcher} from the original {@link HttpServletRequest}. */ - public FirewalledRequestAwareRequestDispatcher(String path) { + FirewalledRequestAwareRequestDispatcher(String path) { this.path = path; } diff --git a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java index f680276509a..2c9b32cdb24 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/frameoptions/XFrameOptionsHeaderWriter.java @@ -111,7 +111,7 @@ public enum XFrameOptionsMode { private String mode; - private XFrameOptionsMode(String mode) { + XFrameOptionsMode(String mode) { this.mode = mode; } diff --git a/web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java index d9071f02d6c..d8cbdc50776 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/DefaultCsrfTokenMixin.java @@ -48,7 +48,7 @@ class DefaultCsrfTokenMixin { * @param token the CSRF token value */ @JsonCreator - public DefaultCsrfTokenMixin(@JsonProperty("headerName") String headerName, + DefaultCsrfTokenMixin(@JsonProperty("headerName") String headerName, @JsonProperty("parameterName") String parameterName, @JsonProperty("token") String token) { } } diff --git a/web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java b/web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java index de580018c48..3083e0278f9 100644 --- a/web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java +++ b/web/src/main/java/org/springframework/security/web/jackson2/SavedCookieMixin.java @@ -39,7 +39,7 @@ abstract class SavedCookieMixin { @JsonCreator - public SavedCookieMixin(@JsonProperty("name") String name, @JsonProperty("value") String value, + SavedCookieMixin(@JsonProperty("name") String name, @JsonProperty("value") String value, @JsonProperty("comment") String comment, @JsonProperty("domain") String domain, @JsonProperty("maxAge") int maxAge, @JsonProperty("path") String path, @JsonProperty("secure") boolean secure, @JsonProperty("version") int version) { diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java index ea6d4296428..66b6004c822 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java @@ -77,7 +77,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { // ~ Constructors // =================================================================================================== - public SavedRequestAwareWrapper(SavedRequest saved, HttpServletRequest request) { + SavedRequestAwareWrapper(SavedRequest saved, HttpServletRequest request) { super(request); savedRequest = saved; diff --git a/web/src/main/java/org/springframework/security/web/server/header/XFrameOptionsServerHttpHeadersWriter.java b/web/src/main/java/org/springframework/security/web/server/header/XFrameOptionsServerHttpHeadersWriter.java index e7ea862a89c..3a42fd9f3ba 100644 --- a/web/src/main/java/org/springframework/security/web/server/header/XFrameOptionsServerHttpHeadersWriter.java +++ b/web/src/main/java/org/springframework/security/web/server/header/XFrameOptionsServerHttpHeadersWriter.java @@ -80,7 +80,7 @@ public enum Mode { * origin of the content and the frame are the same, this MUST be * treated as "DENY". */ - SAMEORIGIN; + SAMEORIGIN } private static ServerHttpHeadersWriter createDelegate(Mode mode) { diff --git a/web/src/main/java/org/springframework/security/web/server/jackson2/DefaultCsrfServerTokenMixin.java b/web/src/main/java/org/springframework/security/web/server/jackson2/DefaultCsrfServerTokenMixin.java index 2ccce59417a..e0e82c1252e 100644 --- a/web/src/main/java/org/springframework/security/web/server/jackson2/DefaultCsrfServerTokenMixin.java +++ b/web/src/main/java/org/springframework/security/web/server/jackson2/DefaultCsrfServerTokenMixin.java @@ -47,7 +47,7 @@ class DefaultCsrfServerTokenMixin { * @param token the CSRF token value */ @JsonCreator - public DefaultCsrfServerTokenMixin(@JsonProperty("headerName") String headerName, + DefaultCsrfServerTokenMixin(@JsonProperty("headerName") String headerName, @JsonProperty("parameterName") String parameterName, @JsonProperty("token") String token) { } } 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 e6aad71aa1c..1812e637f4c 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 @@ -170,7 +170,7 @@ private class Servlet3SecurityContextHolderAwareRequestWrapper extends SecurityContextHolderAwareRequestWrapper { private final HttpServletResponse response; - public Servlet3SecurityContextHolderAwareRequestWrapper( + Servlet3SecurityContextHolderAwareRequestWrapper( HttpServletRequest request, String rolePrefix, HttpServletResponse response) { super(request, HttpServlet3RequestFactory.this.trustResolver, rolePrefix); @@ -265,7 +265,7 @@ private boolean isAuthenticated() { private static class SecurityContextAsyncContext implements AsyncContext { private final AsyncContext asyncContext; - public SecurityContextAsyncContext(AsyncContext asyncContext) { + SecurityContextAsyncContext(AsyncContext asyncContext) { this.asyncContext = asyncContext; } diff --git a/web/src/main/java/org/springframework/security/web/servletapi/HttpServletRequestFactory.java b/web/src/main/java/org/springframework/security/web/servletapi/HttpServletRequestFactory.java index 48a38c6ff2b..81a5d443e75 100644 --- a/web/src/main/java/org/springframework/security/web/servletapi/HttpServletRequestFactory.java +++ b/web/src/main/java/org/springframework/security/web/servletapi/HttpServletRequestFactory.java @@ -34,6 +34,5 @@ interface HttpServletRequestFactory { * @param response the original {@link HttpServletResponse}. Cannot be null. * @return a non-null HttpServletRequest */ - public HttpServletRequest create(HttpServletRequest request, - HttpServletResponse response); + HttpServletRequest create(HttpServletRequest request, HttpServletResponse response); } diff --git a/web/src/main/java/org/springframework/security/web/util/OnCommittedResponseWrapper.java b/web/src/main/java/org/springframework/security/web/util/OnCommittedResponseWrapper.java index 2002f786570..e177fb54722 100644 --- a/web/src/main/java/org/springframework/security/web/util/OnCommittedResponseWrapper.java +++ b/web/src/main/java/org/springframework/security/web/util/OnCommittedResponseWrapper.java @@ -258,7 +258,7 @@ private void doOnResponseCommitted() { private class SaveContextPrintWriter extends PrintWriter { private final PrintWriter delegate; - public SaveContextPrintWriter(PrintWriter delegate) { + SaveContextPrintWriter(PrintWriter delegate) { super(delegate); this.delegate = delegate; } @@ -498,7 +498,7 @@ public PrintWriter append(char c) { private class SaveContextServletOutputStream extends ServletOutputStream { private final ServletOutputStream delegate; - public SaveContextServletOutputStream(ServletOutputStream delegate) { + SaveContextServletOutputStream(ServletOutputStream delegate) { this.delegate = delegate; } @@ -652,4 +652,4 @@ public String toString() { return getClass().getName() + "[delegate=" + this.delegate.toString() + "]"; } } -} \ No newline at end of file +} diff --git a/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java b/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java index 17c237bc41b..c7bb7bc2e16 100644 --- a/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java +++ b/web/src/main/java/org/springframework/security/web/util/RedirectUrlBuilder.java @@ -75,7 +75,7 @@ public String getUrl() { // Append the port number if it's not standard for the scheme if (port != (scheme.equals("http") ? 80 : 443)) { - sb.append(":").append(Integer.toString(port)); + sb.append(":").append(port); } if (contextPath != null) { diff --git a/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcherContext.java b/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcherContext.java index 9440a0b759d..a4e216c6c54 100644 --- a/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcherContext.java +++ b/web/src/main/java/org/springframework/security/web/util/matcher/ELRequestMatcherContext.java @@ -23,7 +23,7 @@ class ELRequestMatcherContext { private final HttpServletRequest request; - public ELRequestMatcherContext(HttpServletRequest request) { + ELRequestMatcherContext(HttpServletRequest request) { this.request = request; } diff --git a/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java b/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java index e95d1d2171b..13726a03bf1 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImplTests.java @@ -204,7 +204,7 @@ private class MockChannelProcessor implements ChannelProcessor { private String configAttribute; private boolean failIfCalled; - public MockChannelProcessor(String configAttribute, boolean failIfCalled) { + MockChannelProcessor(String configAttribute, boolean failIfCalled) { this.configAttribute = configAttribute; this.failIfCalled = failIfCalled; } diff --git a/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java index 52b2eac3428..06647a7de3b 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/ChannelProcessingFilterTests.java @@ -169,7 +169,7 @@ private class MockChannelDecisionManager implements ChannelDecisionManager { private String supportAttribute; private boolean commitAResponse; - public MockChannelDecisionManager(boolean commitAResponse, String supportAttribute) { + MockChannelDecisionManager(boolean commitAResponse, String supportAttribute) { this.commitAResponse = commitAResponse; this.supportAttribute = supportAttribute; } @@ -197,7 +197,7 @@ private class MockFilterInvocationDefinitionMap implements private String servletPath; private boolean provideIterator; - public MockFilterInvocationDefinitionMap(String servletPath, + MockFilterInvocationDefinitionMap(String servletPath, boolean provideIterator, String... toReturn) { this.servletPath = servletPath; this.toReturn = SecurityConfig.createList(toReturn); diff --git a/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java b/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java index 9145712ba5e..01488e192b1 100644 --- a/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java +++ b/web/src/test/java/org/springframework/security/web/access/expression/WebExpressionVoterTests.java @@ -101,7 +101,7 @@ public void supportFilterInvocationSubClass() { private static class FilterInvocationChild extends FilterInvocation { - public FilterInvocationChild(ServletRequest request, ServletResponse response, + FilterInvocationChild(ServletRequest request, ServletResponse response, FilterChain chain) { super(request, response, chain); } diff --git a/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java index 9411f65988d..24e28362478 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AbstractAuthenticationProcessingFilterTests.java @@ -437,7 +437,7 @@ private class MockAuthenticationFilter private boolean grantAccess; - public MockAuthenticationFilter(boolean grantAccess) { + MockAuthenticationFilter(boolean grantAccess) { this(); setRememberMeServices(new NullRememberMeServices()); this.grantAccess = grantAccess; @@ -465,7 +465,7 @@ private class MockFilterChain implements FilterChain { private boolean expectToProceed; - public MockFilterChain(boolean expectToProceed) { + MockFilterChain(boolean expectToProceed) { this.expectToProceed = expectToProceed; } diff --git a/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java index 96e1558746e..a7205014e0b 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/AnonymousAuthenticationFilterTests.java @@ -120,7 +120,7 @@ public void testOperationWhenNoAuthenticationInSecurityContextHolder() private class MockFilterChain implements FilterChain { private boolean expectToProceed; - public MockFilterChain(boolean expectToProceed) { + MockFilterChain(boolean expectToProceed) { this.expectToProceed = expectToProceed; } diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java index 607d151d035..8e0c70923f7 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java @@ -48,7 +48,7 @@ public final void testGetPreAuthenticatedCredentials() { getRequest("testUser", new String[] {}))); } - private final HttpServletRequest getRequest(final String aUserName, + private HttpServletRequest getRequest(final String aUserName, final String[] aRoles) { MockHttpServletRequest req = new MockHttpServletRequest() { diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java index 6c058a9fce6..72282685abe 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/RememberMeAuthenticationFilterTests.java @@ -168,7 +168,7 @@ public void authenticationSuccessHandlerIsInvokedOnSuccessfulAuthenticationIfSet private class MockRememberMeServices implements RememberMeServices { private Authentication authToReturn; - public MockRememberMeServices(Authentication authToReturn) { + MockRememberMeServices(Authentication authToReturn) { this.authToReturn = authToReturn; } diff --git a/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java b/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java index 433a5e046f7..8d7893c09c0 100644 --- a/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java +++ b/web/src/test/java/org/springframework/security/web/context/HttpSessionSecurityContextRepositoryTests.java @@ -676,7 +676,7 @@ public void saveContextWhenTransientAuthenticationWithCustomAnnotationThenSkippe @Transient private static class SomeTransientAuthentication extends AbstractAuthenticationToken { - public SomeTransientAuthentication() { + SomeTransientAuthentication() { super(null); } @@ -703,7 +703,7 @@ private static class SomeTransientAuthenticationSubclass extends SomeTransientAu @TestTransientAuthentication private static class SomeOtherTransientAuthentication extends AbstractAuthenticationToken { - public SomeOtherTransientAuthentication() { + SomeOtherTransientAuthentication() { super(null); } diff --git a/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java b/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java index d6a12766a03..7a48500abfb 100644 --- a/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java +++ b/web/src/test/java/org/springframework/security/web/context/SaveContextOnUpdateOrErrorResponseWrapperTests.java @@ -180,7 +180,7 @@ private static class SaveContextOnUpdateOrErrorResponseWrapperStub extends SaveContextOnUpdateOrErrorResponseWrapper { private SecurityContext securityContext; - public SaveContextOnUpdateOrErrorResponseWrapperStub( + SaveContextOnUpdateOrErrorResponseWrapperStub( HttpServletResponse response, boolean disableUrlRewriting) { super(response, disableUrlRewriting); } 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 cd54c70a086..a8b18f52f97 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 @@ -400,7 +400,7 @@ public void setAccessDeniedHandlerNull() { this.filter.setAccessDeniedHandler(null); } - private static final CsrfTokenAssert assertToken(Object token) { + private static CsrfTokenAssert assertToken(Object token) { return new CsrfTokenAssert((CsrfToken) token); } diff --git a/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java index 7598a9b012d..7255c83c1a8 100644 --- a/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java +++ b/web/src/test/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolverTests.java @@ -264,10 +264,10 @@ static class CustomUserPrincipal { public final String property = "property"; } - static class CopyUserPrincipal { + public static class CopyUserPrincipal { public final String property; - CopyUserPrincipal(String property) { + public CopyUserPrincipal(String property) { this.property = property; } diff --git a/web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolverTests.java b/web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolverTests.java index 81df04336f0..8f3e6b7fc44 100644 --- a/web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolverTests.java +++ b/web/src/test/java/org/springframework/security/web/reactive/result/method/annotation/CurrentSecurityContextArgumentResolverTests.java @@ -314,7 +314,7 @@ void currentSecurityWithErrorOnInvalidTypeMisMatch(@CurrentSecurityWithErrorOnIn static class CustomSecurityContext implements SecurityContext { private Authentication authentication; - public CustomSecurityContext(Authentication authentication) { + CustomSecurityContext(Authentication authentication) { this.authentication = authentication; } @Override