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
This commit is contained in:
parent
a2f2e9ac8d
commit
3e700e7571
|
@ -31,11 +31,6 @@ public abstract class AbstractSecurityBuilder<O> implements SecurityBuilder<O> {
|
|||
|
||||
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)) {
|
||||
|
|
|
@ -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> 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) {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -2525,26 +2525,12 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
|
|||
return new DefaultSecurityFilterChain(this.requestMatcher, this.filters);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.springframework.security.config.annotation.web.HttpSecurityBuilder#
|
||||
* authenticationProvider
|
||||
* (org.springframework.security.authentication.AuthenticationProvider)
|
||||
*/
|
||||
@Override
|
||||
public HttpSecurity authenticationProvider(AuthenticationProvider authenticationProvider) {
|
||||
getAuthenticationRegistry().authenticationProvider(authenticationProvider);
|
||||
return this;
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.springframework.security.config.annotation.web.HttpSecurityBuilder#
|
||||
* userDetailsService
|
||||
* (org.springframework.security.core.userdetails.UserDetailsService)
|
||||
*/
|
||||
@Override
|
||||
public HttpSecurity userDetailsService(UserDetailsService userDetailsService) throws Exception {
|
||||
getAuthenticationRegistry().userDetailsService(userDetailsService);
|
||||
|
@ -2555,37 +2541,18 @@ public final class HttpSecurity extends AbstractConfiguredSecurityBuilder<Defaul
|
|||
return getSharedObject(AuthenticationManagerBuilder.class);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see org.springframework.security.config.annotation.web.HttpSecurityBuilder#
|
||||
* addFilterAfter(javax .servlet.Filter, java.lang.Class)
|
||||
*/
|
||||
@Override
|
||||
public HttpSecurity addFilterAfter(Filter filter, Class<? extends Filter> 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<? extends Filter> 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<? extends Filter> filterClass = filter.getClass();
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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<String, Object> 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;
|
||||
|
|
|
@ -231,13 +231,6 @@ public final class FormLoginConfigurer<H extends HttpSecurityBuilder<H>> 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");
|
||||
|
|
|
@ -294,13 +294,6 @@ public final class OpenIDLoginConfigurer<H extends HttpSecurityBuilder<H>>
|
|||
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);
|
||||
|
|
|
@ -203,13 +203,6 @@ public class CsrfBeanDefinitionParser implements BeanDefinitionParser {
|
|||
|
||||
private final HashSet<String> 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());
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -33,13 +33,6 @@ public class CustomConfigurer extends SecurityConfigurerAdapter<DefaultSecurityF
|
|||
|
||||
private String loginPage = "/login";
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see
|
||||
* org.springframework.security.config.annotation.SecurityConfigurerAdapter#init(org.
|
||||
* springframework.security.config.annotation.SecurityBuilder)
|
||||
*/
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void init(HttpSecurity http) throws Exception {
|
||||
|
|
|
@ -414,13 +414,6 @@ public class GlobalMethodSecurityBeanDefinitionParserTests {
|
|||
return this.authenticationManager.authenticate(authentication);
|
||||
}
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see
|
||||
* org.springframework.context.ApplicationContextAware#setApplicationContext(org
|
||||
* .springframework.context.ApplicationContext)
|
||||
*/
|
||||
@Override
|
||||
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
|
||||
this.authenticationManager = applicationContext.getBean(this.beanName, AuthenticationManager.class);
|
||||
|
|
|
@ -30,13 +30,6 @@ public class SimpleMappableAttributesRetriever implements MappableAttributesRetr
|
|||
|
||||
private Set<String> mappableAttributes = null;
|
||||
|
||||
/*
|
||||
* (non-Javadoc)
|
||||
*
|
||||
* @see
|
||||
* org.springframework.security.core.authority.mapping.MappableAttributesRetriever
|
||||
* #getMappableAttributes()
|
||||
*/
|
||||
@Override
|
||||
public Set<String> getMappableAttributes() {
|
||||
return this.mappableAttributes;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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<String> 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());
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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());
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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)) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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<Void> writeHttpHeaders(ServerWebExchange exchange) {
|
||||
HttpHeaders headers = exchange.getResponse().getHeaders();
|
||||
|
|
|
@ -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<Void> writeHttpHeaders(ServerWebExchange exchange) {
|
||||
return isSecure(exchange) ? this.delegate.writeHttpHeaders(exchange) : Mono.empty();
|
||||
|
|
|
@ -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<Void> writeHttpHeaders(ServerWebExchange exchange) {
|
||||
return this.delegate.writeHttpHeaders(exchange);
|
||||
|
|
|
@ -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<Void> writeHttpHeaders(ServerWebExchange exchange) {
|
||||
return this.delegate.writeHttpHeaders(exchange);
|
||||
|
|
|
@ -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<MatchResult> matches(ServerWebExchange exchange) {
|
||||
return Mono.defer(() -> {
|
||||
|
|
|
@ -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<MatchResult> matches(ServerWebExchange exchange) {
|
||||
return this.matcher.matches(exchange).flatMap(m -> m.isMatch() ? MatchResult.notMatch() : MatchResult.match())
|
||||
|
|
|
@ -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<MatchResult> matches(ServerWebExchange exchange) {
|
||||
return Flux.fromIterable(this.matchers).doOnNext(it -> {
|
||||
|
|
|
@ -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<String, String> extractUriTemplateVariables(HttpServletRequest request) {
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue