From 3e700e757128378641057ce0c454e8d48bdc6d0a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 5 Aug 2020 19:55:36 -0700 Subject: [PATCH] Remove (non-Javadoc) comments Search and replace using '(?s)/\*\s*\* \(non-Javadoc\).*?\*/' to remove all "(non-Javadoc)" comments. These comments used to be added automatically by Eclipse, but are not really necessary. Issue gh-8945 --- .../annotation/AbstractSecurityBuilder.java | 5 --- ...utowireBeanFactoryObjectPostProcessor.java | 18 ---------- .../GlobalMethodSecurityConfiguration.java | 6 ---- .../annotation/web/builders/HttpSecurity.java | 33 ------------------- .../SpringWebMvcImportSelector.java | 6 ---- .../WebSecurityConfiguration.java | 13 -------- .../web/configurers/FormLoginConfigurer.java | 7 ---- .../openid/OpenIDLoginConfigurer.java | 7 ---- .../config/http/CsrfBeanDefinitionParser.java | 7 ---- ...HandlerMappingIntrospectorFactoryBean.java | 6 ---- .../customconfigurer/CustomConfigurer.java | 7 ---- ...thodSecurityBeanDefinitionParserTests.java | 7 ---- .../SimpleMappableAttributesRetriever.java | 7 ---- .../AnnotationParameterNameDiscoverer.java | 12 ------- ...thenticationPrincipalArgumentResolver.java | 15 --------- .../openid/OpenIDAuthenticationProvider.java | 14 -------- .../remoting/dns/JndiDnsResolver.java | 21 ------------ .../SecurityMockMvcRequestPostProcessors.java | 12 ------- ...ChangeSessionIdAuthenticationStrategy.java | 7 ---- ...ompositeSessionAuthenticationStrategy.java | 8 ----- ...thenticationPrincipalArgumentResolver.java | 15 --------- ...ractSecurityWebApplicationInitializer.java | 6 ---- .../web/csrf/CsrfAuthenticationStrategy.java | 8 ----- .../security/web/csrf/CsrfFilter.java | 15 --------- .../security/web/csrf/DefaultCsrfToken.java | 15 --------- .../csrf/HttpSessionCsrfTokenRepository.java | 20 ----------- .../web/header/HeaderWriterFilter.java | 6 ---- .../DelegatingRequestMatcherHeaderWriter.java | 7 ---- .../web/header/writers/HpkpHeaderWriter.java | 6 ---- .../web/header/writers/HstsHeaderWriter.java | 6 ---- ...thenticationPrincipalArgumentResolver.java | 15 --------- .../annotation/CsrfTokenArgumentResolver.java | 15 --------- .../web/server/csrf/DefaultCsrfToken.java | 15 --------- .../header/StaticServerHttpHeadersWriter.java | 7 ---- ...nsportSecurityServerHttpHeadersWriter.java | 7 ---- .../XFrameOptionsServerHttpHeadersWriter.java | 6 ---- ...XXssProtectionServerHttpHeadersWriter.java | 7 ---- .../matcher/AndServerWebExchangeMatcher.java | 6 ---- .../NegatedServerWebExchangeMatcher.java | 6 ---- .../matcher/OrServerWebExchangeMatcher.java | 6 ---- .../util/matcher/MvcRequestMatcher.java | 6 ---- .../ConcurrentSessionFilterTests.java | 8 +---- 42 files changed, 1 insertion(+), 425 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java index bc8aa3d53f..e56eec175e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/AbstractSecurityBuilder.java @@ -31,11 +31,6 @@ public abstract class AbstractSecurityBuilder implements SecurityBuilder { private O object; - /* - * (non-Javadoc) - * - * @see org.springframework.security.config.annotation.SecurityBuilder#build() - */ @Override public final O build() throws Exception { if (this.building.compareAndSet(false, true)) { 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 f2187b6872..458715e894 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 @@ -53,13 +53,6 @@ final class AutowireBeanFactoryObjectPostProcessor this.autowireBeanFactory = autowireBeanFactory; } - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.config.annotation.web.Initializer#initialize(java. - * lang.Object) - */ @Override @SuppressWarnings("unchecked") public T postProcess(T object) { @@ -84,12 +77,6 @@ final class AutowireBeanFactoryObjectPostProcessor return result; } - /* - * (non-Javadoc) - * - * @see org.springframework.beans.factory.SmartInitializingSingleton# - * afterSingletonsInstantiated() - */ @Override public void afterSingletonsInstantiated() { for (SmartInitializingSingleton singleton : this.smartSingletons) { @@ -97,11 +84,6 @@ final class AutowireBeanFactoryObjectPostProcessor } } - /* - * (non-Javadoc) - * - * @see org.springframework.beans.factory.DisposableBean#destroy() - */ @Override public void destroy() { for (DisposableBean disposable : this.disposableBeans) { 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 fea0c10fd5..5748ed7773 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 @@ -148,12 +148,6 @@ public class GlobalMethodSecurityConfiguration implements ImportAware, SmartInit return this.methodSecurityInterceptor; } - /* - * (non-Javadoc) - * - * @see org.springframework.beans.factory.SmartInitializingSingleton# - * afterSingletonsInstantiated() - */ @Override public void afterSingletonsInstantiated() { try { 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 89a89f6d1c..593272e0d1 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 @@ -2525,26 +2525,12 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder afterFilter) { this.comparator.registerAfter(filter.getClass(), afterFilter); return addFilter(filter); } - /* - * (non-Javadoc) - * - * @see org.springframework.security.config.annotation.web.HttpSecurityBuilder# - * addFilterBefore( javax.servlet.Filter, java.lang.Class) - */ @Override public HttpSecurity addFilterBefore(Filter filter, Class beforeFilter) { this.comparator.registerBefore(filter.getClass(), beforeFilter); return addFilter(filter); } - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.config.annotation.web.HttpSecurityBuilder#addFilter( - * javax. servlet.Filter) - */ @Override public HttpSecurity addFilter(Filter filter) { Class filterClass = filter.getClass(); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java index 2550cb8cc8..d43c691d5f 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/SpringWebMvcImportSelector.java @@ -29,12 +29,6 @@ import org.springframework.util.ClassUtils; */ class SpringWebMvcImportSelector implements ImportSelector { - /* - * (non-Javadoc) - * - * @see org.springframework.context.annotation.ImportSelector#selectImports(org. - * springframework .core.type.AnnotationMetadata) - */ @Override public String[] selectImports(AnnotationMetadata importingClassMetadata) { boolean webmvcPresent = ClassUtils.isPresent("org.springframework.web.servlet.DispatcherServlet", diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java index c49fa0bbe9..3efddad82d 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfiguration.java @@ -188,12 +188,6 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa return new AutowiredWebSecurityConfigurersIgnoreParents(beanFactory); } - /* - * (non-Javadoc) - * - * @see org.springframework.context.annotation.ImportAware#setImportMetadata(org. - * springframework.core.type.AnnotationMetadata) - */ @Override public void setImportMetadata(AnnotationMetadata importMetadata) { Map enableWebSecurityAttrMap = importMetadata @@ -205,13 +199,6 @@ public class WebSecurityConfiguration implements ImportAware, BeanClassLoaderAwa } } - /* - * (non-Javadoc) - * - * @see - * org.springframework.beans.factory.BeanClassLoaderAware#setBeanClassLoader(java. - * lang.ClassLoader) - */ @Override public void setBeanClassLoader(ClassLoader classLoader) { this.beanClassLoader = classLoader; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java index 840ac4a12f..22044d3b09 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/FormLoginConfigurer.java @@ -231,13 +231,6 @@ public final class FormLoginConfigurer> extends initDefaultLoginFilter(http); } - /* - * (non-Javadoc) - * - * @see org.springframework.security.config.annotation.web.configurers. - * AbstractAuthenticationFilterConfigurer - * #createLoginProcessingUrlMatcher(java.lang.String) - */ @Override protected RequestMatcher createLoginProcessingUrlMatcher(String loginProcessingUrl) { return new AntPathRequestMatcher(loginProcessingUrl, "POST"); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java index 7d304bb37e..68904ef0d6 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java @@ -294,13 +294,6 @@ public final class OpenIDLoginConfigurer> super.configure(http); } - /* - * (non-Javadoc) - * - * @see org.springframework.security.config.annotation.web.configurers. - * AbstractAuthenticationFilterConfigurer - * #createLoginProcessingUrlMatcher(java.lang.String) - */ @Override protected RequestMatcher createLoginProcessingUrlMatcher(String loginProcessingUrl) { return new AntPathRequestMatcher(loginProcessingUrl); diff --git a/config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java index 1c2ca21a68..95f2fee856 100644 --- a/config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java @@ -203,13 +203,6 @@ public class CsrfBeanDefinitionParser implements BeanDefinitionParser { private final HashSet allowedMethods = new HashSet<>(Arrays.asList("GET", "HEAD", "TRACE", "OPTIONS")); - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.web.util.matcher.RequestMatcher#matches(javax. - * servlet.http.HttpServletRequest) - */ @Override public boolean matches(HttpServletRequest request) { return !this.allowedMethods.contains(request.getMethod()); diff --git a/config/src/main/java/org/springframework/security/config/http/HandlerMappingIntrospectorFactoryBean.java b/config/src/main/java/org/springframework/security/config/http/HandlerMappingIntrospectorFactoryBean.java index 20fc6bcedd..3b991a8d38 100644 --- a/config/src/main/java/org/springframework/security/config/http/HandlerMappingIntrospectorFactoryBean.java +++ b/config/src/main/java/org/springframework/security/config/http/HandlerMappingIntrospectorFactoryBean.java @@ -54,12 +54,6 @@ class HandlerMappingIntrospectorFactoryBean return HandlerMappingIntrospector.class; } - /* - * (non-Javadoc) - * - * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org. - * springframework.context.ApplicationContext) - */ @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.context = applicationContext; diff --git a/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomConfigurer.java b/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomConfigurer.java index 730e35620a..4978bee95b 100644 --- a/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomConfigurer.java +++ b/config/src/test/java/org/springframework/security/config/http/customconfigurer/CustomConfigurer.java @@ -33,13 +33,6 @@ public class CustomConfigurer extends SecurityConfigurerAdapter mappableAttributes = null; - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.core.authority.mapping.MappableAttributesRetriever - * #getMappableAttributes() - */ @Override public Set getMappableAttributes() { return this.mappableAttributes; diff --git a/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java b/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java index 897d8b46c3..dcbf25b4ca 100644 --- a/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java +++ b/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java @@ -98,12 +98,6 @@ public class AnnotationParameterNameDiscoverer implements ParameterNameDiscovere this.annotationClassesToUse = annotationClassesToUse; } - /* - * (non-Javadoc) - * - * @see org.springframework.core.ParameterNameDiscoverer#getParameterNames(java - * .lang.reflect.Method) - */ @Override public String[] getParameterNames(Method method) { Method originalMethod = BridgeMethodResolver.findBridgedMethod(method); @@ -122,12 +116,6 @@ public class AnnotationParameterNameDiscoverer implements ParameterNameDiscovere return paramNames; } - /* - * (non-Javadoc) - * - * @see org.springframework.core.ParameterNameDiscoverer#getParameterNames(java - * .lang.reflect.Constructor) - */ @Override public String[] getParameterNames(Constructor constructor) { return lookupParameterNames(CONSTRUCTOR_METHODPARAM_FACTORY, constructor); diff --git a/messaging/src/main/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolver.java b/messaging/src/main/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolver.java index c9e5373188..75df6830d7 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolver.java +++ b/messaging/src/main/java/org/springframework/security/messaging/context/AuthenticationPrincipalArgumentResolver.java @@ -85,26 +85,11 @@ public final class AuthenticationPrincipalArgumentResolver implements HandlerMet private ExpressionParser parser = new SpelExpressionParser(); - /* - * (non-Javadoc) - * - * @see - * org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver# - * supportsParameter(org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return findMethodAnnotation(AuthenticationPrincipal.class, parameter) != null; } - /* - * (non-Javadoc) - * - * @see - * org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver# - * resolveArgument(org.springframework.core.MethodParameter, - * org.springframework.messaging.Message) - */ @Override public Object resolveArgument(MethodParameter parameter, Message message) { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java index 9defb71032..f6d772bc2c 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java @@ -63,13 +63,6 @@ public class OpenIDAuthenticationProvider implements AuthenticationProvider, Ini Assert.notNull(this.userDetailsService, "The userDetailsService must be set"); } - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.authentication.AuthenticationProvider#authenticate - * (org.springframework.security.Authentication) - */ @Override public Authentication authenticate(final Authentication authentication) throws AuthenticationException { @@ -142,13 +135,6 @@ public class OpenIDAuthenticationProvider implements AuthenticationProvider, Ini this.userDetailsService = userDetailsService; } - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.authentication.AuthenticationProvider#supports(java - * .lang.Class) - */ @Override public boolean supports(Class authentication) { return OpenIDAuthenticationToken.class.isAssignableFrom(authentication); diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java b/remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java index 5bfcb31f9b..e196323ba1 100644 --- a/remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java +++ b/remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java @@ -54,37 +54,16 @@ public class JndiDnsResolver implements DnsResolver { this.ctxFactory = ctxFactory; } - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.remoting.dns.DnsResolver#resolveIpAddress(java.lang - * .String) - */ @Override public String resolveIpAddress(String hostname) { return resolveIpAddress(hostname, this.ctxFactory.getCtx()); } - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.remoting.dns.DnsResolver#resolveServiceEntry(java. - * lang.String, java.lang.String) - */ @Override public String resolveServiceEntry(String serviceType, String domain) { return resolveServiceEntry(serviceType, domain, this.ctxFactory.getCtx()); } - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.remoting.dns.DnsResolver#resolveServiceIpAddress(java - * .lang.String, java.lang.String) - */ @Override public String resolveServiceIpAddress(String serviceType, String domain) { DirContext ctx = this.ctxFactory.getCtx(); 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 e40a60659b..36723adf10 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 @@ -489,12 +489,6 @@ public final class SecurityMockMvcRequestPostProcessors { private CsrfRequestPostProcessor() { } - /* - * (non-Javadoc) - * - * @see org.springframework.test.web.servlet.request.RequestPostProcessor - * #postProcessRequest (org.springframework.mock.web.MockHttpServletRequest) - */ @Override public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) { CsrfTokenRepository repository = WebTestUtils.getCsrfTokenRepository(request); @@ -1022,12 +1016,6 @@ public final class SecurityMockMvcRequestPostProcessors { new AnonymousAuthenticationToken("key", "anonymous", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS"))); - /* - * (non-Javadoc) - * - * @see org.springframework.test.web.servlet.request.RequestPostProcessor# - * postProcessRequest(org.springframework.mock.web.MockHttpServletRequest) - */ @Override public MockHttpServletRequest postProcessRequest(MockHttpServletRequest request) { return this.delegate.postProcessRequest(request); diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategy.java index 1a70662205..88e3500a60 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategy.java +++ b/web/src/main/java/org/springframework/security/web/authentication/session/ChangeSessionIdAuthenticationStrategy.java @@ -27,13 +27,6 @@ import javax.servlet.http.HttpSession; */ public final class ChangeSessionIdAuthenticationStrategy extends AbstractSessionFixationProtectionStrategy { - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.authentication.session. - * AbstractSessionFixationProtectionStrategy - * #applySessionFixation(javax.servlet.http.HttpServletRequest) - */ @Override HttpSession applySessionFixation(HttpServletRequest request) { request.changeSessionId(); diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategy.java index e37e824848..177385efd5 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategy.java +++ b/web/src/main/java/org/springframework/security/web/authentication/session/CompositeSessionAuthenticationStrategy.java @@ -70,14 +70,6 @@ public class CompositeSessionAuthenticationStrategy implements SessionAuthentica this.delegateStrategies = delegateStrategies; } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.authentication.session. - * SessionAuthenticationStrategy - * #onAuthentication(org.springframework.security.core.Authentication, - * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public void onAuthentication(Authentication authentication, HttpServletRequest request, HttpServletResponse response) throws SessionAuthenticationException { diff --git a/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java b/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java index d6208ff6a9..dcd3d7e56d 100644 --- a/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java +++ b/web/src/main/java/org/springframework/security/web/bind/support/AuthenticationPrincipalArgumentResolver.java @@ -86,26 +86,11 @@ import org.springframework.web.method.support.ModelAndViewContainer; @Deprecated public final class AuthenticationPrincipalArgumentResolver implements HandlerMethodArgumentResolver { - /* - * (non-Javadoc) - * - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver# - * supportsParameter (org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return findMethodAnnotation(AuthenticationPrincipal.class, parameter) != null; } - /* - * (non-Javadoc) - * - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver# - * resolveArgument (org.springframework.core.MethodParameter, - * org.springframework.web.method.support.ModelAndViewContainer, - * org.springframework.web.context.request.NativeWebRequest, - * org.springframework.web.bind.support.WebDataBinderFactory) - */ @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { 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 34a4fb320c..6edcf65cfa 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 @@ -99,12 +99,6 @@ public abstract class AbstractSecurityWebApplicationInitializer implements WebAp this.configurationClasses = configurationClasses; } - /* - * (non-Javadoc) - * - * @see org.springframework.web.WebApplicationInitializer#onStartup(javax.servlet. - * ServletContext) - */ @Override public final void onStartup(ServletContext servletContext) { beforeSpringSecurityFilterChain(servletContext); diff --git a/web/src/main/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategy.java b/web/src/main/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategy.java index 27841feeeb..b126c744bd 100644 --- a/web/src/main/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategy.java +++ b/web/src/main/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategy.java @@ -44,14 +44,6 @@ public final class CsrfAuthenticationStrategy implements SessionAuthenticationSt this.csrfTokenRepository = csrfTokenRepository; } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.authentication.session. - * SessionAuthenticationStrategy - * #onAuthentication(org.springframework.security.core.Authentication, - * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public void onAuthentication(Authentication authentication, HttpServletRequest request, HttpServletResponse response) throws SessionAuthenticationException { diff --git a/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java b/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java index a4d4bd8e3d..a780d56ebd 100644 --- a/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java +++ b/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java @@ -94,14 +94,6 @@ public final class CsrfFilter extends OncePerRequestFilter { return TRUE.equals(request.getAttribute(SHOULD_NOT_FILTER)); } - /* - * (non-Javadoc) - * - * @see - * org.springframework.web.filter.OncePerRequestFilter#doFilterInternal(javax.servlet - * .http.HttpServletRequest, javax.servlet.http.HttpServletResponse, - * javax.servlet.FilterChain) - */ @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { @@ -181,13 +173,6 @@ public final class CsrfFilter extends OncePerRequestFilter { private final HashSet allowedMethods = new HashSet<>(Arrays.asList("GET", "HEAD", "TRACE", "OPTIONS")); - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.web.util.matcher.RequestMatcher#matches(javax. - * servlet.http.HttpServletRequest) - */ @Override public boolean matches(HttpServletRequest request) { return !this.allowedMethods.contains(request.getMethod()); diff --git a/web/src/main/java/org/springframework/security/web/csrf/DefaultCsrfToken.java b/web/src/main/java/org/springframework/security/web/csrf/DefaultCsrfToken.java index 4cab384351..e186418d2a 100644 --- a/web/src/main/java/org/springframework/security/web/csrf/DefaultCsrfToken.java +++ b/web/src/main/java/org/springframework/security/web/csrf/DefaultCsrfToken.java @@ -48,31 +48,16 @@ public final class DefaultCsrfToken implements CsrfToken { this.token = token; } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.csrf.CsrfToken#getHeaderName() - */ @Override public String getHeaderName() { return this.headerName; } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.csrf.CsrfToken#getParameterName() - */ @Override public String getParameterName() { return this.parameterName; } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.csrf.CsrfToken#getToken() - */ @Override public String getToken() { return this.token; diff --git a/web/src/main/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepository.java b/web/src/main/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepository.java index 53749dc7c7..de6e34f2f9 100644 --- a/web/src/main/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepository.java +++ b/web/src/main/java/org/springframework/security/web/csrf/HttpSessionCsrfTokenRepository.java @@ -45,13 +45,6 @@ public final class HttpSessionCsrfTokenRepository implements CsrfTokenRepository private String sessionAttributeName = DEFAULT_CSRF_TOKEN_ATTR_NAME; - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.csrf.CsrfTokenRepository#saveToken(org. - * springframework .security.web.csrf.CsrfToken, - * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public void saveToken(CsrfToken token, HttpServletRequest request, HttpServletResponse response) { if (token == null) { @@ -66,13 +59,6 @@ public final class HttpSessionCsrfTokenRepository implements CsrfTokenRepository } } - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.web.csrf.CsrfTokenRepository#loadToken(javax.servlet - * .http.HttpServletRequest) - */ @Override public CsrfToken loadToken(HttpServletRequest request) { HttpSession session = request.getSession(false); @@ -82,12 +68,6 @@ public final class HttpSessionCsrfTokenRepository implements CsrfTokenRepository return (CsrfToken) session.getAttribute(this.sessionAttributeName); } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.csrf.CsrfTokenRepository#generateToken(javax. - * servlet .http.HttpServletRequest) - */ @Override public CsrfToken generateToken(HttpServletRequest request) { return new DefaultCsrfToken(this.headerName, this.parameterName, createNewToken()); diff --git a/web/src/main/java/org/springframework/security/web/header/HeaderWriterFilter.java b/web/src/main/java/org/springframework/security/web/header/HeaderWriterFilter.java index e30979dcc7..8d413a2de1 100644 --- a/web/src/main/java/org/springframework/security/web/header/HeaderWriterFilter.java +++ b/web/src/main/java/org/springframework/security/web/header/HeaderWriterFilter.java @@ -120,12 +120,6 @@ public class HeaderWriterFilter extends OncePerRequestFilter { this.request = request; } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.util.OnCommittedResponseWrapper# - * onResponseCommitted() - */ @Override protected void onResponseCommitted() { writeHeaders(); diff --git a/web/src/main/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriter.java index 688877cb32..ca52b24ba9 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/DelegatingRequestMatcherHeaderWriter.java @@ -49,13 +49,6 @@ public final class DelegatingRequestMatcherHeaderWriter implements HeaderWriter this.delegateHeaderWriter = delegateHeaderWriter; } - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.web.headers.HeaderWriter#writeHeaders(javax.servlet - * .http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public void writeHeaders(HttpServletRequest request, HttpServletResponse response) { if (this.requestMatcher.matches(request)) { diff --git a/web/src/main/java/org/springframework/security/web/header/writers/HpkpHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/HpkpHeaderWriter.java index 50cf69cccc..52fa0300ff 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/HpkpHeaderWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/HpkpHeaderWriter.java @@ -171,12 +171,6 @@ public final class HpkpHeaderWriter implements HeaderWriter { this(DEFAULT_MAX_AGE_SECONDS); } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.headers.HeaderWriter#writeHeaders(javax - * .servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public void writeHeaders(HttpServletRequest request, HttpServletResponse response) { if (this.requestMatcher.matches(request)) { diff --git a/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java index b09121536b..743677b1ea 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/HstsHeaderWriter.java @@ -145,12 +145,6 @@ public final class HstsHeaderWriter implements HeaderWriter { this(DEFAULT_MAX_AGE_SECONDS); } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.headers.HeaderWriter#writeHeaders(javax - * .servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse) - */ @Override public void writeHeaders(HttpServletRequest request, HttpServletResponse response) { if (this.requestMatcher.matches(request)) { diff --git a/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java b/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java index 4fe44899fd..17ba5b44c9 100644 --- a/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java +++ b/web/src/main/java/org/springframework/security/web/method/annotation/AuthenticationPrincipalArgumentResolver.java @@ -90,26 +90,11 @@ public final class AuthenticationPrincipalArgumentResolver implements HandlerMet private BeanResolver beanResolver; - /* - * (non-Javadoc) - * - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver# - * supportsParameter (org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return findMethodAnnotation(AuthenticationPrincipal.class, parameter) != null; } - /* - * (non-Javadoc) - * - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver# - * resolveArgument (org.springframework.core.MethodParameter, - * org.springframework.web.method.support.ModelAndViewContainer, - * org.springframework.web.context.request.NativeWebRequest, - * org.springframework.web.bind.support.WebDataBinderFactory) - */ @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { diff --git a/web/src/main/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolver.java b/web/src/main/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolver.java index f5f22d8c22..cc401de79a 100644 --- a/web/src/main/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolver.java +++ b/web/src/main/java/org/springframework/security/web/method/annotation/CsrfTokenArgumentResolver.java @@ -44,26 +44,11 @@ import org.springframework.web.method.support.ModelAndViewContainer; */ public final class CsrfTokenArgumentResolver implements HandlerMethodArgumentResolver { - /* - * (non-Javadoc) - * - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver# - * supportsParameter (org.springframework.core.MethodParameter) - */ @Override public boolean supportsParameter(MethodParameter parameter) { return CsrfToken.class.equals(parameter.getParameterType()); } - /* - * (non-Javadoc) - * - * @see org.springframework.web.method.support.HandlerMethodArgumentResolver# - * resolveArgument (org.springframework.core.MethodParameter, - * org.springframework.web.method.support.ModelAndViewContainer, - * org.springframework.web.context.request.NativeWebRequest, - * org.springframework.web.bind.support.WebDataBinderFactory) - */ @Override public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { diff --git a/web/src/main/java/org/springframework/security/web/server/csrf/DefaultCsrfToken.java b/web/src/main/java/org/springframework/security/web/server/csrf/DefaultCsrfToken.java index f7173e2fab..de0aefd93c 100644 --- a/web/src/main/java/org/springframework/security/web/server/csrf/DefaultCsrfToken.java +++ b/web/src/main/java/org/springframework/security/web/server/csrf/DefaultCsrfToken.java @@ -48,31 +48,16 @@ public final class DefaultCsrfToken implements CsrfToken { this.token = token; } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.csrf.CsrfToken#getHeaderName() - */ @Override public String getHeaderName() { return this.headerName; } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.csrf.CsrfToken#getParameterName() - */ @Override public String getParameterName() { return this.parameterName; } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.csrf.CsrfToken#getToken() - */ @Override public String getToken() { return this.token; diff --git a/web/src/main/java/org/springframework/security/web/server/header/StaticServerHttpHeadersWriter.java b/web/src/main/java/org/springframework/security/web/server/header/StaticServerHttpHeadersWriter.java index dabfeab63e..f763655171 100644 --- a/web/src/main/java/org/springframework/security/web/server/header/StaticServerHttpHeadersWriter.java +++ b/web/src/main/java/org/springframework/security/web/server/header/StaticServerHttpHeadersWriter.java @@ -37,13 +37,6 @@ public class StaticServerHttpHeadersWriter implements ServerHttpHeadersWriter { this.headersToAdd = headersToAdd; } - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.web.server.HttpHeadersWriter#writeHttpHeaders(org. - * springframework.web.server.ServerWebExchange) - */ @Override public Mono writeHttpHeaders(ServerWebExchange exchange) { HttpHeaders headers = exchange.getResponse().getHeaders(); diff --git a/web/src/main/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriter.java b/web/src/main/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriter.java index b1deb3c465..049e870a6c 100644 --- a/web/src/main/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriter.java +++ b/web/src/main/java/org/springframework/security/web/server/header/StrictTransportSecurityServerHttpHeadersWriter.java @@ -49,13 +49,6 @@ public final class StrictTransportSecurityServerHttpHeadersWriter implements Ser updateDelegate(); } - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.web.server.HttpHeadersWriter#writeHttpHeaders(org. - * springframework.http.HttpHeaders) - */ @Override public Mono writeHttpHeaders(ServerWebExchange exchange) { return isSecure(exchange) ? this.delegate.writeHttpHeaders(exchange) : Mono.empty(); 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 7dcd2a385a..6346f837f5 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 @@ -31,12 +31,6 @@ public class XFrameOptionsServerHttpHeadersWriter implements ServerHttpHeadersWr private ServerHttpHeadersWriter delegate = createDelegate(Mode.DENY); - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.server.HttpHeadersWriter# - * writeHttpHeaders(org.springframework.web.server.ServerWebExchange) - */ @Override public Mono writeHttpHeaders(ServerWebExchange exchange) { return this.delegate.writeHttpHeaders(exchange); diff --git a/web/src/main/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriter.java b/web/src/main/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriter.java index c3d1fd05f5..c67116354f 100644 --- a/web/src/main/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriter.java +++ b/web/src/main/java/org/springframework/security/web/server/header/XXssProtectionServerHttpHeadersWriter.java @@ -44,13 +44,6 @@ public class XXssProtectionServerHttpHeadersWriter implements ServerHttpHeadersW updateDelegate(); } - /* - * (non-Javadoc) - * - * @see - * org.springframework.security.web.server.HttpHeadersWriter#writeHttpHeaders(org. - * springframework.web.server.ServerWebExchange) - */ @Override public Mono writeHttpHeaders(ServerWebExchange exchange) { return this.delegate.writeHttpHeaders(exchange); diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java index 774b5fb569..d16eb934e5 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/AndServerWebExchangeMatcher.java @@ -51,12 +51,6 @@ public class AndServerWebExchangeMatcher implements ServerWebExchangeMatcher { this(Arrays.asList(matchers)); } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher# - * matches(org.springframework.web.server.ServerWebExchange) - */ @Override public Mono matches(ServerWebExchange exchange) { return Mono.defer(() -> { diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcher.java index 5ac9796f6e..7ffdff8ceb 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/NegatedServerWebExchangeMatcher.java @@ -41,12 +41,6 @@ public class NegatedServerWebExchangeMatcher implements ServerWebExchangeMatcher this.matcher = matcher; } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher# - * matches(org.springframework.web.server.ServerWebExchange) - */ @Override public Mono matches(ServerWebExchange exchange) { return this.matcher.matches(exchange).flatMap(m -> m.isMatch() ? MatchResult.notMatch() : MatchResult.match()) diff --git a/web/src/main/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java b/web/src/main/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java index 8675567f9a..302b38b58d 100644 --- a/web/src/main/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java +++ b/web/src/main/java/org/springframework/security/web/server/util/matcher/OrServerWebExchangeMatcher.java @@ -49,12 +49,6 @@ public class OrServerWebExchangeMatcher implements ServerWebExchangeMatcher { this(Arrays.asList(matchers)); } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher# - * matches(org.springframework.web.server.ServerWebExchange) - */ @Override public Mono matches(ServerWebExchange exchange) { return Flux.fromIterable(this.matchers).doOnNext(it -> { diff --git a/web/src/main/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcher.java b/web/src/main/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcher.java index 55f0ecd699..7db8ab5983 100644 --- a/web/src/main/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcher.java +++ b/web/src/main/java/org/springframework/security/web/servlet/util/matcher/MvcRequestMatcher.java @@ -87,12 +87,6 @@ public class MvcRequestMatcher implements RequestMatcher, RequestVariablesExtrac } } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.util.matcher.RequestVariablesExtractor# - * extractUriTemplateVariables(javax.servlet.http.HttpServletRequest) - */ @Override @Deprecated public Map extractUriTemplateVariables(HttpServletRequest request) { diff --git a/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java b/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java index 6f9549f975..57c42e4f6b 100644 --- a/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/concurrent/ConcurrentSessionFilterTests.java @@ -251,13 +251,7 @@ public class ConcurrentSessionFilterTests { final String expiredUrl = "/expired"; ConcurrentSessionFilter filter = new ConcurrentSessionFilter(registry, expiredUrl + "will-be-overrridden") { - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.session.ConcurrentSessionFilter# - * determineExpiredUrl(javax.servlet.http.HttpServletRequest, - * org.springframework.security.core.session.SessionInformation) - */ + @Override protected String determineExpiredUrl(HttpServletRequest request, SessionInformation info) { return expiredUrl;