Cleanup explicit type arguments

config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java

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

config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java

@@ -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) {

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

@@ -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()) {

config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java

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

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

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

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

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

config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java

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

config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java

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

config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java

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

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

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

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

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

config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java

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

config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java

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

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

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

config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java

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

config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java

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

config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java

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

config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java

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

config/src/main/java/org/springframework/security/config/method/MethodSecurityMetadataSourceBeanDefinitionParser.java

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

config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java

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

config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java

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

core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java

@@ -176,7 +176,7 @@ public class RoleHierarchyImpl implements RoleHierarchy {
 	 * will become a key that references a set of the reachable lower roles.
 	 */
 	private void buildRolesReachableInOneStepMap() {
-		this.rolesReachableInOneStepMap = new HashMap<GrantedAuthority, Set<GrantedAuthority>>();
+		this.rolesReachableInOneStepMap = new HashMap<>();
 		try (BufferedReader bufferedReader = new BufferedReader(
 				new StringReader(this.roleHierarchyStringRepresentation))) {
 			for (String readLine; (readLine = bufferedReader.readLine()) != null;) {
@@ -187,7 +187,7 @@ public class RoleHierarchyImpl implements RoleHierarchy {
 					GrantedAuthority lowerRole = new SimpleGrantedAuthority(roles[i].replaceAll("^\\s+|\\s+$", ""));
 					Set<GrantedAuthority> rolesReachableInOneStepSet;
 					if (!this.rolesReachableInOneStepMap.containsKey(higherRole)) {
-						rolesReachableInOneStepSet = new HashSet<GrantedAuthority>();
+						rolesReachableInOneStepSet = new HashSet<>();
 						this.rolesReachableInOneStepMap.put(higherRole, rolesReachableInOneStepSet);
 					} else {
 						rolesReachableInOneStepSet = this.rolesReachableInOneStepMap.get(higherRole);

core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java

@@ -42,7 +42,7 @@ public final class DelegatingMethodSecurityMetadataSource extends
 			.emptyList();
 
 	private final List<MethodSecurityMetadataSource> methodSecurityMetadataSources;
-	private final Map<DefaultCacheKey, Collection<ConfigAttribute>> attributeCache = new HashMap<DefaultCacheKey, Collection<ConfigAttribute>>();
+	private final Map<DefaultCacheKey, Collection<ConfigAttribute>> attributeCache = new HashMap<>();
 
 	// ~ Constructor
 	// ====================================================================================================

core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java

@@ -63,7 +63,7 @@ public class DefaultAuthenticationEventPublisher implements AuthenticationEventP
 	private final Log logger = LogFactory.getLog(getClass());
 
 	private ApplicationEventPublisher applicationEventPublisher;
-	private final HashMap<String, Constructor<? extends AbstractAuthenticationEvent>> exceptionMappings = new HashMap<String, Constructor<? extends AbstractAuthenticationEvent>>();
+	private final HashMap<String, Constructor<? extends AbstractAuthenticationEvent>> exceptionMappings = new HashMap<>();
 
 	public DefaultAuthenticationEventPublisher() {
 		this(null);

core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java

@@ -131,7 +131,7 @@ public class DelegatingSecurityContextExecutorService extends
 		if (tasks == null) {
 			return null;
 		}
-		List<Callable<T>> results = new ArrayList<Callable<T>>(tasks.size());
+		List<Callable<T>> results = new ArrayList<>(tasks.size());
 		for (Callable<T> task : tasks) {
 			results.add(wrap(task));
 		}
@@ -141,4 +141,4 @@ public class DelegatingSecurityContextExecutorService extends
 	private ExecutorService getDelegate() {
 		return (ExecutorService) getDelegateExecutor();
 	}
-}
+}

core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java

@@ -88,7 +88,7 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper implements
 	 * @return the processed Map
 	 */
 	private Map<String, Collection<GrantedAuthority>> preProcessMap(Map<?, ?> orgMap) {
-		Map<String, Collection<GrantedAuthority>> result = new HashMap<String, Collection<GrantedAuthority>>(
+		Map<String, Collection<GrantedAuthority>> result = new HashMap<>(
 				orgMap.size());
 
 		for (Map.Entry<?, ?> entry : orgMap.entrySet()) {

core/src/main/java/org/springframework/security/jackson2/UnmodifiableListDeserializer.java

@@ -43,7 +43,7 @@ class UnmodifiableListDeserializer extends JsonDeserializer<List> {
 	public List deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
 		ObjectMapper mapper = (ObjectMapper) jp.getCodec();
 		JsonNode node = mapper.readTree(jp);
-		List<Object> result = new ArrayList<Object>();
+		List<Object> result = new ArrayList<>();
 		if (node != null) {
 			if (node instanceof ArrayNode) {
 				ArrayNode arrayNode = (ArrayNode) node;

core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyUtilsTests.java

@@ -39,7 +39,7 @@ public class RoleHierarchyUtilsTests {
 				"ROLE_C > ROLE_D" + EOL;
 		// @formatter:on
 
-		Map<String, List<String>> roleHierarchyMap = new TreeMap<String, List<String>>();
+		Map<String, List<String>> roleHierarchyMap = new TreeMap<>();
 		roleHierarchyMap.put("ROLE_A", asList("ROLE_B", "ROLE_C"));
 		roleHierarchyMap.put("ROLE_B", asList("ROLE_D"));
 		roleHierarchyMap.put("ROLE_C", asList("ROLE_D"));
@@ -61,7 +61,7 @@ public class RoleHierarchyUtilsTests {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void roleHierarchyFromMapWhenRoleNullThenThrowsIllegalArgumentException() throws Exception {
-		Map<String, List<String>> roleHierarchyMap = new HashMap<String, List<String>>();
+		Map<String, List<String>> roleHierarchyMap = new HashMap<>();
 		roleHierarchyMap.put(null, asList("ROLE_B", "ROLE_C"));
 
 		RoleHierarchyUtils.roleHierarchyFromMap(roleHierarchyMap);
@@ -69,7 +69,7 @@ public class RoleHierarchyUtilsTests {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void roleHierarchyFromMapWhenRoleEmptyThenThrowsIllegalArgumentException() throws Exception {
-		Map<String, List<String>> roleHierarchyMap = new HashMap<String, List<String>>();
+		Map<String, List<String>> roleHierarchyMap = new HashMap<>();
 		roleHierarchyMap.put("", asList("ROLE_B", "ROLE_C"));
 
 		RoleHierarchyUtils.roleHierarchyFromMap(roleHierarchyMap);
@@ -77,7 +77,7 @@ public class RoleHierarchyUtilsTests {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void roleHierarchyFromMapWhenImpliedRolesNullThenThrowsIllegalArgumentException() throws Exception {
-		Map<String, List<String>> roleHierarchyMap = new HashMap<String, List<String>>();
+		Map<String, List<String>> roleHierarchyMap = new HashMap<>();
 		roleHierarchyMap.put("ROLE_A", null);
 
 		RoleHierarchyUtils.roleHierarchyFromMap(roleHierarchyMap);
@@ -85,7 +85,7 @@ public class RoleHierarchyUtilsTests {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void roleHierarchyFromMapWhenImpliedRolesEmptyThenThrowsIllegalArgumentException() throws Exception {
-		Map<String, List<String>> roleHierarchyMap = new HashMap<String, List<String>>();
+		Map<String, List<String>> roleHierarchyMap = new HashMap<>();
 		roleHierarchyMap.put("ROLE_A", Collections.<String>emptyList());
 
 		RoleHierarchyUtils.roleHierarchyFromMap(roleHierarchyMap);

core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java

@@ -113,7 +113,7 @@ public class ConsensusBasedTests {
 		RoleVoter roleVoter = new RoleVoter();
 		DenyVoter denyForSureVoter = new DenyVoter();
 		DenyAgainVoter denyAgainForSureVoter = new DenyAgainVoter();
-		List<AccessDecisionVoter<? extends Object>> voters = new Vector<AccessDecisionVoter<? extends Object>>();
+		List<AccessDecisionVoter<? extends Object>> voters = new Vector<>();
 		voters.add(roleVoter);
 		voters.add(denyForSureVoter);
 		voters.add(denyAgainForSureVoter);

core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java

@@ -43,7 +43,7 @@ public class UnanimousBasedTests {
 		RoleVoter roleVoter = new RoleVoter();
 		DenyVoter denyForSureVoter = new DenyVoter();
 		DenyAgainVoter denyAgainForSureVoter = new DenyAgainVoter();
-		List<AccessDecisionVoter<? extends Object>> voters = new Vector<AccessDecisionVoter<? extends Object>>();
+		List<AccessDecisionVoter<? extends Object>> voters = new Vector<>();
 		voters.add(roleVoter);
 		voters.add(denyForSureVoter);
 		voters.add(denyAgainForSureVoter);
@@ -56,7 +56,7 @@ public class UnanimousBasedTests {
 
 		DenyVoter denyForSureVoter = new DenyVoter();
 		DenyAgainVoter denyAgainForSureVoter = new DenyAgainVoter();
-		List<AccessDecisionVoter<? extends Object>> voters = new Vector<AccessDecisionVoter<? extends Object>>();
+		List<AccessDecisionVoter<? extends Object>> voters = new Vector<>();
 		voters.add(roleVoter);
 		voters.add(denyForSureVoter);
 		voters.add(denyAgainForSureVoter);

ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java

@@ -203,12 +203,12 @@ public class SpringSecurityLdapTemplate extends LdapTemplate {
 		String formattedFilter = MessageFormat.format(filter, encodedParams);
 		logger.debug("Using filter: " + formattedFilter);
 
-		final HashSet<Map<String, List<String>>> set = new HashSet<Map<String, List<String>>>();
+		final HashSet<Map<String, List<String>>> set = new HashSet<>();
 
 		ContextMapper roleMapper = new ContextMapper() {
 			public Object mapFromContext(Object ctx) {
 				DirContextAdapter adapter = (DirContextAdapter) ctx;
-				Map<String, List<String>> record = new HashMap<String, List<String>>();
+				Map<String, List<String>> record = new HashMap<>();
 				if (attributeNames == null || attributeNames.length == 0) {
 					try {
 						for (NamingEnumeration ae = adapter.getAttributes().getAll(); ae

ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java

@@ -400,7 +400,7 @@ public class ActiveDirectoryLdapAuthenticationProviderTests {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void setContextEnvironmentPropertiesEmpty() {
-		provider.setContextEnvironmentProperties(new Hashtable<String, Object>());
+		provider.setContextEnvironmentProperties(new Hashtable<>());
 	}
 
 	@Test

ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java

@@ -36,7 +36,7 @@ public class LdapAuthorityTests {
 
 	@Before
 	public void setUp() {
-		Map<String, List<String>> attributes = new HashMap<String, List<String>>();
+		Map<String, List<String>> attributes = new HashMap<>();
 		attributes.put(SpringSecurityLdapTemplate.DN_KEY, Arrays.asList(DN));
 		attributes.put("mail",
 				Arrays.asList("filip@ldap.test.org", "filip@ldap.test2.org"));

messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java

@@ -108,7 +108,7 @@ public final class ExpressionBasedMessageSecurityMetadataSourceFactory {
 	public static MessageSecurityMetadataSource createExpressionMessageMetadataSource(
 			LinkedHashMap<MessageMatcher<?>, String> matcherToExpression, SecurityExpressionHandler<Message<Object>> handler) {
 
-		LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>> matcherToAttrs = new LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>>();
+		LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>> matcherToAttrs = new LinkedHashMap<>();
 
 		for (Map.Entry<MessageMatcher<?>, String> entry : matcherToExpression.entrySet()) {
 			MessageMatcher<?> matcher = entry.getKey();

messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java

@@ -43,7 +43,7 @@ public final class SecurityContextChannelInterceptor extends ChannelInterceptorA
 		implements ExecutorChannelInterceptor {
 	private final SecurityContext EMPTY_CONTEXT = SecurityContextHolder
 			.createEmptyContext();
-	private static final ThreadLocal<Stack<SecurityContext>> ORIGINAL_CONTEXT = new ThreadLocal<Stack<SecurityContext>>();
+	private static final ThreadLocal<Stack<SecurityContext>> ORIGINAL_CONTEXT = new ThreadLocal<>();
 
 	private final String authenticationHeaderName;
 

messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java

@@ -58,7 +58,7 @@ public class ExpressionBasedMessageSecurityMetadataSourceFactoryTests {
 	public void setup() {
 		expression1 = "permitAll";
 		expression2 = "denyAll";
-		matcherToExpression = new LinkedHashMap<MessageMatcher<?>, String>();
+		matcherToExpression = new LinkedHashMap<>();
 		matcherToExpression.put(matcher1, expression1);
 		matcherToExpression.put(matcher2, expression2);
 

messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java

@@ -54,7 +54,7 @@ public class DefaultMessageSecurityMetadataSourceTests {
 
 	@Before
 	public void setup() {
-		messageMap = new LinkedHashMap<MessageMatcher<?>, Collection<ConfigAttribute>>();
+		messageMap = new LinkedHashMap<>();
 		messageMap.put(matcher1, Arrays.<ConfigAttribute> asList(config1));
 		messageMap.put(matcher2, Arrays.<ConfigAttribute> asList(config2));
 

oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/web/reactive/function/OAuth2BodyExtractorsTests.java

@@ -62,7 +62,7 @@ public class OAuth2BodyExtractorsTests {
 		messageReaders.add(new DecoderHttpMessageReader<>(new Jackson2JsonDecoder()));
 		messageReaders.add(new FormHttpMessageReader());
 
-		this.hints = new HashMap<String, Object>();
+		this.hints = new HashMap<>();
 		this.context = new BodyExtractor.Context() {
 			@Override
 			public List<HttpMessageReader<?>> messageReaders() {

openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java

@@ -34,7 +34,7 @@ public class RegexBasedAxFetchListFactory implements AxFetchListFactory {
 	 * which should be fetched for that pattern.
 	 */
 	public RegexBasedAxFetchListFactory(Map<String, List<OpenIDAttribute>> regexMap) {
-		idToAttributes = new LinkedHashMap<Pattern, List<OpenIDAttribute>>();
+		idToAttributes = new LinkedHashMap<>();
 		for (Map.Entry<String, List<OpenIDAttribute>> entry : regexMap.entrySet()) {
 			idToAttributes.put(Pattern.compile(entry.getKey()), entry.getValue());
 		}

samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java

@@ -273,7 +273,7 @@ class KeyConfig {
 class SubjectAttributeUserTokenConverter extends DefaultUserAuthenticationConverter {
 	@Override
 	public Map<String, ?> convertUserAuthentication(Authentication authentication) {
-		Map<String, Object> response = new LinkedHashMap<String, Object>();
+		Map<String, Object> response = new LinkedHashMap<>();
 		response.put("sub", authentication.getName());
 		if (authentication.getAuthorities() != null && !authentication.getAuthorities().isEmpty()) {
 			response.put(AUTHORITIES, AuthorityUtils.authorityListToSet(authentication.getAuthorities()));

web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java

@@ -60,7 +60,7 @@ public final class ExpressionBasedFilterInvocationSecurityMetadataSource
 			ExpressionParser parser) {
 		Assert.notNull(parser, "SecurityExpressionHandler returned a null parser object");
 
-		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestToExpressionAttributesMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>(
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestToExpressionAttributesMap = new LinkedHashMap<>(
 				requestMap);
 
 		for (Map.Entry<RequestMatcher, Collection<ConfigAttribute>> entry : requestMap

web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java

@@ -92,9 +92,9 @@ public class StrictHttpFirewall implements HttpFirewall {
 
 	private static final List<String> FORBIDDEN_BACKSLASH = Collections.unmodifiableList(Arrays.asList("\\", "%5c", "%5C"));
 
-	private Set<String> encodedUrlBlacklist = new HashSet<String>();
+	private Set<String> encodedUrlBlacklist = new HashSet<>();
 
-	private Set<String> decodedUrlBlacklist = new HashSet<String>();
+	private Set<String> decodedUrlBlacklist = new HashSet<>();
 
 	private Set<String> allowedHttpMethods = createDefaultAllowedHttpMethods();
 

web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java

@@ -266,7 +266,7 @@ public class DefaultSavedRequest implements SavedRequest {
 
 	@Override
 	public List<Cookie> getCookies() {
-		List<Cookie> cookieList = new ArrayList<Cookie>(cookies.size());
+		List<Cookie> cookieList = new ArrayList<>(cookies.size());
 
 		for (SavedCookie savedCookie : cookies) {
 			cookieList.add(savedCookie.getCookie());

web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java

@@ -91,7 +91,7 @@ public class ThrowableAnalyzer {
 	 * Creates a new <code>ThrowableAnalyzer</code> instance.
 	 */
 	public ThrowableAnalyzer() {
-		this.extractorMap = new TreeMap<Class<? extends Throwable>, ThrowableCauseExtractor>(
+		this.extractorMap = new TreeMap<>(
 				CLASS_HIERARCHY_COMPARATOR);
 
 		initExtractorMap();

web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java

@@ -53,7 +53,7 @@ public class DelegatingAccessDeniedHandlerTests {
 
 	@Before
 	public void setup() {
-		handlers = new LinkedHashMap<Class<? extends AccessDeniedException>, AccessDeniedHandler>();
+		handlers = new LinkedHashMap<>();
 	}
 
 	@Test

web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java

@@ -35,7 +35,7 @@ public class ExpressionBasedFilterInvocationSecurityMetadataSourceTests {
 	@Test
 	public void expectedAttributeIsReturned() {
 		final String expression = "hasRole('X')";
-		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<>();
 		requestMap.put(AnyRequestMatcher.INSTANCE, SecurityConfig.createList(expression));
 		ExpressionBasedFilterInvocationSecurityMetadataSource mds = new ExpressionBasedFilterInvocationSecurityMetadataSource(
 				requestMap, new DefaultWebSecurityExpressionHandler());
@@ -52,7 +52,7 @@ public class ExpressionBasedFilterInvocationSecurityMetadataSourceTests {
 
 	@Test(expected = IllegalArgumentException.class)
 	public void invalidExpressionIsRejected() throws Exception {
-		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<>();
 		requestMap.put(AnyRequestMatcher.INSTANCE,
 				SecurityConfig.createList("hasRole('X'"));
 		ExpressionBasedFilterInvocationSecurityMetadataSource mds = new ExpressionBasedFilterInvocationSecurityMetadataSource(

web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java

@@ -46,7 +46,7 @@ public class DefaultFilterInvocationSecurityMetadataSourceTests {
 	// ~ Methods
 	// ========================================================================================================
 	private void createFids(String pattern, String method) {
-		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<>();
 		requestMap.put(new AntPathRequestMatcher(pattern, method), this.def);
 		this.fids = new DefaultFilterInvocationSecurityMetadataSource(requestMap);
 	}
@@ -134,7 +134,7 @@ public class DefaultFilterInvocationSecurityMetadataSourceTests {
 	// SEC-1236
 	@Test
 	public void mixingPatternsWithAndWithoutHttpMethodsIsSupported() throws Exception {
-		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>>();
+		LinkedHashMap<RequestMatcher, Collection<ConfigAttribute>> requestMap = new LinkedHashMap<>();
 		Collection<ConfigAttribute> userAttrs = SecurityConfig.createList("A");
 
 		requestMap.put(new AntPathRequestMatcher("/user/**", null), userAttrs);

web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java

@@ -69,7 +69,7 @@ public class DelegatingAuthenticationFailureHandlerTests {
 
 	@Before
 	public void setup() {
-		handlers = new LinkedHashMap<Class<? extends AuthenticationException>, AuthenticationFailureHandler>();
+		handlers = new LinkedHashMap<>();
 	}
 
 	@Test

web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java

@@ -154,7 +154,7 @@ public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests {
 
 	private MappableAttributesRetriever getMappableRolesRetriever(String[] mappedRoles) {
 		SimpleMappableAttributesRetriever result = new SimpleMappableAttributesRetriever();
-		result.setMappableAttributes(new HashSet<String>(Arrays.asList(mappedRoles)));
+		result.setMappableAttributes(new HashSet<>(Arrays.asList(mappedRoles)));
 		return result;
 	}
 

web/src/test/java/org/springframework/security/web/reactive/result/view/CsrfRequestDataValueProcessorTests.java

@@ -124,7 +124,7 @@ public class CsrfRequestDataValueProcessorTests {
 	public void createGetExtraHiddenFieldsHasCsrfToken() {
 		CsrfToken token = new DefaultCsrfToken("1", "a", "b");
 		this.exchange.getAttributes().put(DEFAULT_CSRF_ATTR_NAME, token);
-		Map<String, String> expected = new HashMap<String, String>();
+		Map<String, String> expected = new HashMap<>();
 		expected.put(token.getParameterName(), token.getToken());
 
 		CsrfRequestDataValueProcessor processor = new CsrfRequestDataValueProcessor();