diff --git a/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java index 3e805dee37..9ee25268cf 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/AbstractConfiguredSecurityBuilder.java @@ -55,10 +55,10 @@ public abstract class AbstractConfiguredSecurityBuilder { private final Log logger = LogFactory.getLog(getClass()); - private final LinkedHashMap>, List>> configurers = new LinkedHashMap>, List>>(); - private final List> configurersAddedInInitializing = new ArrayList>(); + private final LinkedHashMap>, List>> configurers = new LinkedHashMap<>(); + private final List> configurersAddedInInitializing = new ArrayList<>(); - private final Map, Object> sharedObjects = new HashMap, Object>(); + private final Map, Object> sharedObjects = new HashMap<>(); private final boolean allowConfigurersOfSameType; @@ -199,7 +199,7 @@ public abstract class AbstractConfiguredSecurityBuilder> configs = allowConfigurersOfSameType ? this.configurers .get(clazz) : null; if (configs == null) { - configs = new ArrayList>(1); + configs = new ArrayList<>(1); } configs.add(configurer); this.configurers.put(clazz, configs); @@ -386,7 +386,7 @@ public abstract class AbstractConfiguredSecurityBuilder> getConfigurers() { - List> result = new ArrayList>(); + List> result = new ArrayList<>(); for (List> configs : this.configurers.values()) { result.addAll(configs); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java index 27cc7cd68c..a68dd2c409 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java +++ b/config/src/main/java/org/springframework/security/config/annotation/SecurityConfigurerAdapter.java @@ -111,7 +111,7 @@ public abstract class SecurityConfigurerAdapter> */ private static final class CompositeObjectPostProcessor implements ObjectPostProcessor { - private List> postProcessors = new ArrayList>(); + private List> postProcessors = new ArrayList<>(); @SuppressWarnings({ "rawtypes", "unchecked" }) public Object postProcess(Object object) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java index 9ddedb8f4e..a27fbb2441 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java @@ -241,7 +241,7 @@ public class GlobalMethodSecurityConfiguration * @return the {@link AccessDecisionManager} to use */ protected AccessDecisionManager accessDecisionManager() { - List> decisionVoters = new ArrayList>(); + List> decisionVoters = new ArrayList<>(); ExpressionBasedPreInvocationAdvice expressionAdvice = new ExpressionBasedPreInvocationAdvice(); expressionAdvice.setExpressionHandler(getExpressionHandler()); if (prePostEnabled()) { diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java index a184d70c99..391e9f2d24 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java +++ b/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 ignoredRequests = new ArrayList<>(); - private final List> securityFilterChainBuilders = new ArrayList>(); + private final List> securityFilterChainBuilders = new ArrayList<>(); private IgnoredRequestConfigurer ignoredRequestRegistry; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java index 9be0a3e1bc..2e404968c2 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/AutowiredWebSecurityConfigurersIgnoreParents.java +++ b/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> getWebSecurityConfigurers() { - List> webSecurityConfigurers = new ArrayList>(); + List> webSecurityConfigurers = new ArrayList<>(); Map beansOfType = beanFactory .getBeansOfType(WebSecurityConfigurer.class); for (Entry entry : beansOfType.entrySet()) { @@ -56,4 +56,4 @@ final class AutowiredWebSecurityConfigurersIgnoreParents { } return webSecurityConfigurers; } -} \ No newline at end of file +} diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java index 2a0a146edf..dd014bbd03 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/WebSecurityConfigurerAdapter.java +++ b/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, Object> createSharedObjects() { - Map, Object> sharedObjects = new HashMap, Object>(); + Map, Object> sharedObjects = new HashMap<>(); sharedObjects.putAll(localConfigureAuthenticationBldr.getSharedObjects()); sharedObjects.put(UserDetailsService.class, userDetailsService()); sharedObjects.put(ApplicationContext.class, context); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java index 7f19ae0b6d..e7b0c48af1 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/AbstractConfigAttributeRequestMatcherRegistry.java @@ -114,7 +114,7 @@ public abstract class AbstractConfigAttributeRequestMatcherRegistry extends + ". Try completing it with something like requestUrls()..hasRole('USER')"); } - LinkedHashMap> requestMap = new LinkedHashMap>(); + LinkedHashMap> requestMap = new LinkedHashMap<>(); for (UrlMapping mapping : getUrlMappings()) { RequestMatcher matcher = mapping.getRequestMatcher(); Collection configAttrs = mapping.getConfigAttrs(); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java index f0b026a17e..ca0937f8dd 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ChannelSecurityConfigurer.java +++ b/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> extends AbstractHttpConfigurer, H> { private ChannelProcessingFilter channelFilter = new ChannelProcessingFilter(); - private LinkedHashMap> requestMap = new LinkedHashMap>(); + private LinkedHashMap> requestMap = new LinkedHashMap<>(); private List channelProcessors; private final ChannelRequestMatcherRegistry REGISTRY; @@ -240,4 +240,4 @@ public final class ChannelSecurityConfigurer> e return addAttribute(attribute, requestMatchers); } } -} \ No newline at end of file +} diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java index b26cbe48e5..c5a1eda817 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/CsrfConfigurer.java @@ -284,7 +284,7 @@ public final class CsrfConfigurer> InvalidSessionAccessDeniedHandler invalidSessionDeniedHandler = new InvalidSessionAccessDeniedHandler( invalidSessionStrategy); - LinkedHashMap, AccessDeniedHandler> handlers = new LinkedHashMap, AccessDeniedHandler>(); + LinkedHashMap, AccessDeniedHandler> handlers = new LinkedHashMap<>(); handlers.put(MissingCsrfTokenException.class, invalidSessionDeniedHandler); return new DelegatingAccessDeniedHandler(handlers, defaultAccessDeniedHandler); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java index ad5665c35b..dc2cd7200c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExpressionUrlAuthorizationConfigurer.java @@ -184,7 +184,7 @@ public final class ExpressionUrlAuthorizationConfigurer> getDecisionVoters(H http) { - List> decisionVoters = new ArrayList>(); + List> decisionVoters = new ArrayList<>(); WebExpressionVoter expressionVoter = new WebExpressionVoter(); expressionVoter.setExpressionHandler(getExpressionHandler(http)); decisionVoters.add(expressionVoter); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java index 91c16f4d5a..6f68bc85f6 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/UrlAuthorizationConfigurer.java @@ -173,7 +173,7 @@ public final class UrlAuthorizationConfigurer> @Override @SuppressWarnings("rawtypes") final List> getDecisionVoters(H http) { - List> decisionVoters = new ArrayList>(); + List> decisionVoters = new ArrayList<>(); decisionVoters.add(new RoleVoter()); decisionVoters.add(new AuthenticatedVoter()); return decisionVoters; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java index 71d7c2e215..6f7e362856 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/openid/OpenIDLoginConfigurer.java @@ -321,7 +321,7 @@ public final class OpenIDLoginConfigurer> exten * @return the {@link AxFetchListFactory} to use */ private AxFetchListFactory attributesToFetchFactory() { - Map> identityToAttrs = new HashMap>(); + Map> identityToAttrs = new HashMap<>(); for (AttributeExchangeConfigurer conf : this.attributeExchangeConfigurers) { identityToAttrs.put(conf.identifier, conf.getAttributes()); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java index 7de626165a..79a476ede0 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/messaging/MessageSecurityMetadataSourceRegistry.java +++ b/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, String> matcherToExpression = new LinkedHashMap, String>(); + LinkedHashMap, String> matcherToExpression = new LinkedHashMap<>(); for (Map.Entry entry : this.matcherToExpression .entrySet()) { matcherToExpression.put(entry.getKey().build(), entry.getValue()); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java index 42c560af68..97e43b2703 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurer.java @@ -159,7 +159,7 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends MessageExpressionVoter voter = new MessageExpressionVoter<>(); voter.setExpressionHandler(getMessageExpressionHandler()); - List> voters = new ArrayList>(); + List> voters = new ArrayList<>(); voters.add(voter); AffirmativeBased manager = new AffirmativeBased(voters); diff --git a/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java b/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java index c09b354bc0..1b71c0f4c9 100644 --- a/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java +++ b/config/src/main/java/org/springframework/security/config/authentication/PasswordEncoderParser.java @@ -43,7 +43,7 @@ public class PasswordEncoderParser { private static final Map> ENCODER_CLASSES; static { - ENCODER_CLASSES = new HashMap>(); + ENCODER_CLASSES = new HashMap<>(); ENCODER_CLASSES.put(OPT_HASH_BCRYPT, BCryptPasswordEncoder.class); } diff --git a/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java b/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java index 8cd9dc9e9d..15734b8e5e 100644 --- a/config/src/main/java/org/springframework/security/config/http/AuthenticationConfigBuilder.java +++ b/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> axMap = new ManagedMap>(); + ManagedMap> axMap = new ManagedMap<>(); for (Element attrExElt : attrExElts) { String identifierMatch = attrExElt.getAttribute("identifier-match"); diff --git a/config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java index fba5b947a3..46f48a4780 100644 --- a/config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/CsrfBeanDefinitionParser.java @@ -144,7 +144,7 @@ public class CsrfBeanDefinitionParser implements BeanDefinitionParser { if (invalidSessionStrategy == null) { return defaultDeniedHandler; } - ManagedMap, BeanDefinition> handlers = new ManagedMap, BeanDefinition>(); + ManagedMap, BeanDefinition> handlers = new ManagedMap<>(); BeanDefinitionBuilder invalidSessionHandlerBldr = BeanDefinitionBuilder .rootBeanDefinition(InvalidSessionAccessDeniedHandler.class); invalidSessionHandlerBldr.addConstructorArgValue(invalidSessionStrategy); diff --git a/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java index 7755c85a51..6142cbe45b 100644 --- a/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParser.java @@ -381,7 +381,7 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP private Map> parseProtectPointcuts( ParserContext parserContext, List protectPointcutElts) { - Map> pointcutMap = new LinkedHashMap>(); + Map> pointcutMap = new LinkedHashMap<>(); for (Element childElt : protectPointcutElts) { String accessConfig = childElt.getAttribute(ATT_ACCESS); diff --git a/config/src/main/java/org/springframework/security/config/method/MethodSecurityMetadataSourceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/method/MethodSecurityMetadataSourceBeanDefinitionParser.java index d040e8a4cd..6d4f18b79b 100644 --- a/config/src/main/java/org/springframework/security/config/method/MethodSecurityMetadataSourceBeanDefinitionParser.java +++ b/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 methods = DomUtils.getChildElementsByTagName(elt, Elements.PROTECT); - Map> mappings = new LinkedHashMap>(); + Map> mappings = new LinkedHashMap<>(); for (Element protectmethodElt : methods) { String[] tokens = StringUtils diff --git a/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java b/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java index 844b586065..454d6835f0 100644 --- a/config/src/main/java/org/springframework/security/config/method/ProtectPointcutPostProcessor.java +++ b/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> pointcutMap = new LinkedHashMap>(); + private final Map> pointcutMap = new LinkedHashMap<>(); private final MapBasedMethodSecurityMetadataSource mapBasedMethodSecurityMetadataSource; private final Set pointCutExpressions = new LinkedHashSet<>(); private final PointcutParser parser; diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java index f93fbf1f2a..a8be287c18 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfigurationTests.java +++ b/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 beforeInit = new HashMap(); - Map afterInit = new HashMap(); + Map beforeInit = new HashMap<>(); + Map afterInit = new HashMap<>(); @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws diff --git a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java b/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java index c3aea88976..d78355f517 100755 --- a/core/src/main/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImpl.java +++ b/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>(); + 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 rolesReachableInOneStepSet; if (!this.rolesReachableInOneStepMap.containsKey(higherRole)) { - rolesReachableInOneStepSet = new HashSet(); + rolesReachableInOneStepSet = new HashSet<>(); this.rolesReachableInOneStepMap.put(higherRole, rolesReachableInOneStepSet); } else { rolesReachableInOneStepSet = this.rolesReachableInOneStepMap.get(higherRole); diff --git a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java index 28dc1399f5..a006cc3e1b 100644 --- a/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/DelegatingMethodSecurityMetadataSource.java @@ -42,7 +42,7 @@ public final class DelegatingMethodSecurityMetadataSource extends .emptyList(); private final List methodSecurityMetadataSources; - private final Map> attributeCache = new HashMap>(); + private final Map> attributeCache = new HashMap<>(); // ~ Constructor // ==================================================================================================== diff --git a/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java b/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java index f6821ec7f5..1decb2f5ab 100644 --- a/core/src/main/java/org/springframework/security/authentication/DefaultAuthenticationEventPublisher.java +++ b/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> exceptionMappings = new HashMap>(); + private final HashMap> exceptionMappings = new HashMap<>(); public DefaultAuthenticationEventPublisher() { this(null); diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java index cb534b68f0..9f00bb4fab 100644 --- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java +++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextExecutorService.java @@ -131,7 +131,7 @@ public class DelegatingSecurityContextExecutorService extends if (tasks == null) { return null; } - List> results = new ArrayList>(tasks.size()); + List> results = new ArrayList<>(tasks.size()); for (Callable task : tasks) { results.add(wrap(task)); } @@ -141,4 +141,4 @@ public class DelegatingSecurityContextExecutorService extends private ExecutorService getDelegate() { return (ExecutorService) getDelegateExecutor(); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java index 725ce77300..c6da2c140e 100755 --- a/core/src/main/java/org/springframework/security/core/authority/mapping/MapBasedAttributes2GrantedAuthoritiesMapper.java +++ b/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> preProcessMap(Map orgMap) { - Map> result = new HashMap>( + Map> result = new HashMap<>( orgMap.size()); for (Map.Entry entry : orgMap.entrySet()) { diff --git a/core/src/main/java/org/springframework/security/jackson2/UnmodifiableListDeserializer.java b/core/src/main/java/org/springframework/security/jackson2/UnmodifiableListDeserializer.java index b484c9d6f7..aebcb2ebd9 100644 --- a/core/src/main/java/org/springframework/security/jackson2/UnmodifiableListDeserializer.java +++ b/core/src/main/java/org/springframework/security/jackson2/UnmodifiableListDeserializer.java @@ -43,7 +43,7 @@ class UnmodifiableListDeserializer extends JsonDeserializer { public List deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { ObjectMapper mapper = (ObjectMapper) jp.getCodec(); JsonNode node = mapper.readTree(jp); - List result = new ArrayList(); + List result = new ArrayList<>(); if (node != null) { if (node instanceof ArrayNode) { ArrayNode arrayNode = (ArrayNode) node; diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyUtilsTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyUtilsTests.java index fe211d2924..bb235b5a0b 100644 --- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyUtilsTests.java +++ b/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> roleHierarchyMap = new TreeMap>(); + Map> 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> roleHierarchyMap = new HashMap>(); + Map> 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> roleHierarchyMap = new HashMap>(); + Map> 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> roleHierarchyMap = new HashMap>(); + Map> 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> roleHierarchyMap = new HashMap>(); + Map> roleHierarchyMap = new HashMap<>(); roleHierarchyMap.put("ROLE_A", Collections.emptyList()); RoleHierarchyUtils.roleHierarchyFromMap(roleHierarchyMap); diff --git a/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java index a732e16c9f..494d66b07a 100644 --- a/core/src/test/java/org/springframework/security/access/vote/ConsensusBasedTests.java +++ b/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> voters = new Vector>(); + List> voters = new Vector<>(); voters.add(roleVoter); voters.add(denyForSureVoter); voters.add(denyAgainForSureVoter); diff --git a/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java index 68e7d4438a..b861cebd90 100644 --- a/core/src/test/java/org/springframework/security/access/vote/UnanimousBasedTests.java +++ b/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> voters = new Vector>(); + List> 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> voters = new Vector>(); + List> voters = new Vector<>(); voters.add(roleVoter); voters.add(denyForSureVoter); voters.add(denyAgainForSureVoter); diff --git a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java index 2f9dc466fd..ad1245bad0 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java +++ b/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>> set = new HashSet>>(); + final HashSet>> set = new HashSet<>(); ContextMapper roleMapper = new ContextMapper() { public Object mapFromContext(Object ctx) { DirContextAdapter adapter = (DirContextAdapter) ctx; - Map> record = new HashMap>(); + Map> record = new HashMap<>(); if (attributeNames == null || attributeNames.length == 0) { try { for (NamingEnumeration ae = adapter.getAttributes().getAll(); ae diff --git a/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java b/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java index 5152bdbf11..774341e413 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProviderTests.java +++ b/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()); + provider.setContextEnvironmentProperties(new Hashtable<>()); } @Test diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java index f71c826a8f..237543a39d 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/LdapAuthorityTests.java @@ -36,7 +36,7 @@ public class LdapAuthorityTests { @Before public void setUp() { - Map> attributes = new HashMap>(); + Map> attributes = new HashMap<>(); attributes.put(SpringSecurityLdapTemplate.DN_KEY, Arrays.asList(DN)); attributes.put("mail", Arrays.asList("filip@ldap.test.org", "filip@ldap.test2.org")); diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java index 96aa7d4f3d..69934b64b4 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactory.java +++ b/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, String> matcherToExpression, SecurityExpressionHandler> handler) { - LinkedHashMap, Collection> matcherToAttrs = new LinkedHashMap, Collection>(); + LinkedHashMap, Collection> matcherToAttrs = new LinkedHashMap<>(); for (Map.Entry, String> entry : matcherToExpression.entrySet()) { MessageMatcher matcher = entry.getKey(); diff --git a/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java b/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java index 6c4aadca34..50f5113dd9 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/context/SecurityContextChannelInterceptor.java +++ b/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> ORIGINAL_CONTEXT = new ThreadLocal>(); + private static final ThreadLocal> ORIGINAL_CONTEXT = new ThreadLocal<>(); private final String authenticationHeaderName; diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java index fefa0aebce..3d5f813866 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/ExpressionBasedMessageSecurityMetadataSourceFactoryTests.java +++ b/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, String>(); + matcherToExpression = new LinkedHashMap<>(); matcherToExpression.put(matcher1, expression1); matcherToExpression.put(matcher2, expression2); diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java index 36815cbc4f..6702abe267 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSourceTests.java +++ b/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, Collection>(); + messageMap = new LinkedHashMap<>(); messageMap.put(matcher1, Arrays. asList(config1)); messageMap.put(matcher2, Arrays. asList(config2)); diff --git a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/web/reactive/function/OAuth2BodyExtractorsTests.java b/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/web/reactive/function/OAuth2BodyExtractorsTests.java index a44f52efb7..ae086b8eca 100644 --- a/oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/web/reactive/function/OAuth2BodyExtractorsTests.java +++ b/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(); + this.hints = new HashMap<>(); this.context = new BodyExtractor.Context() { @Override public List> messageReaders() { diff --git a/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java b/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java index c0e04f7c3f..9283419981 100644 --- a/openid/src/main/java/org/springframework/security/openid/RegexBasedAxFetchListFactory.java +++ b/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> regexMap) { - idToAttributes = new LinkedHashMap>(); + idToAttributes = new LinkedHashMap<>(); for (Map.Entry> entry : regexMap.entrySet()) { idToAttributes.put(Pattern.compile(entry.getKey()), entry.getValue()); } diff --git a/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java b/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java index 2d9573e2fd..80cbbe4e6d 100644 --- a/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java +++ b/samples/boot/oauth2authorizationserver/src/main/java/sample/AuthorizationServerConfiguration.java @@ -273,7 +273,7 @@ class KeyConfig { class SubjectAttributeUserTokenConverter extends DefaultUserAuthenticationConverter { @Override public Map convertUserAuthentication(Authentication authentication) { - Map response = new LinkedHashMap(); + Map response = new LinkedHashMap<>(); response.put("sub", authentication.getName()); if (authentication.getAuthorities() != null && !authentication.getAuthorities().isEmpty()) { response.put(AUTHORITIES, AuthorityUtils.authorityListToSet(authentication.getAuthorities())); diff --git a/web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java index 1e749b441f..c893871574 100644 --- a/web/src/main/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSource.java +++ b/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> requestToExpressionAttributesMap = new LinkedHashMap>( + LinkedHashMap> requestToExpressionAttributesMap = new LinkedHashMap<>( requestMap); for (Map.Entry> entry : requestMap diff --git a/web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java b/web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java index d2a1278846..f48f7153ab 100644 --- a/web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java +++ b/web/src/main/java/org/springframework/security/web/firewall/StrictHttpFirewall.java @@ -92,9 +92,9 @@ public class StrictHttpFirewall implements HttpFirewall { private static final List FORBIDDEN_BACKSLASH = Collections.unmodifiableList(Arrays.asList("\\", "%5c", "%5C")); - private Set encodedUrlBlacklist = new HashSet(); + private Set encodedUrlBlacklist = new HashSet<>(); - private Set decodedUrlBlacklist = new HashSet(); + private Set decodedUrlBlacklist = new HashSet<>(); private Set allowedHttpMethods = createDefaultAllowedHttpMethods(); diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java index e8a281411b..8f530d4ff6 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/DefaultSavedRequest.java @@ -266,7 +266,7 @@ public class DefaultSavedRequest implements SavedRequest { @Override public List getCookies() { - List cookieList = new ArrayList(cookies.size()); + List cookieList = new ArrayList<>(cookies.size()); for (SavedCookie savedCookie : cookies) { cookieList.add(savedCookie.getCookie()); diff --git a/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java b/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java index 666ad45c2b..4e7425e2bb 100755 --- a/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java +++ b/web/src/main/java/org/springframework/security/web/util/ThrowableAnalyzer.java @@ -91,7 +91,7 @@ public class ThrowableAnalyzer { * Creates a new ThrowableAnalyzer instance. */ public ThrowableAnalyzer() { - this.extractorMap = new TreeMap, ThrowableCauseExtractor>( + this.extractorMap = new TreeMap<>( CLASS_HIERARCHY_COMPARATOR); initExtractorMap(); diff --git a/web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java b/web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java index fa2dc4828d..35d3ab012a 100644 --- a/web/src/test/java/org/springframework/security/web/access/DelegatingAccessDeniedHandlerTests.java +++ b/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, AccessDeniedHandler>(); + handlers = new LinkedHashMap<>(); } @Test diff --git a/web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java b/web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java index 323288f71d..c627765c28 100644 --- a/web/src/test/java/org/springframework/security/web/access/expression/ExpressionBasedFilterInvocationSecurityMetadataSourceTests.java +++ b/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> requestMap = new LinkedHashMap>(); + LinkedHashMap> 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> requestMap = new LinkedHashMap>(); + LinkedHashMap> requestMap = new LinkedHashMap<>(); requestMap.put(AnyRequestMatcher.INSTANCE, SecurityConfig.createList("hasRole('X'")); ExpressionBasedFilterInvocationSecurityMetadataSource mds = new ExpressionBasedFilterInvocationSecurityMetadataSource( diff --git a/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java b/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java index ae4c18c9ca..57bf27362f 100644 --- a/web/src/test/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSourceTests.java +++ b/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> requestMap = new LinkedHashMap>(); + LinkedHashMap> 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> requestMap = new LinkedHashMap>(); + LinkedHashMap> requestMap = new LinkedHashMap<>(); Collection userAttrs = SecurityConfig.createList("A"); requestMap.put(new AntPathRequestMatcher("/user/**", null), userAttrs); diff --git a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java index 5ab31a05a7..8fce0fd8a2 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationFailureHandlerTests.java +++ b/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, AuthenticationFailureHandler>(); + handlers = new LinkedHashMap<>(); } @Test diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java index 19310a990f..6decb116fb 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests.java +++ b/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(Arrays.asList(mappedRoles))); + result.setMappableAttributes(new HashSet<>(Arrays.asList(mappedRoles))); return result; } diff --git a/web/src/test/java/org/springframework/security/web/reactive/result/view/CsrfRequestDataValueProcessorTests.java b/web/src/test/java/org/springframework/security/web/reactive/result/view/CsrfRequestDataValueProcessorTests.java index 4873b60334..341e9937a2 100644 --- a/web/src/test/java/org/springframework/security/web/reactive/result/view/CsrfRequestDataValueProcessorTests.java +++ b/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 expected = new HashMap(); + Map expected = new HashMap<>(); expected.put(token.getParameterName(), token.getToken()); CsrfRequestDataValueProcessor processor = new CsrfRequestDataValueProcessor();