Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup Code Style Issues

Browse Source 
Cleanup Code Style Issues
This commit is contained in:
Rob Winch
2019-08-12 13:06:49 -05:00
committed by GitHub
parent a51318eb95 ec6ca97226
commit c1db1aad91
172 changed files with 288 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java
View File

@@ -58,7 +58,7 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
private final LinkedHashMap<Class<? extends SecurityConfigurer<O, B>>, List<SecurityConfigurer<O, B>>> configurers = new LinkedHashMap<>();
private final List<SecurityConfigurer<O, B>> configurersAddedInInitializing = new ArrayList<>();
private final Map<Class<? extends Object>, Object> sharedObjects = new HashMap<>();
private final Map<Class<?>, Object> sharedObjects = new HashMap<>();
private final boolean allowConfigurersOfSameType;
@@ -174,7 +174,7 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
* Gets the shared objects
* @return the shared Objects
*/
public Map<Class<? extends Object>, Object> getSharedObjects() {
public Map<Class<?>, Object> getSharedObjects() {
return Collections.unmodifiableMap(this.sharedObjects);
}
@@ -409,7 +409,7 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
* @author Rob Winch
* @since 3.2
*/
private static enum BuildState {
private enum BuildState {
/**
* This is the state before the {@link Builder#build()} is invoked
*/

4
config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java
View File

@@ -110,7 +110,7 @@ public abstract class SecurityConfigurerAdapter<O, B extends SecurityBuilder<O>>
*/
private static final class CompositeObjectPostProcessor implements
ObjectPostProcessor<Object> {
private List<ObjectPostProcessor<? extends Object>> postProcessors = new ArrayList<>();
private List<ObjectPostProcessor<?>> postProcessors = new ArrayList<>();
@SuppressWarnings({ "rawtypes", "unchecked" })
public Object postProcess(Object object) {
@@ -131,7 +131,7 @@ public abstract class SecurityConfigurerAdapter<O, B extends SecurityBuilder<O>>
* @return true if the {@link ObjectPostProcessor} was added, else false
*/
private boolean addObjectPostProcessor(
ObjectPostProcessor<? extends Object> objectPostProcessor) {
ObjectPostProcessor<?> objectPostProcessor) {
boolean result = this.postProcessors.add(objectPostProcessor);
postProcessors.sort(AnnotationAwareOrderComparator.INSTANCE);
return result;

2
config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/AuthenticationConfiguration.java
View File

@@ -193,7 +193,7 @@ public class AuthenticationConfiguration {
private static final Log logger = LogFactory
.getLog(EnableGlobalAuthenticationAutowiredConfigurer.class);
public EnableGlobalAuthenticationAutowiredConfigurer(ApplicationContext context) {
EnableGlobalAuthenticationAutowiredConfigurer(ApplicationContext context) {
this.context = context;
}

4
config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeAuthenticationProviderBeanManagerConfigurer.java
View File

@@ -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 @@ class InitializeAuthenticationProviderBeanManagerConfigurer
.getBean(userDetailsBeanNames[0], type);
}
}
}
}

2
config/src/main/java/org/springframework/security/config/annotation/authentication/configuration/InitializeUserDetailsBeanManagerConfigurer.java
View File

@@ -43,7 +43,7 @@ class InitializeUserDetailsBeanManagerConfigurer
/**
* @param context
*/
public InitializeUserDetailsBeanManagerConfigurer(ApplicationContext context) {
InitializeUserDetailsBeanManagerConfigurer(ApplicationContext context) {
this.context = context;
}

2
config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java
View File

@@ -44,7 +44,7 @@ final class AutowireBeanFactoryObjectPostProcessor
private final List<DisposableBean> disposableBeans = new ArrayList<>();
private final List<SmartInitializingSingleton> smartSingletons = new ArrayList<>();
public AutowireBeanFactoryObjectPostProcessor(
AutowireBeanFactoryObjectPostProcessor(
AutowireCapableBeanFactory autowireBeanFactory) {
Assert.notNull(autowireBeanFactory, "autowireBeanFactory cannot be null");
this.autowireBeanFactory = autowireBeanFactory;

2
config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java
View File

@@ -241,7 +241,7 @@ public class GlobalMethodSecurityConfiguration
* @return the {@link AccessDecisionManager} to use
*/
protected AccessDecisionManager accessDecisionManager() {
List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<>();
List<AccessDecisionVoter<?>> decisionVoters = new ArrayList<>();
ExpressionBasedPreInvocationAdvice expressionAdvice = new ExpressionBasedPreInvocationAdvice();
expressionAdvice.setExpressionHandler(getExpressionHandler());
if (prePostEnabled()) {

2
config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java
View File

@@ -36,7 +36,7 @@ import org.springframework.util.ClassUtils;
*/
final class GlobalMethodSecuritySelector implements ImportSelector {
public final String[] selectImports(AnnotationMetadata importingClassMetadata) {
public String[] selectImports(AnnotationMetadata importingClassMetadata) {
Class<EnableGlobalMethodSecurity> annoType = EnableGlobalMethodSecurity.class;
Map<String, Object> annotationAttributes = importingClassMetadata
.getAnnotationAttributes(annoType.getName(), false);

4
config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java
View File

@@ -137,11 +137,11 @@ public final class HttpSecurity extends
@SuppressWarnings("unchecked")
public HttpSecurity(ObjectPostProcessor<Object> objectPostProcessor,
AuthenticationManagerBuilder authenticationBuilder,
Map<Class<? extends Object>, Object> sharedObjects) {
Map<Class<?>, Object> sharedObjects) {
super(objectPostProcessor);
Assert.notNull(authenticationBuilder, "authenticationBuilder cannot be null");
setSharedObject(AuthenticationManagerBuilder.class, authenticationBuilder);
for (Map.Entry<Class<? extends Object>, Object> entry : sharedObjects
for (Map.Entry<Class<?>, Object> entry : sharedObjects
.entrySet()) {
setSharedObject((Class<Object>) entry.getKey(), entry.getValue());
}

2
config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java
View File

@@ -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;

6
config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java
View File

@@ -201,7 +201,7 @@ public abstract class WebSecurityConfigurerAdapter implements
AuthenticationManager authenticationManager = authenticationManager();
authenticationBuilder.parentAuthenticationManager(authenticationManager);
authenticationBuilder.authenticationEventPublisher(eventPublisher);
Map<Class<? extends Object>, Object> sharedObjects = createSharedObjects();
Map<Class<?>, Object> sharedObjects = createSharedObjects();
http = new HttpSecurity(objectPostProcessor, authenticationBuilder,
sharedObjects);
@@ -412,8 +412,8 @@ public abstract class WebSecurityConfigurerAdapter implements
*
* @return the shared Objects
*/
private Map<Class<? extends Object>, Object> createSharedObjects() {
Map<Class<? extends Object>, Object> sharedObjects = new HashMap<>();
private Map<Class<?>, Object> createSharedObjects() {
Map<Class<?>, Object> sharedObjects = new HashMap<>();
sharedObjects.putAll(localConfigureAuthenticationBldr.getSharedObjects());
sharedObjects.put(UserDetailsService.class, userDetailsService());
sharedObjects.put(ApplicationContext.class, context);

4
config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractInterceptUrlConfigurer.java
View File

@@ -108,7 +108,7 @@ abstract class AbstractInterceptUrlConfigurer<C extends AbstractInterceptUrlConf
* @return the {@link AccessDecisionVoter} instances used to create the default
* {@link AccessDecisionManager}
*/
abstract List<AccessDecisionVoter<? extends Object>> getDecisionVoters(H http);
abstract List<AccessDecisionVoter<?>> getDecisionVoters(H http);
abstract class AbstractInterceptUrlRegistry<R extends AbstractInterceptUrlRegistry<R, T>, T>
extends AbstractConfigAttributeRequestMatcherRegistry<T> {
@@ -195,4 +195,4 @@ abstract class AbstractInterceptUrlConfigurer<C extends AbstractInterceptUrlConf
securityInterceptor.afterPropertiesSet();
return securityInterceptor;
}
}
}

6
config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java
View File

@@ -183,8 +183,8 @@ public final class ExpressionUrlAuthorizationConfigurer<H extends HttpSecurityBu
@Override
@SuppressWarnings("rawtypes")
final List<AccessDecisionVoter<? extends Object>> getDecisionVoters(H http) {
List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<>();
List<AccessDecisionVoter<?>> getDecisionVoters(H http) {
List<AccessDecisionVoter<?>> decisionVoters = new ArrayList<>();
WebExpressionVoter expressionVoter = new WebExpressionVoter();
expressionVoter.setExpressionHandler(getExpressionHandler(http));
decisionVoters.add(expressionVoter);
@@ -192,7 +192,7 @@ public final class ExpressionUrlAuthorizationConfigurer<H extends HttpSecurityBu
}
@Override
final ExpressionBasedFilterInvocationSecurityMetadataSource createMetadataSource(
ExpressionBasedFilterInvocationSecurityMetadataSource createMetadataSource(
H http) {
LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = REGISTRY
.createRequestMap();

4
config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java
View File

@@ -172,8 +172,8 @@ public final class UrlAuthorizationConfigurer<H extends HttpSecurityBuilder<H>>
*/
@Override
@SuppressWarnings("rawtypes")
final List<AccessDecisionVoter<? extends Object>> getDecisionVoters(H http) {
List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<>();
List<AccessDecisionVoter<?>> getDecisionVoters(H http) {
List<AccessDecisionVoter<?>> decisionVoters = new ArrayList<>();
decisionVoters.add(new RoleVoter());
decisionVoters.add(new AuthenticatedVoter());
return decisionVoters;

2
config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java
View File

@@ -159,7 +159,7 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends
MessageExpressionVoter<Object> voter = new MessageExpressionVoter<>();
voter.setExpressionHandler(getMessageExpressionHandler());
List<AccessDecisionVoter<? extends Object>> voters = new ArrayList<>();
List<AccessDecisionVoter<?>> voters = new ArrayList<>();
voters.add(voter);
AffirmativeBased manager = new AffirmativeBased(voters);

2
config/src/main/java/org/springframework/security/config/crypto/RsaKeyConversionServicePostProcessor.java
View File

@@ -133,7 +133,7 @@ public class RsaKeyConversionServicePostProcessor implements BeanFactoryPostProc
private static class ConverterPropertyEditorAdapter<T> extends PropertyEditorSupport {
private final Converter<String, T> converter;
public ConverterPropertyEditorAdapter(Converter<String, T> converter) {
ConverterPropertyEditorAdapter(Converter<String, T> converter) {
this.converter = converter;
}

2
config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java
View File

@@ -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,

2
config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java
View File

@@ -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;

4
config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java
View File

@@ -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;
}

2
config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java
View File

@@ -48,7 +48,7 @@ class LogoutBeanDefinitionParser implements BeanDefinitionParser {
private ManagedList<BeanMetadataElement> 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;

4
config/src/main/java/org/springframework/security/config/http/SecurityFilters.java
View File

@@ -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;
}

2
config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java
View File

@@ -68,7 +68,7 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor {
private final PointcutParser parser;
private final Set<String> processedBeans = new HashSet<>();
public ProtectPointcutPostProcessor(
ProtectPointcutPostProcessor(
MapBasedMethodSecurityMetadataSource mapBasedMethodSecurityMetadataSource) {
Assert.notNull(mapBasedMethodSecurityMetadataSource,
"MapBasedMethodSecurityMetadataSource to populate is required");

4
config/src/main/java/org/springframework/security/config/web/server/SecurityWebFiltersOrder.java
View File

@@ -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;
}

2
config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
View File

@@ -3658,7 +3658,7 @@ public class ServerHttpSecurity {
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;
}

3
config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java
View File

@@ -243,8 +243,7 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements
private final boolean sameOriginDisabled;
public MessageSecurityPostProcessor(String inboundSecurityInterceptorId,
boolean sameOriginDisabled) {
MessageSecurityPostProcessor(String inboundSecurityInterceptorId, boolean sameOriginDisabled) {
this.inboundSecurityInterceptorId = inboundSecurityInterceptorId;
this.sameOriginDisabled = sameOriginDisabled;
}

2
config/src/test/java/org/springframework/security/config/annotation/SecurityConfigurerAdapterTests.java
View File

@@ -41,7 +41,7 @@ public class SecurityConfigurerAdapterTests {
static class OrderedObjectPostProcessor implements ObjectPostProcessor<String>, Ordered {
private final int order;
public OrderedObjectPostProcessor(int order) {
OrderedObjectPostProcessor(int order) {
this.order = order;
}

2
config/src/test/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurerTests.java
View File

@@ -847,7 +847,7 @@ public class ExpressionUrlAuthorizationConfigurerTests {
static class CustomExpressionRoot extends WebSecurityExpressionRoot {
public CustomExpressionRoot(Authentication a, FilterInvocation fi) {
CustomExpressionRoot(Authentication a, FilterInvocation fi) {
super(a, fi);
}

2
config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpExpressionHandlerTests.java
View File

@@ -73,7 +73,7 @@ public class NamespaceHttpExpressionHandlerTests {
@EnableWebMvc
@EnableWebSecurity
private static class ExpressionHandlerConfig extends WebSecurityConfigurerAdapter {
public ExpressionHandlerConfig() {}
ExpressionHandlerConfig() {}
@Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception {

2
config/src/test/java/org/springframework/security/config/annotation/web/configurers/SecurityContextConfigurerTests.java
View File

@@ -129,7 +129,7 @@ public class SecurityContextConfigurerTests {
@Configuration
@EnableWebSecurity
static class SecurityContextRepositoryDefaultsSecurityContextRepositoryConfig extends WebSecurityConfigurerAdapter {
public SecurityContextRepositoryDefaultsSecurityContextRepositoryConfig() {
SecurityContextRepositoryDefaultsSecurityContextRepositoryConfig() {
super(true);
}

4
config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/resource/OAuth2ResourceServerConfigurerTests.java
View File

@@ -2133,7 +2133,7 @@ public class OAuth2ResourceServerConfigurerTests {
private class MockWebServerPropertySource extends PropertySource {
public MockWebServerPropertySource() {
MockWebServerPropertySource() {
super("mockwebserver");
}
@@ -2178,7 +2178,7 @@ public class OAuth2ResourceServerConfigurerTests {
private String token;
public BearerTokenRequestPostProcessor(String token) {
BearerTokenRequestPostProcessor(String token) {
this.token = token;
}

2
config/src/test/java/org/springframework/security/config/http/CsrfConfigTests.java
View File

@@ -631,7 +631,7 @@ public class CsrfConfigTests {
static class CsrfReturnedResultMatcher implements ResultMatcher {
ExceptionalFunction<MvcResult, String> token;
public CsrfReturnedResultMatcher(ExceptionalFunction<MvcResult, String> token) {
CsrfReturnedResultMatcher(ExceptionalFunction<MvcResult, String> token) {
this.token = token;
}

2
config/src/test/java/org/springframework/security/config/http/HttpConfigTests.java
View File

@@ -83,7 +83,7 @@ public class HttpConfigTests {
private static class EncodeUrlDenyingHttpServletResponseWrapper
extends HttpServletResponseWrapper {
public EncodeUrlDenyingHttpServletResponseWrapper(HttpServletResponse response) {
EncodeUrlDenyingHttpServletResponseWrapper(HttpServletResponse response) {
super(response);
}

2
config/src/test/java/org/springframework/security/config/http/MiscHttpConfigTests.java
View File

@@ -907,7 +907,7 @@ public class MiscHttpConfigTests {
static class EncodeUrlDenyingHttpServletResponseWrapper
extends HttpServletResponseWrapper {
public EncodeUrlDenyingHttpServletResponseWrapper(HttpServletResponse response) {
EncodeUrlDenyingHttpServletResponseWrapper(HttpServletResponse response) {
super(response);
}

2
config/src/test/java/org/springframework/security/config/http/SessionManagementConfigTests.java
View File

@@ -610,7 +610,7 @@ public class SessionManagementConfigTests {
private static class EncodeUrlDenyingHttpServletResponseWrapper
extends HttpServletResponseWrapper {
public EncodeUrlDenyingHttpServletResponseWrapper(HttpServletResponse response) {
EncodeUrlDenyingHttpServletResponseWrapper(HttpServletResponse response) {
super(response);
}

2
config/src/test/java/org/springframework/security/htmlunit/server/HtmlUnitWebTestClient.java
View File

@@ -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;

2
config/src/test/java/org/springframework/security/htmlunit/server/MockWebResponseBuilder.java
View File

@@ -42,7 +42,7 @@ final class MockWebResponseBuilder {
private final FluxExchangeResult<String> exchangeResult;
public MockWebResponseBuilder(long startTime, WebRequest webRequest, FluxExchangeResult<String> exchangeResult) {
MockWebResponseBuilder(long startTime, WebRequest webRequest, FluxExchangeResult<String> exchangeResult) {
Assert.notNull(webRequest, "WebRequest must not be null");
Assert.notNull(exchangeResult, "FluxExchangeResult must not be null");
this.startTime = startTime;