Cleanup explicit type arguments

2026-08-05 17:57:15 +00:00 · 2019-07-04 19:08:54 +02:00
parent c5b5cc507c
commit 3ea9d376b2
50 changed files with 68 additions and 68 deletions
@@ -55,10 +55,10 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
 		extends AbstractSecurityBuilder<O> {
 	private final Log logger = LogFactory.getLog(getClass());

-	private final LinkedHashMap<Class<? extends SecurityConfigurer<O, B>>, List<SecurityConfigurer<O, B>>> configurers = new LinkedHashMap<Class<? extends SecurityConfigurer<O, B>>, List<SecurityConfigurer<O, B>>>();
-	private final List<SecurityConfigurer<O, B>> configurersAddedInInitializing = new ArrayList<SecurityConfigurer<O, B>>();
+	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<Class<? extends Object>, Object>();
+	private final Map<Class<? extends Object>, Object> sharedObjects = new HashMap<>();

 	private final boolean allowConfigurersOfSameType;

@@ -199,7 +199,7 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
 			List<SecurityConfigurer<O, B>> configs = allowConfigurersOfSameType ? this.configurers
 					.get(clazz) : null;
 			if (configs == null) {
-				configs = new ArrayList<SecurityConfigurer<O, B>>(1);
+				configs = new ArrayList<>(1);
 			}
 			configs.add(configurer);
 			this.configurers.put(clazz, configs);
@@ -386,7 +386,7 @@ public abstract class AbstractConfiguredSecurityBuilder<O, B extends SecurityBui
 	}

 	private Collection<SecurityConfigurer<O, B>> getConfigurers() {
-		List<SecurityConfigurer<O, B>> result = new ArrayList<SecurityConfigurer<O, B>>();
+		List<SecurityConfigurer<O, B>> result = new ArrayList<>();
 		for (List<SecurityConfigurer<O, B>> configs : this.configurers.values()) {
 			result.addAll(configs);
 		}
@@ -111,7 +111,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<ObjectPostProcessor<?>>();
+		private List<ObjectPostProcessor<? extends Object>> postProcessors = new ArrayList<>();

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

 	private final List<RequestMatcher> ignoredRequests = new ArrayList<>();

-	private final List<SecurityBuilder<? extends SecurityFilterChain>> securityFilterChainBuilders = new ArrayList<SecurityBuilder<? extends SecurityFilterChain>>();
+	private final List<SecurityBuilder<? extends SecurityFilterChain>> securityFilterChainBuilders = new ArrayList<>();

 	private IgnoredRequestConfigurer ignoredRequestRegistry;

@@ -48,7 +48,7 @@ final class AutowiredWebSecurityConfigurersIgnoreParents {

 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public List<SecurityConfigurer<Filter, WebSecurity>> getWebSecurityConfigurers() {
-		List<SecurityConfigurer<Filter, WebSecurity>> webSecurityConfigurers = new ArrayList<SecurityConfigurer<Filter, WebSecurity>>();
+		List<SecurityConfigurer<Filter, WebSecurity>> webSecurityConfigurers = new ArrayList<>();
 		Map<String, WebSecurityConfigurer> beansOfType = beanFactory
 				.getBeansOfType(WebSecurityConfigurer.class);
 		for (Entry<String, WebSecurityConfigurer> entry : beansOfType.entrySet()) {
@@ -56,4 +56,4 @@ final class AutowiredWebSecurityConfigurersIgnoreParents {
 		}
 		return webSecurityConfigurers;
 	}
-}
+}
@@ -415,7 +415,7 @@ public abstract class WebSecurityConfigurerAdapter implements
 	 * @return the shared Objects
 	 */
 	private Map<Class<? extends Object>, Object> createSharedObjects() {
-		Map<Class<? extends Object>, Object> sharedObjects = new HashMap<Class<? extends Object>, Object>();
+		Map<Class<? extends Object>, Object> sharedObjects = new HashMap<>();
 		sharedObjects.putAll(localConfigureAuthenticationBldr.getSharedObjects());
 		sharedObjects.put(UserDetailsService.class, userDetailsService());
 		sharedObjects.put(ApplicationContext.class, context);
@@ -114,7 +114,7 @@ public abstract class AbstractConfigAttributeRequestMatcherRegistry<C> extends
 							+ ". Try completing it with something like requestUrls().<something>.hasRole('USER')");
 		}

-		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<>();
 		for (UrlMapping mapping : getUrlMappings()) {
 			RequestMatcher matcher = mapping.getRequestMatcher();
 			Collection<ConfigAttribute> configAttrs = mapping.getConfigAttrs();
@@ -80,7 +80,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher;
 public final class ChannelSecurityConfigurer<H extends HttpSecurityBuilder<H>> extends
 		AbstractHttpConfigurer<ChannelSecurityConfigurer<H>, H> {
 	private ChannelProcessingFilter channelFilter = new ChannelProcessingFilter();
-	private LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
+	private LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<>();
 	private List<ChannelProcessor> channelProcessors;

 	private final ChannelRequestMatcherRegistry REGISTRY;
@@ -240,4 +240,4 @@ public final class ChannelSecurityConfigurer<H extends HttpSecurityBuilder<H>> e
 			return addAttribute(attribute, requestMatchers);
 		}
 	}
-}
+}
@@ -284,7 +284,7 @@ public final class CsrfConfigurer<H extends HttpSecurityBuilder<H>>

 		InvalidSessionAccessDeniedHandler invalidSessionDeniedHandler = new InvalidSessionAccessDeniedHandler(
 				invalidSessionStrategy);
-		LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler> handlers = new LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler>();
+		LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler> handlers = new LinkedHashMap<>();
 		handlers.put(MissingCsrfTokenException.class, invalidSessionDeniedHandler);
 		return new DelegatingAccessDeniedHandler(handlers, defaultAccessDeniedHandler);
 	}
@@ -184,7 +184,7 @@ 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<AccessDecisionVoter<? extends Object>>();
+		List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<>();
 		WebExpressionVoter expressionVoter = new WebExpressionVoter();
 		expressionVoter.setExpressionHandler(getExpressionHandler(http));
 		decisionVoters.add(expressionVoter);
@@ -173,7 +173,7 @@ 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<AccessDecisionVoter<? extends Object>>();
+		List<AccessDecisionVoter<? extends Object>> decisionVoters = new ArrayList<>();
 		decisionVoters.add(new RoleVoter());
 		decisionVoters.add(new AuthenticatedVoter());
 		return decisionVoters;
@@ -321,7 +321,7 @@ public final class OpenIDLoginConfigurer<H extends HttpSecurityBuilder<H>> exten
 	 * @return the {@link AxFetchListFactory} to use
 	 */
 	private AxFetchListFactory attributesToFetchFactory() {
-		Map<String, List<OpenIDAttribute>> identityToAttrs = new HashMap<String, List<OpenIDAttribute>>();
+		Map<String, List<OpenIDAttribute>> identityToAttrs = new HashMap<>();
 		for (AttributeExchangeConfigurer conf : this.attributeExchangeConfigurers) {
 			identityToAttrs.put(conf.identifier, conf.getAttributes());
 		}
@@ -233,7 +233,7 @@ public class MessageSecurityMetadataSourceRegistry {
 	 * @return the {@link MessageSecurityMetadataSource} to use
 	 */
 	protected MessageSecurityMetadataSource createMetadataSource() {
-		LinkedHashMap<MessageMatcher<?>, String> matcherToExpression = new LinkedHashMap<MessageMatcher<?>, String>();
+		LinkedHashMap<MessageMatcher<?>, String> matcherToExpression = new LinkedHashMap<>();
 		for (Map.Entry<MatcherBuilder, String> entry : this.matcherToExpression
 				.entrySet()) {
 			matcherToExpression.put(entry.getKey().build(), entry.getValue());
@@ -159,7 +159,7 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends
 		MessageExpressionVoter<Object> voter = new MessageExpressionVoter<>();
 		voter.setExpressionHandler(getMessageExpressionHandler());

-		List<AccessDecisionVoter<? extends Object>> voters = new ArrayList<AccessDecisionVoter<? extends Object>>();
+		List<AccessDecisionVoter<? extends Object>> voters = new ArrayList<>();
 		voters.add(voter);

 		AffirmativeBased manager = new AffirmativeBased(voters);
@@ -43,7 +43,7 @@ public class PasswordEncoderParser {
 	private static final Map<String, Class<?>> ENCODER_CLASSES;

 	static {
-		ENCODER_CLASSES = new HashMap<String, Class<?>>();
+		ENCODER_CLASSES = new HashMap<>();
 		ENCODER_CLASSES.put(OPT_HASH_BCRYPT, BCryptPasswordEncoder.class);
 	}

@@ -261,7 +261,7 @@ final class AuthenticationConfigBuilder {
 						.rootBeanDefinition(OPEN_ID_CONSUMER_CLASS);
 				BeanDefinitionBuilder axFactory = BeanDefinitionBuilder
 						.rootBeanDefinition(OPEN_ID_ATTRIBUTE_FACTORY_CLASS);
-				ManagedMap<String, ManagedList<BeanDefinition>> axMap = new ManagedMap<String, ManagedList<BeanDefinition>>();
+				ManagedMap<String, ManagedList<BeanDefinition>> axMap = new ManagedMap<>();

 				for (Element attrExElt : attrExElts) {
 					String identifierMatch = attrExElt.getAttribute("identifier-match");
@@ -144,7 +144,7 @@ public class CsrfBeanDefinitionParser implements BeanDefinitionParser {
 		if (invalidSessionStrategy == null) {
 			return defaultDeniedHandler;
 		}
-		ManagedMap<Class<? extends AccessDeniedException>, BeanDefinition> handlers = new ManagedMap<Class<? extends AccessDeniedException>, BeanDefinition>();
+		ManagedMap<Class<? extends AccessDeniedException>, BeanDefinition> handlers = new ManagedMap<>();
 		BeanDefinitionBuilder invalidSessionHandlerBldr = BeanDefinitionBuilder
 				.rootBeanDefinition(InvalidSessionAccessDeniedHandler.class);
 		invalidSessionHandlerBldr.addConstructorArgValue(invalidSessionStrategy);
@@ -381,7 +381,7 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP

 	private Map<String, List<ConfigAttribute>> parseProtectPointcuts(
 			ParserContext parserContext, List<Element> protectPointcutElts) {
-		Map<String, List<ConfigAttribute>> pointcutMap = new LinkedHashMap<String, List<ConfigAttribute>>();
+		Map<String, List<ConfigAttribute>> pointcutMap = new LinkedHashMap<>();

 		for (Element childElt : protectPointcutElts) {
 			String accessConfig = childElt.getAttribute(ATT_ACCESS);
@@ -44,7 +44,7 @@ public class MethodSecurityMetadataSourceBeanDefinitionParser extends
 	public AbstractBeanDefinition parseInternal(Element elt, ParserContext pc) {
 		// Parse the included methods
 		List<Element> methods = DomUtils.getChildElementsByTagName(elt, Elements.PROTECT);
-		Map<String, List<ConfigAttribute>> mappings = new LinkedHashMap<String, List<ConfigAttribute>>();
+		Map<String, List<ConfigAttribute>> mappings = new LinkedHashMap<>();

 		for (Element protectmethodElt : methods) {
 			String[] tokens = StringUtils
@@ -62,7 +62,7 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor {
 	private static final Log logger = LogFactory
 			.getLog(ProtectPointcutPostProcessor.class);

-	private final Map<String, List<ConfigAttribute>> pointcutMap = new LinkedHashMap<String, List<ConfigAttribute>>();
+	private final Map<String, List<ConfigAttribute>> pointcutMap = new LinkedHashMap<>();
 	private final MapBasedMethodSecurityMetadataSource mapBasedMethodSecurityMetadataSource;
 	private final Set<PointcutExpression> pointCutExpressions = new LinkedHashSet<>();
 	private final PointcutParser parser;
@@ -368,8 +368,8 @@ public class GlobalMethodSecurityConfigurationTests {
 	}

 	static class MockBeanPostProcessor implements BeanPostProcessor {
-		Map<String, Object> beforeInit = new HashMap<String, Object>();
-		Map<String, Object> afterInit = new HashMap<String, Object>();
+		Map<String, Object> beforeInit = new HashMap<>();
+		Map<String, Object> afterInit = new HashMap<>();

 		@Override
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws