From 57353d18e5cf8adbc321b6cb8bba99692c5efe55 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Mon, 20 Nov 2017 02:25:30 +0900 Subject: [PATCH] Use diamond type --- .../acls/AclPermissionCacheOptimizer.java | 2 +- .../acls/afterinvocation/ArrayFilterer.java | 2 +- .../afterinvocation/CollectionFilterer.java | 2 +- .../security/acls/domain/AclImpl.java | 4 +- .../acls/domain/DefaultPermissionFactory.java | 6 +-- .../acls/domain/SidRetrievalStrategyImpl.java | 2 +- .../acls/jdbc/BasicLookupStrategy.java | 12 ++--- .../security/acls/domain/AclImplTests.java | 6 +-- .../acls/jdbc/JdbcAclServiceTests.java | 2 +- .../aspect/AnnotationSecurityAspectTests.java | 2 +- .../CasAssertionAuthenticationToken.java | 3 +- ...AssertionAttributesUserDetailsService.java | 2 +- .../AbstractStatelessTicketCacheTests.java | 2 +- .../CasAuthenticationProviderTests.java | 2 +- ...tionAttributesUserDetailsServiceTests.java | 2 +- .../config/SecurityNamespaceHandler.java | 2 +- .../AbstractConfiguredSecurityBuilder.java | 10 ++-- .../AuthenticationManagerBuilder.java | 12 ++--- .../InMemoryUserDetailsManagerConfigurer.java | 3 +- .../JdbcUserDetailsManagerConfigurer.java | 2 +- .../UserDetailsManagerConfigurer.java | 2 +- ...utowireBeanFactoryObjectPostProcessor.java | 4 +- .../GlobalMethodSecurityConfiguration.java | 4 +- .../GlobalMethodSecuritySelector.java | 2 +- .../web/AbstractRequestMatcherRegistry.java | 6 +-- .../web/builders/FilterComparator.java | 2 +- .../annotation/web/builders/HttpSecurity.java | 46 +++++++++---------- .../annotation/web/builders/WebSecurity.java | 4 +- .../WebSecurityConfigurerAdapter.java | 4 +- ...ConfigAttributeRequestMatcherRegistry.java | 2 +- .../web/configurers/CsrfConfigurer.java | 4 +- .../ExceptionHandlingConfigurer.java | 2 +- .../web/configurers/HeadersConfigurer.java | 6 +-- .../web/configurers/HttpBasicConfigurer.java | 2 +- .../web/configurers/JeeConfigurer.java | 2 +- .../web/configurers/LogoutConfigurer.java | 4 +- .../web/configurers/PortMapperConfigurer.java | 2 +- .../configurers/RequestCacheConfigurer.java | 2 +- .../SessionManagementConfigurer.java | 2 +- .../web/configurers/X509Configurer.java | 2 +- .../openid/OpenIDLoginConfigurer.java | 8 ++-- ...MessageSecurityMetadataSourceRegistry.java | 8 ++-- ...urityWebSocketMessageBrokerConfigurer.java | 10 ++-- ...enticationManagerBeanDefinitionParser.java | 2 +- .../UserServiceBeanDefinitionParser.java | 2 +- .../http/AuthenticationConfigBuilder.java | 6 +-- .../http/DefaultFilterChainValidator.java | 4 +- .../http/FilterChainBeanDefinitionParser.java | 2 +- ...FilterChainMapBeanDefinitionDecorator.java | 2 +- ...nvocationSecurityMetadataSourceParser.java | 2 +- .../http/HeadersBeanDefinitionParser.java | 4 +- .../config/http/HttpConfigurationBuilder.java | 10 ++-- .../HttpSecurityBeanDefinitionParser.java | 8 ++-- .../http/LogoutBeanDefinitionParser.java | 2 +- ...balMethodSecurityBeanDefinitionParser.java | 6 +-- ...terceptMethodsBeanDefinitionDecorator.java | 2 +- .../method/ProtectPointcutPostProcessor.java | 6 +-- ...ageBrokerSecurityBeanDefinitionParser.java | 10 ++-- .../annotation/ObjectPostProcessorTests.java | 2 +- .../builders/DisableUseExpressionsConfig.java | 2 +- .../BeanNameCollectingPostProcessor.java | 4 +- .../security/CollectingAppListener.java | 8 ++-- .../ConcereteSecurityConfigurerAdapter.java | 2 +- ...pAuthenticationProviderConfigurerTest.java | 2 +- ...SocketMessageBrokerConfigurerDocTests.java | 4 +- ...WebSocketMessageBrokerConfigurerTests.java | 4 +- ...ationManagerBeanDefinitionParserTests.java | 2 +- ...thodSecurityBeanDefinitionParserTests.java | 2 +- .../security/access/SecurityConfig.java | 2 +- .../Jsr250MethodSecurityMetadataSource.java | 2 +- ...curedAnnotationSecurityMetadataSource.java | 2 +- .../expression/SecurityExpressionRoot.java | 2 +- .../hierarchicalroles/RoleHierarchyImpl.java | 12 ++--- .../AbstractSecurityInterceptor.java | 2 +- .../AfterInvocationProviderManager.java | 2 +- .../access/intercept/RunAsManagerImpl.java | 2 +- ...elegatingMethodSecurityMetadataSource.java | 2 +- .../MapBasedMethodSecurityMetadataSource.java | 8 ++-- ...ePostAnnotationSecurityMetadataSource.java | 2 +- .../security/access/vote/UnanimousBased.java | 2 +- .../AbstractAuthenticationToken.java | 2 +- .../AbstractJaasAuthenticationProvider.java | 4 +- .../DelegatingSecurityContextCallable.java | 4 +- .../security/core/ComparableVersion.java | 2 +- .../core/authority/AuthorityUtils.java | 4 +- ...edAttributes2GrantedAuthoritiesMapper.java | 4 +- ...leAttributes2GrantedAuthoritiesMapper.java | 2 +- .../mapping/SimpleAuthorityMapper.java | 2 +- .../SimpleMappableAttributesRetriever.java | 2 +- ...eadLocalSecurityContextHolderStrategy.java | 2 +- ...eadLocalSecurityContextHolderStrategy.java | 2 +- .../AnnotationParameterNameDiscoverer.java | 4 +- ...efaultSecurityParameterNameDiscoverer.java | 4 +- .../core/session/SessionRegistryImpl.java | 10 ++-- .../security/core/userdetails/User.java | 6 +-- .../core/userdetails/jdbc/JdbcDaoImpl.java | 4 +- .../userdetails/memory/UserAttribute.java | 4 +- .../memory/UserAttributeEditor.java | 2 +- .../jackson2/SecurityJackson2Modules.java | 2 +- .../jackson2/UnmodifiableSetDeserializer.java | 2 +- .../InMemoryUserDetailsManager.java | 2 +- .../annotation/BusinessServiceImpl.java | 2 +- ...xpressionProtectedBusinessServiceImpl.java | 2 +- .../annotation/Jsr250BusinessServiceImpl.java | 2 +- .../access/annotation/Jsr250VoterTests.java | 2 +- .../method/MethodExpressionVoterTests.java | 2 +- .../HierarchicalRolesTestHelper.java | 4 +- .../RoleHierarchyImplTests.java | 2 +- .../hierarchicalroles/TestHelperTests.java | 10 ++-- .../access/vote/AbstractAclVoterTests.java | 2 +- .../access/vote/AffirmativeBasedTests.java | 2 +- .../authentication/ProviderManagerTests.java | 5 +- .../dao/DaoAuthenticationProviderTests.java | 4 +- .../authentication/dao/MockUserCache.java | 2 +- .../jaas/SecurityContextLoginModuleTests.java | 7 ++- .../jaas/TestAuthorityGranter.java | 2 +- .../RememberMeAuthenticationTokenTests.java | 2 +- ...elegatingSecurityContextCallableTests.java | 16 +++---- ...leRoles2GrantedAuthoritiesMapperTests.java | 2 +- .../userdetails/MockUserDetailsService.java | 2 +- .../security/core/userdetails/UserTests.java | 2 +- ...PasswordAuthenticationTokenMixinTests.java | 3 +- .../JdbcUserDetailsManagerTests.java | 2 +- .../PythonInterpreterPreInvocationAdvice.java | 2 +- ...faultSpringSecurityContextSourceTests.java | 8 ++-- .../SpringSecurityLdapTemplateITests.java | 2 +- .../BindAuthenticatorTests.java | 2 +- .../ldap/server/ApacheDSContainerTests.java | 4 +- .../ldap/server/UnboundIdContainerTests.java | 4 +- .../DefaultLdapAuthoritiesPopulatorTests.java | 2 +- .../DefaultSpringSecurityContextSource.java | 2 +- .../ldap/SpringSecurityLdapTemplate.java | 6 +-- .../AbstractLdapAuthenticator.java | 2 +- ...veDirectoryLdapAuthenticationProvider.java | 4 +- .../ldap/server/ApacheDSContainer.java | 2 +- .../DefaultLdapAuthoritiesPopulator.java | 6 +-- .../ldap/userdetails/LdapUserDetailsImpl.java | 4 +- .../userdetails/LdapUserDetailsManager.java | 2 +- .../NestedLdapAuthoritiesPopulator.java | 8 ++-- .../security/ldap/userdetails/Person.java | 4 +- ...ectoryLdapAuthenticationProviderTests.java | 2 +- .../ldap/userdetails/InetOrgPersonTests.java | 2 +- ...dMessageSecurityMetadataSourceFactory.java | 4 +- .../expression/MessageExpressionVoter.java | 2 +- .../intercept/ChannelSecurityInterceptor.java | 2 +- .../DefaultMessageSecurityMetadataSource.java | 2 +- .../SecurityContextChannelInterceptor.java | 2 +- ...MessageSecurityExpressionHandlerTests.java | 4 +- .../util/matcher/AndMessageMatcherTest.java | 22 ++++----- .../util/matcher/OrMessageMatcherTest.java | 22 ++++----- .../web/csrf/CsrfChannelInterceptorTests.java | 2 +- .../CsrfTokenHandshakeInterceptorTests.java | 2 +- .../jwt/NimbusJwtDecoderJwkSupport.java | 2 +- .../security/openid/OpenID4JavaConsumer.java | 2 +- .../openid/OpenIDAuthenticationFilter.java | 2 +- .../openid/OpenIDAuthenticationProvider.java | 2 +- .../openid/OpenIDAuthenticationToken.java | 2 +- .../OpenIDAuthenticationProviderTests.java | 2 +- .../remoting/dns/JndiDnsResolver.java | 2 +- ...SimpleHttpInvokerRequestExecutorTests.java | 2 +- .../samples/mvc/MessageJsonController.java | 8 ++-- .../mvc/config/WebMvcConfiguration.java | 2 +- .../contact/AdminPermissionController.java | 10 ++-- .../java/sample/contact/IndexController.java | 6 +-- .../main/java/sample/dms/AbstractElement.java | 2 +- .../gae/security/GaeUserAuthentication.java | 2 +- .../gae/users/InMemoryUserRegistry.java | 2 +- .../openid/CustomUserDetailsService.java | 2 +- .../src/main/java/bigbank/BankDaoStub.java | 2 +- .../taglibs/authz/AccessControlListTag.java | 2 +- .../context/TestSecurityContextHolder.java | 2 +- .../WithMockUserSecurityContextFactory.java | 4 +- .../SecurityMockMvcRequestPostProcessors.java | 2 +- .../SecurityMockMvcResultMatchers.java | 4 +- ...ityContextTestExcecutionListenerTests.java | 2 +- ...WithAuthoritiesMvcResultMatchersTests.java | 4 +- .../web/DefaultSecurityFilterChain.java | 2 +- .../security/web/PortMapperImpl.java | 2 +- .../channel/ChannelDecisionManagerImpl.java | 2 +- .../channel/ChannelProcessingFilter.java | 2 +- ...ilterInvocationSecurityMetadataSource.java | 2 +- ...ilterInvocationSecurityMetadataSource.java | 2 +- ...onMappingAuthenticationFailureHandler.java | 2 +- ...edAuthoritiesWebAuthenticationDetails.java | 2 +- ...ticatedWebAuthenticationDetailsSource.java | 2 +- .../WebXmlMappableAttributesRetriever.java | 4 +- .../InMemoryTokenRepositoryImpl.java | 2 +- .../SessionFixationProtectionStrategy.java | 2 +- .../switchuser/SwitchUserFilter.java | 2 +- .../authentication/www/DigestAuthUtils.java | 4 +- .../security/web/csrf/CsrfFilter.java | 2 +- .../writers/CacheControlHeadersWriter.java | 2 +- .../web/header/writers/HpkpHeaderWriter.java | 2 +- .../writers/ReferrerPolicyHeaderWriter.java | 2 +- .../web/savedrequest/DefaultSavedRequest.java | 14 +++--- .../security/web/savedrequest/Enumerator.java | 2 +- .../web/savedrequest/FastHttpDateFormat.java | 4 +- .../SavedRequestAwareWrapper.java | 14 +++--- .../csrf/CsrfRequestDataValueProcessor.java | 4 +- .../session/HttpSessionDestroyedEvent.java | 2 +- .../security/web/util/ThrowableAnalyzer.java | 2 +- .../security/web/PortMapperImplTests.java | 6 +-- .../channel/RetryWithHttpEntryPointTests.java | 2 +- .../RetryWithHttpsEntryPointTests.java | 2 +- .../DelegatingEvaluationContextTests.java | 6 +-- ...legatingAuthenticationEntryPointTests.java | 2 +- ...pingAuthenticationFailureHandlerTests.java | 2 +- ...LoginUrlAuthenticationEntryPointTests.java | 2 +- .../DelegatingLogoutSuccessHandlerTests.java | 2 +- ...horitiesWebAuthenticationDetailsTests.java | 2 +- ...edWebAuthenticationDetailsSourceTests.java | 4 +- ...PreAuthenticatedProcessingFilterTests.java | 2 +- .../switchuser/SwitchUserFilterTests.java | 4 +- .../web/firewall/RequestWrapperTests.java | 2 +- .../web/header/HeaderWriterFilterTests.java | 4 +- .../header/writers/HpkpHeaderWriterTests.java | 4 +- .../WhiteListedAllowFromStrategyTests.java | 10 ++-- .../JaasApiIntegrationFilterTests.java | 2 +- .../web/jackson2/SavedCookieMixinTests.java | 2 +- .../CsrfRequestDataValueProcessorTests.java | 2 +- .../CsrfRequestDataValueProcessorTests.java | 4 +- 221 files changed, 423 insertions(+), 428 deletions(-) diff --git a/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java b/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java index 424cc451b5..c085c67226 100644 --- a/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java +++ b/acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java @@ -52,7 +52,7 @@ public class AclPermissionCacheOptimizer implements PermissionCacheOptimizer { return; } - List oidsToCache = new ArrayList(objects.size()); + List oidsToCache = new ArrayList<>(objects.size()); for (Object domainObject : objects) { if (domainObject == null) { diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java index c46ae8057b..907b6df948 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java @@ -52,7 +52,7 @@ class ArrayFilterer implements Filterer { // Collect the removed objects to a HashSet so that // it is fast to lookup them when a filtered array // is constructed. - removeList = new HashSet(); + removeList = new HashSet<>(); } // ~ Methods diff --git a/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java b/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java index 661f2a6ee2..64a9cafd5f 100644 --- a/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java +++ b/acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java @@ -56,7 +56,7 @@ class CollectionFilterer implements Filterer { // to the method may not necessarily be re-constructable (as // the Collection(collection) constructor is not guaranteed and // manually adding may lose sort order or other capabilities) - removeList = new HashSet(); + removeList = new HashSet<>(); } // ~ Methods diff --git a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java index 54cf4a6708..91085e8995 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java @@ -44,7 +44,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { private Acl parentAcl; private transient AclAuthorizationStrategy aclAuthorizationStrategy; private transient PermissionGrantingStrategy permissionGrantingStrategy; - private final List aces = new ArrayList(); + private final List aces = new ArrayList<>(); private ObjectIdentity objectIdentity; private Serializable id; private Sid owner; // OwnershipAcl @@ -173,7 +173,7 @@ public class AclImpl implements Acl, MutableAcl, AuditableAcl, OwnershipAcl { public List getEntries() { // Can safely return AccessControlEntry directly, as they're immutable outside the // ACL package - return new ArrayList(aces); + return new ArrayList<>(aces); } @Override diff --git a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java index 43c4bb5848..b057875d6d 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java @@ -38,8 +38,8 @@ import org.springframework.util.Assert; * @since 2.0.3 */ public class DefaultPermissionFactory implements PermissionFactory { - private final Map registeredPermissionsByInteger = new HashMap(); - private final Map registeredPermissionsByName = new HashMap(); + private final Map registeredPermissionsByInteger = new HashMap<>(); + private final Map registeredPermissionsByName = new HashMap<>(); /** * Registers the Permission fields from the BasePermission class. @@ -156,7 +156,7 @@ public class DefaultPermissionFactory implements PermissionFactory { return Collections.emptyList(); } - List permissions = new ArrayList(names.size()); + List permissions = new ArrayList<>(names.size()); for (String name : names) { permissions.add(buildFromName(name)); diff --git a/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java b/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java index 2b29068000..5ea60af538 100644 --- a/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java +++ b/acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java @@ -57,7 +57,7 @@ public class SidRetrievalStrategyImpl implements SidRetrievalStrategy { public List getSids(Authentication authentication) { Collection authorities = roleHierarchy .getReachableGrantedAuthorities(authentication.getAuthorities()); - List sids = new ArrayList(authorities.size() + 1); + List sids = new ArrayList<>(authorities.size() + 1); sids.add(new PrincipalSid(authentication)); diff --git a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java index bbf5ba0210..530c64ae8c 100644 --- a/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java +++ b/acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java @@ -291,13 +291,13 @@ public class BasicLookupStrategy implements LookupStrategy { Assert.notEmpty(objects, "Objects to lookup required"); // Map - Map result = new HashMap(); // contains + Map result = new HashMap<>(); // contains // FULLY // loaded // Acl // objects - Set currentBatchToLoad = new HashSet(); + Set currentBatchToLoad = new HashSet<>(); for (int i = 0; i < objects.size(); i++) { final ObjectIdentity oid = objects.get(i); @@ -371,7 +371,7 @@ public class BasicLookupStrategy implements LookupStrategy { final Collection objectIdentities, List sids) { Assert.notEmpty(objectIdentities, "Must provide identities to lookup"); - final Map acls = new HashMap(); // contains + final Map acls = new HashMap<>(); // contains // Acls // with // StubAclParents @@ -408,7 +408,7 @@ public class BasicLookupStrategy implements LookupStrategy { } // Finally, convert our "acls" containing StubAclParents into true Acls - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); for (Acl inputAcl : acls.values()) { Assert.isInstanceOf(AclImpl.class, inputAcl, @@ -463,7 +463,7 @@ public class BasicLookupStrategy implements LookupStrategy { List aces = readAces(inputAcl); // Create a list in which to store the "aces" for the "result" AclImpl instance - List acesNew = new ArrayList(); + List acesNew = new ArrayList<>(); // Iterate over the "aces" input and replace each nested // AccessControlEntryImpl.getAcl() with the new "result" AclImpl instance @@ -581,7 +581,7 @@ public class BasicLookupStrategy implements LookupStrategy { * @throws SQLException */ public Set extractData(ResultSet rs) throws SQLException { - Set parentIdsToLookup = new HashSet(); // Set of parent_id Longs + Set parentIdsToLookup = new HashSet<>(); // Set of parent_id Longs while (rs.next()) { // Convert current row into an Acl (albeit with a StubAclParent) diff --git a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java index df4f9c5c81..50cbf3ad6a 100644 --- a/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java +++ b/acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java @@ -237,13 +237,13 @@ public class AclImplTests { true, new PrincipalSid("joe")); Sid ben = new PrincipalSid("ben"); try { - acl.isGranted(new ArrayList(0), Arrays.asList(ben), false); + acl.isGranted(new ArrayList<>(0), Arrays.asList(ben), false); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { } try { - acl.isGranted(READ, new ArrayList(0), false); + acl.isGranted(READ, new ArrayList<>(0), false); fail("It should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { @@ -500,7 +500,7 @@ public class AclImplTests { .isTrue(); assertThat(acl.isSidLoaded(BEN)).isTrue(); assertThat(acl.isSidLoaded(null)).isTrue(); - assertThat(acl.isSidLoaded(new ArrayList(0))).isTrue(); + assertThat(acl.isSidLoaded(new ArrayList<>(0))).isTrue(); assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid( "ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_IGNORED")))) .isTrue(); diff --git a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java index e13b9fba94..804c15d920 100644 --- a/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java +++ b/acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java @@ -55,7 +55,7 @@ public class JdbcAclServiceTests { // SEC-1898 @Test(expected = NotFoundException.class) public void readAclByIdMissingAcl() { - Map result = new HashMap(); + Map result = new HashMap<>(); when( lookupStrategy.readAclsById(anyListOf(ObjectIdentity.class), anyListOf(Sid.class))).thenReturn(result); diff --git a/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java b/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java index 0292d7f4e2..2098699f52 100644 --- a/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java +++ b/aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java @@ -206,7 +206,7 @@ class PrePostSecured { @PostFilter("filterObject.startsWith('a')") public List postFilterMethod() { - ArrayList objects = new ArrayList(); + ArrayList objects = new ArrayList<>(); objects.addAll(Arrays.asList(new String[] { "apple", "banana", "aubergine", "orange" })); return objects; diff --git a/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java b/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java index 19da86d366..bc5e5b40dc 100644 --- a/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java +++ b/cas/src/main/java/org/springframework/security/cas/authentication/CasAssertionAuthenticationToken.java @@ -19,7 +19,6 @@ import java.util.ArrayList; import org.jasig.cas.client.validation.Assertion; import org.springframework.security.authentication.AbstractAuthenticationToken; -import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.SpringSecurityCoreVersion; /** @@ -37,7 +36,7 @@ public final class CasAssertionAuthenticationToken extends AbstractAuthenticatio private final String ticket; public CasAssertionAuthenticationToken(final Assertion assertion, final String ticket) { - super(new ArrayList()); + super(new ArrayList<>()); this.assertion = assertion; this.ticket = ticket; diff --git a/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java b/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java index 6b19cb4400..f6a6f471b7 100644 --- a/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java +++ b/cas/src/main/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsService.java @@ -54,7 +54,7 @@ public final class GrantedAuthorityFromAssertionAttributesUserDetailsService ext @SuppressWarnings("unchecked") @Override protected UserDetails loadUserDetails(final Assertion assertion) { - final List grantedAuthorities = new ArrayList(); + final List grantedAuthorities = new ArrayList<>(); for (final String attribute : this.attributes) { final Object value = assertion.getPrincipal().getAttributes().get(attribute); diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java index 8d7ab31594..485056bc8b 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/AbstractStatelessTicketCacheTests.java @@ -33,7 +33,7 @@ import org.springframework.security.core.userdetails.User; public abstract class AbstractStatelessTicketCacheTests { protected CasAuthenticationToken getToken() { - List proxyList = new ArrayList(); + List proxyList = new ArrayList<>(); proxyList.add("https://localhost/newPortal/login/cas"); User user = new User("rod", "password", true, true, true, true, diff --git a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java index b77b77815f..389191fb2c 100644 --- a/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java +++ b/cas/src/test/java/org/springframework/security/cas/authentication/CasAuthenticationProviderTests.java @@ -392,7 +392,7 @@ public class CasAuthenticationProviderTests { } private class MockStatelessTicketCache implements StatelessTicketCache { - private Map cache = new HashMap(); + private Map cache = new HashMap<>(); public CasAuthenticationToken getByTicketId(String serviceTicket) { return cache.get(serviceTicket); diff --git a/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java b/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java index 4ae42580e8..914b187b94 100644 --- a/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java +++ b/cas/src/test/java/org/springframework/security/cas/userdetails/GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests.java @@ -44,7 +44,7 @@ public class GrantedAuthorityFromAssertionAttributesUserDetailsServiceTests { uds.setConvertToUpperCase(false); Assertion assertion = mock(Assertion.class); AttributePrincipal principal = mock(AttributePrincipal.class); - Map attributes = new HashMap(); + Map attributes = new HashMap<>(); attributes.put("a", Arrays.asList("role_a1", "role_a2")); attributes.put("b", "role_b"); attributes.put("c", "role_c"); diff --git a/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java b/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java index bf22ecff83..c4c0d7c0be 100644 --- a/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java +++ b/config/src/main/java/org/springframework/security/config/SecurityNamespaceHandler.java @@ -60,7 +60,7 @@ public final class SecurityNamespaceHandler implements NamespaceHandler { private static final String FILTER_CHAIN_PROXY_CLASSNAME = "org.springframework.security.web.FilterChainProxy"; private static final String MESSAGE_CLASSNAME = "org.springframework.messaging.Message"; private final Log logger = LogFactory.getLog(getClass()); - private final Map parsers = new HashMap(); + private final Map parsers = new HashMap<>(); private final BeanDefinitionDecorator interceptMethodsBDD = new InterceptMethodsBeanDefinitionDecorator(); private BeanDefinitionDecorator filterChainMapBDD; 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 12d0e5d70e..29d64aee42 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 @@ -220,9 +220,9 @@ public abstract class AbstractConfiguredSecurityBuilder> List getConfigurers(Class clazz) { List configs = (List) this.configurers.get(clazz); if (configs == null) { - return new ArrayList(); + return new ArrayList<>(); } - return new ArrayList(configs); + return new ArrayList<>(configs); } /** @@ -236,9 +236,9 @@ public abstract class AbstractConfiguredSecurityBuilder> List removeConfigurers(Class clazz) { List configs = (List) this.configurers.remove(clazz); if (configs == null) { - return new ArrayList(); + return new ArrayList<>(); } - return new ArrayList(configs); + return new ArrayList<>(configs); } /** @@ -459,4 +459,4 @@ public abstract class AbstractConfiguredSecurityBuilder= CONFIGURING.order; } } -} \ No newline at end of file +} diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java index 653a8a4864..52f23fd3eb 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/builders/AuthenticationManagerBuilder.java @@ -54,7 +54,7 @@ public class AuthenticationManagerBuilder private final Log logger = LogFactory.getLog(getClass()); private AuthenticationManager parentAuthenticationManager; - private List authenticationProviders = new ArrayList(); + private List authenticationProviders = new ArrayList<>(); private UserDetailsService defaultUserDetailsService; private Boolean eraseCredentials; private AuthenticationEventPublisher eventPublisher; @@ -131,7 +131,7 @@ public class AuthenticationManagerBuilder */ public InMemoryUserDetailsManagerConfigurer inMemoryAuthentication() throws Exception { - return apply(new InMemoryUserDetailsManagerConfigurer()); + return apply(new InMemoryUserDetailsManagerConfigurer<>()); } /** @@ -161,7 +161,7 @@ public class AuthenticationManagerBuilder */ public JdbcUserDetailsManagerConfigurer jdbcAuthentication() throws Exception { - return apply(new JdbcUserDetailsManagerConfigurer()); + return apply(new JdbcUserDetailsManagerConfigurer<>()); } /** @@ -184,7 +184,7 @@ public class AuthenticationManagerBuilder public DaoAuthenticationConfigurer userDetailsService( T userDetailsService) throws Exception { this.defaultUserDetailsService = userDetailsService; - return apply(new DaoAuthenticationConfigurer( + return apply(new DaoAuthenticationConfigurer<>( userDetailsService)); } @@ -203,7 +203,7 @@ public class AuthenticationManagerBuilder */ public LdapAuthenticationProviderConfigurer ldapAuthentication() throws Exception { - return apply(new LdapAuthenticationProviderConfigurer()); + return apply(new LdapAuthenticationProviderConfigurer<>()); } /** @@ -289,4 +289,4 @@ public class AuthenticationManagerBuilder this.defaultUserDetailsService = configurer.getUserDetailsService(); return (C) super.apply(configurer); } -} \ No newline at end of file +} diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/InMemoryUserDetailsManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/InMemoryUserDetailsManagerConfigurer.java index 8a097bee4a..ac949b89b0 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/InMemoryUserDetailsManagerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/InMemoryUserDetailsManagerConfigurer.java @@ -18,7 +18,6 @@ package org.springframework.security.config.annotation.authentication.configurer import java.util.ArrayList; import org.springframework.security.config.annotation.authentication.ProviderManagerBuilder; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.provisioning.InMemoryUserDetailsManager; /** @@ -39,6 +38,6 @@ public class InMemoryUserDetailsManagerConfigurer())); + super(new InMemoryUserDetailsManager(new ArrayList<>())); } } diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/JdbcUserDetailsManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/JdbcUserDetailsManagerConfigurer.java index 506a21ff39..3f5ea1f969 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/JdbcUserDetailsManagerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/JdbcUserDetailsManagerConfigurer.java @@ -49,7 +49,7 @@ public class JdbcUserDetailsManagerConfigurer initScripts = new ArrayList(); + private List initScripts = new ArrayList<>(); public JdbcUserDetailsManagerConfigurer(JdbcUserDetailsManager manager) { super(manager); diff --git a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurer.java index 835b3eda78..a03c45df6c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/authentication/configurers/provisioning/UserDetailsManagerConfigurer.java @@ -41,7 +41,7 @@ import org.springframework.security.provisioning.UserDetailsManager; public class UserDetailsManagerConfigurer, C extends UserDetailsManagerConfigurer> extends UserDetailsServiceConfigurer { - private final List userBuilders = new ArrayList(); + private final List userBuilders = new ArrayList<>(); private final List users = new ArrayList<>(); diff --git a/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java b/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java index 35bc42a9a9..afbd3ae40f 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java +++ b/config/src/main/java/org/springframework/security/config/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java @@ -41,8 +41,8 @@ final class AutowireBeanFactoryObjectPostProcessor implements ObjectPostProcessor, DisposableBean, SmartInitializingSingleton { private final Log logger = LogFactory.getLog(getClass()); private final AutowireCapableBeanFactory autowireBeanFactory; - private final List disposableBeans = new ArrayList(); - private final List smartSingletons = new ArrayList(); + private final List disposableBeans = new ArrayList<>(); + private final List smartSingletons = new ArrayList<>(); public AutowireBeanFactoryObjectPostProcessor( AutowireCapableBeanFactory autowireBeanFactory) { 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 c541aff573..4c57d9fee2 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 @@ -213,7 +213,7 @@ public class GlobalMethodSecurityConfiguration getExpressionHandler()); PostInvocationAdviceProvider postInvocationAdviceProvider = new PostInvocationAdviceProvider( postAdvice); - List afterInvocationProviders = new ArrayList(); + List afterInvocationProviders = new ArrayList<>(); afterInvocationProviders.add(postInvocationAdviceProvider); invocationProviderManager.setProviders(afterInvocationProviders); return invocationProviderManager; @@ -350,7 +350,7 @@ public class GlobalMethodSecurityConfiguration */ @Bean public MethodSecurityMetadataSource methodSecurityMetadataSource() { - List sources = new ArrayList(); + List sources = new ArrayList<>(); ExpressionBasedAnnotationAttributeFactory attributeFactory = new ExpressionBasedAnnotationAttributeFactory( getExpressionHandler()); MethodSecurityMetadataSource customMethodSecurityMetadataSource = customMethodSecurityMetadataSource(); diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java index 96f6b926ac..bf8cbf2f2e 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java +++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecuritySelector.java @@ -61,7 +61,7 @@ final class GlobalMethodSecuritySelector implements ImportSelector { boolean jsr250Enabled = attributes.getBoolean("jsr250Enabled"); - List classNames = new ArrayList(4); + List classNames = new ArrayList<>(4); if(isProxy) { classNames.add(MethodSecurityMetadataSourceAdvisorRegistrar.class.getName()); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java b/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java index d3f0c047e6..0eab54d761 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/AbstractRequestMatcherRegistry.java @@ -169,7 +169,7 @@ public abstract class AbstractRequestMatcherRegistry { } HandlerMappingIntrospector introspector = this.context.getBean(HANDLER_MAPPING_INTROSPECTOR_BEAN_NAME, HandlerMappingIntrospector.class); - List matchers = new ArrayList( + List matchers = new ArrayList<>( mvcPatterns.length); for (String mvcPattern : mvcPatterns) { MvcRequestMatcher matcher = new MvcRequestMatcher(introspector, mvcPattern); @@ -257,7 +257,7 @@ public abstract class AbstractRequestMatcherRegistry { public static List antMatchers(HttpMethod httpMethod, String... antPatterns) { String method = httpMethod == null ? null : httpMethod.toString(); - List matchers = new ArrayList(); + List matchers = new ArrayList<>(); for (String pattern : antPatterns) { matchers.add(new AntPathRequestMatcher(pattern, method)); } @@ -290,7 +290,7 @@ public abstract class AbstractRequestMatcherRegistry { public static List regexMatchers(HttpMethod httpMethod, String... regexPatterns) { String method = httpMethod == null ? null : httpMethod.toString(); - List matchers = new ArrayList(); + List matchers = new ArrayList<>(); for (String pattern : regexPatterns) { matchers.add(new RegexRequestMatcher(pattern, method)); } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java index c1e505bf1c..632da9b14d 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java @@ -57,7 +57,7 @@ import org.springframework.web.filter.CorsFilter; @SuppressWarnings("serial") final class FilterComparator implements Comparator, Serializable { private static final int STEP = 100; - private Map filterToOrder = new HashMap(); + private Map filterToOrder = new HashMap<>(); FilterComparator() { int order = 100; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java index 2732699273..b340e179a4 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/HttpSecurity.java @@ -119,7 +119,7 @@ public final class HttpSecurity extends implements SecurityBuilder, HttpSecurityBuilder { private final RequestMatcherConfigurer requestMatcherConfigurer; - private List filters = new ArrayList(); + private List filters = new ArrayList<>(); private RequestMatcher requestMatcher = AnyRequestMatcher.INSTANCE; private FilterComparator comparator = new FilterComparator(); @@ -232,7 +232,7 @@ public final class HttpSecurity extends * @see OpenIDLoginConfigurer */ public OpenIDLoginConfigurer openidLogin() throws Exception { - return getOrApply(new OpenIDLoginConfigurer()); + return getOrApply(new OpenIDLoginConfigurer<>()); } /** @@ -332,7 +332,7 @@ public final class HttpSecurity extends * @see HeadersConfigurer */ public HeadersConfigurer headers() throws Exception { - return getOrApply(new HeadersConfigurer()); + return getOrApply(new HeadersConfigurer<>()); } /** @@ -345,7 +345,7 @@ public final class HttpSecurity extends * @throws Exception */ public CorsConfigurer cors() throws Exception { - return getOrApply(new CorsConfigurer()); + return getOrApply(new CorsConfigurer<>()); } /** @@ -397,7 +397,7 @@ public final class HttpSecurity extends * @throws Exception */ public SessionManagementConfigurer sessionManagement() throws Exception { - return getOrApply(new SessionManagementConfigurer()); + return getOrApply(new SessionManagementConfigurer<>()); } /** @@ -440,7 +440,7 @@ public final class HttpSecurity extends * @see #requiresChannel() */ public PortMapperConfigurer portMapper() throws Exception { - return getOrApply(new PortMapperConfigurer()); + return getOrApply(new PortMapperConfigurer<>()); } /** @@ -512,7 +512,7 @@ public final class HttpSecurity extends * @throws Exception */ public JeeConfigurer jee() throws Exception { - return getOrApply(new JeeConfigurer()); + return getOrApply(new JeeConfigurer<>()); } /** @@ -542,7 +542,7 @@ public final class HttpSecurity extends * @throws Exception */ public X509Configurer x509() throws Exception { - return getOrApply(new X509Configurer()); + return getOrApply(new X509Configurer<>()); } /** @@ -579,7 +579,7 @@ public final class HttpSecurity extends * @throws Exception */ public RememberMeConfigurer rememberMe() throws Exception { - return getOrApply(new RememberMeConfigurer()); + return getOrApply(new RememberMeConfigurer<>()); } /** @@ -649,7 +649,7 @@ public final class HttpSecurity extends public ExpressionUrlAuthorizationConfigurer.ExpressionInterceptUrlRegistry authorizeRequests() throws Exception { ApplicationContext context = getContext(); - return getOrApply(new ExpressionUrlAuthorizationConfigurer(context)) + return getOrApply(new ExpressionUrlAuthorizationConfigurer<>(context)) .getRegistry(); } @@ -664,7 +664,7 @@ public final class HttpSecurity extends * @throws Exception */ public RequestCacheConfigurer requestCache() throws Exception { - return getOrApply(new RequestCacheConfigurer()); + return getOrApply(new RequestCacheConfigurer<>()); } /** @@ -675,7 +675,7 @@ public final class HttpSecurity extends * @throws Exception */ public ExceptionHandlingConfigurer exceptionHandling() throws Exception { - return getOrApply(new ExceptionHandlingConfigurer()); + return getOrApply(new ExceptionHandlingConfigurer<>()); } /** @@ -687,7 +687,7 @@ public final class HttpSecurity extends * @throws Exception */ public SecurityContextConfigurer securityContext() throws Exception { - return getOrApply(new SecurityContextConfigurer()); + return getOrApply(new SecurityContextConfigurer<>()); } /** @@ -699,7 +699,7 @@ public final class HttpSecurity extends * @throws Exception */ public ServletApiConfigurer servletApi() throws Exception { - return getOrApply(new ServletApiConfigurer()); + return getOrApply(new ServletApiConfigurer<>()); } /** @@ -726,7 +726,7 @@ public final class HttpSecurity extends */ public CsrfConfigurer csrf() throws Exception { ApplicationContext context = getContext(); - return getOrApply(new CsrfConfigurer(context)); + return getOrApply(new CsrfConfigurer<>(context)); } /** @@ -767,7 +767,7 @@ public final class HttpSecurity extends * @throws Exception */ public LogoutConfigurer logout() throws Exception { - return getOrApply(new LogoutConfigurer()); + return getOrApply(new LogoutConfigurer<>()); } /** @@ -830,7 +830,7 @@ public final class HttpSecurity extends * @throws Exception */ public AnonymousConfigurer anonymous() throws Exception { - return getOrApply(new AnonymousConfigurer()); + return getOrApply(new AnonymousConfigurer<>()); } /** @@ -894,7 +894,7 @@ public final class HttpSecurity extends * @throws Exception */ public FormLoginConfigurer formLogin() throws Exception { - return getOrApply(new FormLoginConfigurer()); + return getOrApply(new FormLoginConfigurer<>()); } /** @@ -988,7 +988,7 @@ public final class HttpSecurity extends * @throws Exception */ public OAuth2LoginConfigurer oauth2Login() throws Exception { - return getOrApply(new OAuth2LoginConfigurer()); + return getOrApply(new OAuth2LoginConfigurer<>()); } /** @@ -1028,7 +1028,7 @@ public final class HttpSecurity extends public ChannelSecurityConfigurer.ChannelRequestMatcherRegistry requiresChannel() throws Exception { ApplicationContext context = getContext(); - return getOrApply(new ChannelSecurityConfigurer(context)) + return getOrApply(new ChannelSecurityConfigurer<>(context)) .getRegistry(); } @@ -1062,7 +1062,7 @@ public final class HttpSecurity extends * @throws Exception */ public HttpBasicConfigurer httpBasic() throws Exception { - return getOrApply(new HttpBasicConfigurer()); + return getOrApply(new HttpBasicConfigurer<>()); } public void setSharedObject(Class sharedType, C object) { @@ -1382,7 +1382,7 @@ public final class HttpSecurity extends private MvcMatchersRequestMatcherConfigurer(ApplicationContext context, List matchers) { super(context); - this.matchers = new ArrayList(matchers); + this.matchers = new ArrayList<>(matchers); } public RequestMatcherConfigurer servletPath(String servletPath) { @@ -1403,7 +1403,7 @@ public final class HttpSecurity extends public class RequestMatcherConfigurer extends AbstractRequestMatcherRegistry { - protected List matchers = new ArrayList(); + protected List matchers = new ArrayList<>(); /** * @param context 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 748b6a737a..f53bdb2ab4 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 @@ -79,7 +79,7 @@ public final class WebSecurity extends SecurityBuilder, ApplicationContextAware { private final Log logger = LogFactory.getLog(getClass()); - private final List ignoredRequests = new ArrayList(); + private final List ignoredRequests = new ArrayList<>(); private final List> securityFilterChainBuilders = new ArrayList>(); @@ -281,7 +281,7 @@ public final class WebSecurity extends + WebSecurity.class.getSimpleName() + ".addSecurityFilterChainBuilder directly"); int chainSize = ignoredRequests.size() + securityFilterChainBuilders.size(); - List securityFilterChains = new ArrayList( + List securityFilterChains = new ArrayList<>( chainSize); for (RequestMatcher ignoredRequest : ignoredRequests) { securityFilterChains.add(new DefaultSecurityFilterChain(ignoredRequest)); 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 aa21667b9a..c75b94ccb5 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 @@ -216,7 +216,7 @@ public abstract class WebSecurityConfigurerAdapter implements .requestCache().and() .anonymous().and() .servletApi().and() - .apply(new DefaultLoginPageConfigurer()).and() + .apply(new DefaultLoginPageConfigurer<>()).and() .logout(); // @formatter:on ClassLoader classLoader = this.context.getClassLoader(); @@ -517,7 +517,7 @@ public abstract class WebSecurityConfigurerAdapter implements String[] beanNamesForType = BeanFactoryUtils .beanNamesForTypeIncludingAncestors(applicationContext, AuthenticationManager.class); - return new HashSet(Arrays.asList(beanNamesForType)); + return new HashSet<>(Arrays.asList(beanNamesForType)); } private static void validateBeanCycle(Object auth, Set beanNames) { 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 e6a22be222..821f21e087 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 @@ -39,7 +39,7 @@ import org.springframework.security.web.util.matcher.RequestMatcher; */ public abstract class AbstractConfigAttributeRequestMatcherRegistry extends AbstractRequestMatcherRegistry { - private List urlMappings = new ArrayList(); + private List urlMappings = new ArrayList<>(); private List unmappedMatchers; /** 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 4d3015cbad..a1143cc3d5 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 @@ -80,7 +80,7 @@ public final class CsrfConfigurer> private CsrfTokenRepository csrfTokenRepository = new LazyCsrfTokenRepository( new HttpSessionCsrfTokenRepository()); private RequestMatcher requireCsrfProtectionMatcher = CsrfFilter.DEFAULT_CSRF_MATCHER; - private List ignoredCsrfProtectionMatchers = new ArrayList(); + private List ignoredCsrfProtectionMatchers = new ArrayList<>(); private final ApplicationContext context; /** @@ -327,4 +327,4 @@ public final class CsrfConfigurer> return this; } } -} \ No newline at end of file +} diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java index 264a1fed1e..84665715fe 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/ExceptionHandlingConfigurer.java @@ -68,7 +68,7 @@ public final class ExceptionHandlingConfigurer> private AccessDeniedHandler accessDeniedHandler; - private LinkedHashMap defaultEntryPointMappings = new LinkedHashMap(); + private LinkedHashMap defaultEntryPointMappings = new LinkedHashMap<>(); /** * Creates a new instance diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java index b4c9ee2d40..7af9c9c441 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HeadersConfigurer.java @@ -62,7 +62,7 @@ import org.springframework.util.Assert; */ public class HeadersConfigurer> extends AbstractHttpConfigurer, H> { - private List headerWriters = new ArrayList(); + private List headerWriters = new ArrayList<>(); // --- default header writers --- @@ -766,7 +766,7 @@ public class HeadersConfigurer> extends * @return */ private List getHeaderWriters() { - List writers = new ArrayList(); + List writers = new ArrayList<>(); addIfNotNull(writers, contentTypeOptions.writer); addIfNotNull(writers, xssProtection.writer); addIfNotNull(writers, cacheControl.writer); @@ -848,4 +848,4 @@ public class HeadersConfigurer> extends } } -} \ No newline at end of file +} diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java index a1d042fbd4..60f63df0c2 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/HttpBasicConfigurer.java @@ -97,7 +97,7 @@ public final class HttpBasicConfigurer> extends public HttpBasicConfigurer() throws Exception { realmName(DEFAULT_REALM); - LinkedHashMap entryPoints = new LinkedHashMap(); + LinkedHashMap entryPoints = new LinkedHashMap<>(); entryPoints.put(X_REQUESTED_WITH, new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED)); DelegatingAuthenticationEntryPoint defaultEntryPoint = new DelegatingAuthenticationEntryPoint( diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java index 221721fa1a..e315800427 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java @@ -72,7 +72,7 @@ public final class JeeConfigurer> extends AbstractHttpConfigurer, H> { private J2eePreAuthenticatedProcessingFilter j2eePreAuthenticatedProcessingFilter; private AuthenticationUserDetailsService authenticationUserDetailsService; - private Set mappableRoles = new HashSet(); + private Set mappableRoles = new HashSet<>(); /** * Creates a new instance diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java index f092451563..01bf207047 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/LogoutConfigurer.java @@ -65,7 +65,7 @@ import org.springframework.util.Assert; */ public final class LogoutConfigurer> extends AbstractHttpConfigurer, H> { - private List logoutHandlers = new ArrayList(); + private List logoutHandlers = new ArrayList<>(); private SecurityContextLogoutHandler contextLogoutHandler = new SecurityContextLogoutHandler(); private String logoutSuccessUrl = "/login?logout"; private LogoutSuccessHandler logoutSuccessHandler; @@ -75,7 +75,7 @@ public final class LogoutConfigurer> extends private boolean customLogoutSuccess; private LinkedHashMap defaultLogoutSuccessHandlerMappings = - new LinkedHashMap(); + new LinkedHashMap<>(); /** * Creates a new instance diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java index 8691409a1f..262bb1436c 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/PortMapperConfigurer.java @@ -34,7 +34,7 @@ import org.springframework.security.web.PortMapperImpl; public final class PortMapperConfigurer> extends AbstractHttpConfigurer, H> { private PortMapper portMapper; - private Map httpsPortMappings = new HashMap(); + private Map httpsPortMappings = new HashMap<>(); /** * Creates a new instance diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurer.java index b83c91af3f..628b9eca21 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/RequestCacheConfigurer.java @@ -139,7 +139,7 @@ public final class RequestCacheConfigurer> exte boolean isCsrfEnabled = http.getConfigurer(CsrfConfigurer.class) != null; - List matchers = new ArrayList(); + List matchers = new ArrayList<>(); if (isCsrfEnabled) { RequestMatcher getRequests = new AntPathRequestMatcher("/**", "GET"); matchers.add(0, getRequests); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java index ef0ecd7fae..fd814edc7d 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/SessionManagementConfigurer.java @@ -100,7 +100,7 @@ public final class SessionManagementConfigurer> private SessionAuthenticationStrategy providedSessionAuthenticationStrategy; private InvalidSessionStrategy invalidSessionStrategy; private SessionInformationExpiredStrategy expiredSessionStrategy; - private List sessionAuthenticationStrategies = new ArrayList(); + private List sessionAuthenticationStrategies = new ArrayList<>(); private SessionRegistry sessionRegistry; private Integer maximumSessions; private String expiredUrl; diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java index 13dec07a82..3eba6d53ee 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/X509Configurer.java @@ -121,7 +121,7 @@ public final class X509Configurer> extends * @return the {@link X509Configurer} for further customizations */ public X509Configurer userDetailsService(UserDetailsService userDetailsService) { - UserDetailsByNameServiceWrapper authenticationUserDetailsService = new UserDetailsByNameServiceWrapper(); + UserDetailsByNameServiceWrapper authenticationUserDetailsService = new UserDetailsByNameServiceWrapper<>(); authenticationUserDetailsService.setUserDetailsService(userDetailsService); return authenticationUserDetailsService(authenticationUserDetailsService); } 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 f8fa11a3e2..a1c8ae0225 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 @@ -124,7 +124,7 @@ public final class OpenIDLoginConfigurer> exten private OpenIDConsumer openIDConsumer; private ConsumerManager consumerManager; private AuthenticationUserDetailsService authenticationUserDetailsService; - private List attributeExchangeConfigurers = new ArrayList(); + private List attributeExchangeConfigurers = new ArrayList<>(); /** * Creates a new instance @@ -341,7 +341,7 @@ public final class OpenIDLoginConfigurer> exten if (this.authenticationUserDetailsService != null) { return this.authenticationUserDetailsService; } - return new UserDetailsByNameServiceWrapper( + return new UserDetailsByNameServiceWrapper<>( http.getSharedObject(UserDetailsService.class)); } @@ -374,8 +374,8 @@ public final class OpenIDLoginConfigurer> exten */ public final class AttributeExchangeConfigurer { private final String identifier; - private List attributes = new ArrayList(); - private List attributeConfigurers = new ArrayList(); + private List attributes = new ArrayList<>(); + private List attributeConfigurers = new ArrayList<>(); /** * Creates a new instance 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 848cc77afd..5ef46338f4 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 @@ -51,9 +51,9 @@ public class MessageSecurityMetadataSourceRegistry { private static final String fullyAuthenticated = "fullyAuthenticated"; private static final String rememberMe = "rememberMe"; - private SecurityExpressionHandler> expressionHandler = new DefaultMessageSecurityExpressionHandler(); + private SecurityExpressionHandler> expressionHandler = new DefaultMessageSecurityExpressionHandler<>(); - private final LinkedHashMap matcherToExpression = new LinkedHashMap(); + private final LinkedHashMap matcherToExpression = new LinkedHashMap<>(); private DelegatingPathMatcher pathMatcher = new DelegatingPathMatcher(); @@ -160,7 +160,7 @@ public class MessageSecurityMetadataSourceRegistry { * @see {@link MessageSecurityMetadataSourceRegistry#simpDestPathMatcher(PathMatcher)} */ private Constraint simpDestMatchers(SimpMessageType type, String... patterns) { - List matchers = new ArrayList(patterns.length); + List matchers = new ArrayList<>(patterns.length); for (String pattern : patterns) { matchers.add(new PathMatcherMessageMatcherBuilder(pattern, type)); } @@ -201,7 +201,7 @@ public class MessageSecurityMetadataSourceRegistry { * instances */ public Constraint matchers(MessageMatcher... matchers) { - List builders = new ArrayList(matchers.length); + List builders = new ArrayList<>(matchers.length); for (MessageMatcher matcher : matchers) { builders.add(new PreBuiltMatcherBuilder(matcher)); } 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 6fd1d50140..a5804499e9 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 @@ -87,7 +87,7 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends AbstractWebSocketMessageBrokerConfigurer implements SmartInitializingSingleton { private final WebSocketMessageSecurityMetadataSourceRegistry inboundRegistry = new WebSocketMessageSecurityMetadataSourceRegistry(); - private SecurityExpressionHandler> defaultExpressionHandler = new DefaultMessageSecurityExpressionHandler(); + private SecurityExpressionHandler> defaultExpressionHandler = new DefaultMessageSecurityExpressionHandler<>(); private SecurityExpressionHandler> expressionHandler; @@ -156,7 +156,7 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends public ChannelSecurityInterceptor inboundChannelSecurity() { ChannelSecurityInterceptor channelSecurityInterceptor = new ChannelSecurityInterceptor( inboundMessageSecurityMetadataSource()); - MessageExpressionVoter voter = new MessageExpressionVoter(); + MessageExpressionVoter voter = new MessageExpressionVoter<>(); voter.setExpressionHandler(getMessageExpressionHandler()); List> voters = new ArrayList>(); @@ -255,7 +255,7 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends TransportHandlingSockJsService transportHandlingSockJsService = (TransportHandlingSockJsService) sockJsService; List handshakeInterceptors = transportHandlingSockJsService .getHandshakeInterceptors(); - List interceptorsToSet = new ArrayList( + List interceptorsToSet = new ArrayList<>( handshakeInterceptors.size() + 1); interceptorsToSet.add(new CsrfTokenHandshakeInterceptor()); interceptorsToSet.addAll(handshakeInterceptors); @@ -267,7 +267,7 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends WebSocketHttpRequestHandler handler = (WebSocketHttpRequestHandler) object; List handshakeInterceptors = handler .getHandshakeInterceptors(); - List interceptorsToSet = new ArrayList( + List interceptorsToSet = new ArrayList<>( handshakeInterceptors.size() + 1); interceptorsToSet.add(new CsrfTokenHandshakeInterceptor()); interceptorsToSet.addAll(handshakeInterceptors); @@ -288,4 +288,4 @@ public abstract class AbstractSecurityWebSocketMessageBrokerConfigurer extends inboundRegistry.simpDestPathMatcher(pathMatcher); } } -} \ No newline at end of file +} diff --git a/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java index 24967fde76..4eb40cb756 100644 --- a/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParser.java @@ -71,7 +71,7 @@ public class AuthenticationManagerBeanDefinitionParser implements BeanDefinition String alias = element.getAttribute(ATT_ALIAS); - List providers = new ManagedList(); + List providers = new ManagedList<>(); NamespaceHandlerResolver resolver = pc.getReaderContext() .getNamespaceHandlerResolver(); diff --git a/config/src/main/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParser.java index c8d48b1d30..4d6babc3b9 100644 --- a/config/src/main/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/authentication/UserServiceBeanDefinitionParser.java @@ -82,7 +82,7 @@ public class UserServiceBeanDefinitionParser extends + ATT_PROPERTIES + "' attribute)"); } - ManagedList users = new ManagedList(); + ManagedList users = new ManagedList<>(); for (Object elt : userElts) { Element userElt = (Element) elt; 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 8f597e34a9..39bcdbf434 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 @@ -302,7 +302,7 @@ final class AuthenticationConfigBuilder { } private ManagedList parseOpenIDAttributes(Element attrExElt) { - ManagedList attributes = new ManagedList(); + ManagedList attributes = new ManagedList<>(); for (Element attElt : DomUtils.getChildElementsByTagName(attrExElt, Elements.OPENID_ATTRIBUTE)) { String name = attElt.getAttribute("name"); @@ -764,7 +764,7 @@ final class AuthenticationConfigBuilder { } List getFilters() { - List filters = new ArrayList(); + List filters = new ArrayList<>(); if (anonymousFilter != null) { filters.add(new OrderDecorator(anonymousFilter, ANONYMOUS_FILTER)); @@ -810,7 +810,7 @@ final class AuthenticationConfigBuilder { } List getProviders() { - List providers = new ArrayList(); + List providers = new ArrayList<>(); if (anonymousProviderRef != null) { providers.add(anonymousProviderRef); diff --git a/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java b/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java index 6685578ff5..4442b39728 100644 --- a/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java +++ b/config/src/main/java/org/springframework/security/config/http/DefaultFilterChainValidator.java @@ -52,8 +52,8 @@ public class DefaultFilterChainValidator implements FilterChainProxy.FilterChain checkFilterStack(filterChain.getFilters()); } - checkPathOrder(new ArrayList(fcp.getFilterChains())); - checkForDuplicateMatchers(new ArrayList( + checkPathOrder(new ArrayList<>(fcp.getFilterChains())); + checkForDuplicateMatchers(new ArrayList<>( fcp.getFilterChains())); } diff --git a/config/src/main/java/org/springframework/security/config/http/FilterChainBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/FilterChainBeanDefinitionParser.java index 0ca383f152..9c17474b37 100644 --- a/config/src/main/java/org/springframework/security/config/http/FilterChainBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/FilterChainBeanDefinitionParser.java @@ -57,7 +57,7 @@ public class FilterChainBeanDefinitionParser implements BeanDefinitionParser { } else { String[] filterBeanNames = StringUtils.tokenizeToStringArray(filters, ","); - ManagedList filterChain = new ManagedList( + ManagedList filterChain = new ManagedList<>( filterBeanNames.length); for (String name : filterBeanNames) { diff --git a/config/src/main/java/org/springframework/security/config/http/FilterChainMapBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/http/FilterChainMapBeanDefinitionDecorator.java index 0305a695c7..6ba9a6cfad 100644 --- a/config/src/main/java/org/springframework/security/config/http/FilterChainMapBeanDefinitionDecorator.java +++ b/config/src/main/java/org/springframework/security/config/http/FilterChainMapBeanDefinitionDecorator.java @@ -44,7 +44,7 @@ public class FilterChainMapBeanDefinitionDecorator implements BeanDefinitionDeco ParserContext parserContext) { BeanDefinition filterChainProxy = holder.getBeanDefinition(); - ManagedList securityFilterChains = new ManagedList(); + ManagedList securityFilterChains = new ManagedList<>(); Element elt = (Element) node; MatcherType matcherType = MatcherType.fromElement(elt); diff --git a/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java b/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java index 59c6865268..bc2c31c13e 100644 --- a/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java +++ b/config/src/main/java/org/springframework/security/config/http/FilterInvocationSecurityMetadataSourceParser.java @@ -155,7 +155,7 @@ public class FilterInvocationSecurityMetadataSourceParser implements BeanDefinit MatcherType matcherType, List urlElts, boolean useExpressions, boolean addAuthenticatedAll, ParserContext parserContext) { - ManagedMap filterInvocationDefinitionMap = new ManagedMap(); + ManagedMap filterInvocationDefinitionMap = new ManagedMap<>(); for (Element urlElt : urlElts) { String access = urlElt.getAttribute(ATT_ACCESS); diff --git a/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java index 6e35ddf34a..20ac10dab7 100644 --- a/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java @@ -91,7 +91,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { private ManagedList headerWriters; public BeanDefinition parse(Element element, ParserContext parserContext) { - headerWriters = new ManagedList(); + headerWriters = new ManagedList<>(); BeanDefinitionBuilder builder = BeanDefinitionBuilder .rootBeanDefinition(HeaderWriterFilter.class); @@ -220,7 +220,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser { if (pinsElement != null) { List pinElements = DomUtils.getChildElements(pinsElement); - Map pins = new LinkedHashMap(); + Map pins = new LinkedHashMap<>(); for (Element pinElement : pinElements) { String hash = pinElement.getAttribute(ATT_ALGORITHM); diff --git a/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java b/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java index dcfb6cd3e8..cc91a2eeb3 100644 --- a/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java +++ b/config/src/main/java/org/springframework/security/config/http/HttpConfigurationBuilder.java @@ -370,7 +370,7 @@ class HttpConfigurationBuilder { boolean sessionFixationProtectionRequired = !sessionFixationAttribute .equals(OPT_SESSION_FIXATION_NO_PROTECTION); - ManagedList delegateSessionStrategies = new ManagedList(); + ManagedList delegateSessionStrategies = new ManagedList<>(); BeanDefinitionBuilder concurrentSessionStrategy; BeanDefinitionBuilder sessionFixationStrategy = null; BeanDefinitionBuilder registerSessionStrategy; @@ -601,7 +601,7 @@ class HttpConfigurationBuilder { metadataSourceBldr.getBeanDefinition()); RootBeanDefinition channelDecisionManager = new RootBeanDefinition( ChannelDecisionManagerImpl.class); - ManagedList channelProcessors = new ManagedList( + ManagedList channelProcessors = new ManagedList<>( 3); RootBeanDefinition secureChannelProcessor = new RootBeanDefinition( SecureChannelProcessor.class); @@ -639,7 +639,7 @@ class HttpConfigurationBuilder { */ private ManagedMap parseInterceptUrlsForChannelSecurity() { - ManagedMap channelRequestMap = new ManagedMap(); + ManagedMap channelRequestMap = new ManagedMap<>(); for (Element urlElt : interceptUrls) { String path = urlElt.getAttribute(ATT_PATH_PATTERN); @@ -719,7 +719,7 @@ class HttpConfigurationBuilder { .createSecurityMetadataSource(interceptUrls, addAllAuth, httpElt, pc); RootBeanDefinition accessDecisionMgr; - ManagedList voters = new ManagedList(2); + ManagedList voters = new ManagedList<>(2); if (useExpressions) { BeanDefinitionBuilder expressionVoter = BeanDefinitionBuilder @@ -820,7 +820,7 @@ class HttpConfigurationBuilder { } List getFilters() { - List filters = new ArrayList(); + List filters = new ArrayList<>(); if (cpf != null) { filters.add(new OrderDecorator(cpf, CHANNEL_FILTER)); diff --git a/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java index c3519d2ab6..483cf1122e 100644 --- a/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/HttpSecurityBeanDefinitionParser.java @@ -138,7 +138,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser { final BeanReference portMapper = createPortMapper(element, pc); final BeanReference portResolver = createPortResolver(portMapper, pc); - ManagedList authenticationProviders = new ManagedList(); + ManagedList authenticationProviders = new ManagedList<>(); BeanReference authenticationManager = createAuthenticationManager(element, pc, authenticationProviders); @@ -158,7 +158,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser { authenticationProviders.addAll(authBldr.getProviders()); - List unorderedFilterChain = new ArrayList(); + List unorderedFilterChain = new ArrayList<>(); unorderedFilterChain.addAll(httpBldr.getFilters()); unorderedFilterChain.addAll(authBldr.getFilters()); @@ -168,7 +168,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser { checkFilterChainOrder(unorderedFilterChain, pc, pc.extractSource(element)); // The list of filter beans - List filterChain = new ManagedList(); + List filterChain = new ManagedList<>(); for (OrderDecorator od : unorderedFilterChain) { filterChain.add(od.bean); @@ -330,7 +330,7 @@ public class HttpSecurityBeanDefinitionParser implements BeanDefinitionParser { List buildCustomFilterList(Element element, ParserContext pc) { List customFilterElts = DomUtils.getChildElementsByTagName(element, Elements.CUSTOM_FILTER); - List customFilters = new ArrayList(); + List customFilters = new ArrayList<>(); final String ATT_AFTER = "after"; final String ATT_BEFORE = "before"; diff --git a/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java index 881af31c09..26a26a794f 100644 --- a/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/http/LogoutBeanDefinitionParser.java @@ -45,7 +45,7 @@ class LogoutBeanDefinitionParser implements BeanDefinitionParser { final String rememberMeServices; private final String defaultLogoutUrl; - private ManagedList logoutHandlers = new ManagedList(); + private ManagedList logoutHandlers = new ManagedList<>(); private boolean csrfEnabled; public LogoutBeanDefinitionParser(String loginPageUrl, String rememberMeServices, 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 ca6f5c838e..3264dde4c5 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 @@ -113,7 +113,7 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP Object source = pc.extractSource(element); // The list of method metadata delegates - ManagedList delegates = new ManagedList(); + ManagedList delegates = new ManagedList<>(); boolean jsr250Enabled = "enabled".equals(element.getAttribute(ATT_USE_JSR250)); boolean useSecured = "enabled".equals(element.getAttribute(ATT_USE_SECURED)); @@ -122,7 +122,7 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP boolean useAspectJ = "aspectj".equals(element.getAttribute(ATT_MODE)); BeanDefinition preInvocationVoter = null; - ManagedList afterInvocationProviders = new ManagedList(); + ManagedList afterInvocationProviders = new ManagedList<>(); // Check for an external SecurityMetadataSource, which takes priority over other // sources @@ -399,7 +399,7 @@ public class GlobalMethodSecurityBeanDefinitionParser implements BeanDefinitionP String[] attributeTokens = StringUtils .commaDelimitedListToStringArray(accessConfig); - List attributes = new ArrayList( + List attributes = new ArrayList<>( attributeTokens.length); for (String token : attributeTokens) { diff --git a/config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java b/config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java index cdd4058653..7732d3af3a 100644 --- a/config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java +++ b/config/src/main/java/org/springframework/security/config/method/InterceptMethodsBeanDefinitionDecorator.java @@ -88,7 +88,7 @@ class InternalInterceptMethodsBeanDefinitionDecorator extends // Parse the included methods List methods = DomUtils.getChildElementsByTagName(interceptMethodsElt, Elements.PROTECT); - Map mappings = new ManagedMap(); + Map mappings = new ManagedMap<>(); for (Element protectmethodElt : methods) { BeanDefinitionBuilder attributeBuilder = BeanDefinitionBuilder 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 8ccdf58936..76a8803e1f 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 @@ -64,9 +64,9 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor { private final Map> pointcutMap = new LinkedHashMap>(); private final MapBasedMethodSecurityMetadataSource mapBasedMethodSecurityMetadataSource; - private final Set pointCutExpressions = new LinkedHashSet(); + private final Set pointCutExpressions = new LinkedHashSet<>(); private final PointcutParser parser; - private final Set processedBeans = new HashSet(); + private final Set processedBeans = new HashSet<>(); public ProtectPointcutPostProcessor( MapBasedMethodSecurityMetadataSource mapBasedMethodSecurityMetadataSource) { @@ -75,7 +75,7 @@ final class ProtectPointcutPostProcessor implements BeanPostProcessor { this.mapBasedMethodSecurityMetadataSource = mapBasedMethodSecurityMetadataSource; // Set up AspectJ pointcut expression parser - Set supportedPrimitives = new HashSet(3); + Set supportedPrimitives = new HashSet<>(3); supportedPrimitives.add(PointcutPrimitive.EXECUTION); supportedPrimitives.add(PointcutPrimitive.ARGS); supportedPrimitives.add(PointcutPrimitive.REFERENCE); diff --git a/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java index f9904abdcc..afa29975af 100644 --- a/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java +++ b/config/src/main/java/org/springframework/security/config/websocket/WebSocketMessageBrokerSecurityBeanDefinitionParser.java @@ -116,7 +116,7 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements BeanDefinitionRegistry registry = parserContext.getRegistry(); XmlReaderContext context = parserContext.getReaderContext(); - ManagedMap matcherToExpression = new ManagedMap(); + ManagedMap matcherToExpression = new ManagedMap<>(); String id = element.getAttribute(ID_ATTR); Element expressionHandlerElt = DomUtils.getChildElementByTagName(element, @@ -149,7 +149,7 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements String mdsId = context.registerWithGeneratedName(mds.getBeanDefinition()); - ManagedList voters = new ManagedList(); + ManagedList voters = new ManagedList<>(); BeanDefinitionBuilder messageExpressionVoterBldr = BeanDefinitionBuilder.rootBeanDefinition(MessageExpressionVoter.class); if(expressionHandlerDefined) { messageExpressionVoterBldr.addPropertyReference("expressionHandler", expressionHandlerRef); @@ -259,7 +259,7 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements WEB_SOCKET_AMMH_CLASS_NAME.equals(beanClassName)) { PropertyValue current = bd.getPropertyValues().getPropertyValue( CUSTOM_ARG_RESOLVERS_PROP); - ManagedList argResolvers = new ManagedList(); + ManagedList argResolvers = new ManagedList<>(); if (current != null) { argResolvers.addAll((ManagedList) current.getValue()); } @@ -322,7 +322,7 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements return; } String interceptorPropertyName = "handshakeInterceptors"; - ManagedList interceptors = new ManagedList(); + ManagedList interceptors = new ManagedList<>(); interceptors.add(new RootBeanDefinition(CsrfTokenHandshakeInterceptor.class)); interceptors.addAll((ManagedList) bd.getPropertyValues().get( interceptorPropertyName)); @@ -371,4 +371,4 @@ public final class WebSocketMessageBrokerSecurityBeanDefinitionParser implements this.delegate = pathMatcher; } } -} \ No newline at end of file +} diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java b/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java index 2f8031f40a..4c1ed0ba4d 100644 --- a/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java +++ b/config/src/test/groovy/org/springframework/security/config/annotation/ObjectPostProcessorTests.java @@ -31,7 +31,7 @@ public class ObjectPostProcessorTests { @Test public void convertTypes() { - assertThat((Object) PerformConversion.perform(new ArrayList())) + assertThat((Object) PerformConversion.perform(new ArrayList<>())) .isInstanceOf(LinkedList.class); } } diff --git a/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/DisableUseExpressionsConfig.java b/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/DisableUseExpressionsConfig.java index d82a5cf3ef..622aa3ebf4 100644 --- a/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/DisableUseExpressionsConfig.java +++ b/config/src/test/groovy/org/springframework/security/config/annotation/web/builders/DisableUseExpressionsConfig.java @@ -25,7 +25,7 @@ public class DisableUseExpressionsConfig extends BaseWebConfig { protected void configure(HttpSecurity http) throws Exception { // This config is also on UrlAuthorizationConfigurer javadoc http - .apply(new UrlAuthorizationConfigurer(getApplicationContext())).getRegistry() + .apply(new UrlAuthorizationConfigurer<>(getApplicationContext())).getRegistry() .antMatchers("/users**", "/sessions/**").hasRole("USER") .antMatchers("/signup").hasRole("ANONYMOUS") .anyRequest().hasRole("USER"); diff --git a/config/src/test/java/org/springframework/security/BeanNameCollectingPostProcessor.java b/config/src/test/java/org/springframework/security/BeanNameCollectingPostProcessor.java index d05d9ce8ca..70d308aa54 100644 --- a/config/src/test/java/org/springframework/security/BeanNameCollectingPostProcessor.java +++ b/config/src/test/java/org/springframework/security/BeanNameCollectingPostProcessor.java @@ -24,8 +24,8 @@ import java.util.*; * @author Luke Taylor */ public class BeanNameCollectingPostProcessor implements BeanPostProcessor { - Set beforeInitPostProcessedBeans = new HashSet(); - Set afterInitPostProcessedBeans = new HashSet(); + Set beforeInitPostProcessedBeans = new HashSet<>(); + Set afterInitPostProcessedBeans = new HashSet<>(); public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { diff --git a/config/src/test/java/org/springframework/security/CollectingAppListener.java b/config/src/test/java/org/springframework/security/CollectingAppListener.java index 9f41419621..05b9f84ba5 100644 --- a/config/src/test/java/org/springframework/security/CollectingAppListener.java +++ b/config/src/test/java/org/springframework/security/CollectingAppListener.java @@ -30,10 +30,10 @@ import org.springframework.security.authentication.event.AbstractAuthenticationF * @since 3.1 */ public class CollectingAppListener implements ApplicationListener { - Set events = new HashSet(); - Set authenticationEvents = new HashSet(); - Set authenticationFailureEvents = new HashSet(); - Set authorizationEvents = new HashSet(); + Set events = new HashSet<>(); + Set authenticationEvents = new HashSet<>(); + Set authenticationFailureEvents = new HashSet<>(); + Set authorizationEvents = new HashSet<>(); public void onApplicationEvent(ApplicationEvent event) { if (event instanceof AbstractAuthenticationEvent) { diff --git a/config/src/test/java/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java b/config/src/test/java/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java index b31dc49be0..b209946499 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java +++ b/config/src/test/java/org/springframework/security/config/annotation/ConcereteSecurityConfigurerAdapter.java @@ -24,7 +24,7 @@ import java.util.List; */ class ConcereteSecurityConfigurerAdapter extends SecurityConfigurerAdapter> { - private List list = new ArrayList(); + private List list = new ArrayList<>(); @Override public void configure(SecurityBuilder builder) throws Exception { diff --git a/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTest.java b/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTest.java index 5bda969a7d..a07bb56596 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTest.java +++ b/config/src/test/java/org/springframework/security/config/annotation/authentication/configurers/ldap/LdapAuthenticationProviderConfigurerTest.java @@ -30,7 +30,7 @@ public class LdapAuthenticationProviderConfigurerTest { @Before public void setUp() { - configurer = new LdapAuthenticationProviderConfigurer(); + configurer = new LdapAuthenticationProviderConfigurer<>(); } // SEC-2557 diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java index 7a8b40fa32..220b68f4a6 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerDocTests.java @@ -107,14 +107,14 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerDocTests { private Message message(SimpMessageHeaderAccessor headers, String destination) { headers.setSessionId("123"); - headers.setSessionAttributes(new HashMap()); + headers.setSessionAttributes(new HashMap<>()); if (destination != null) { headers.setDestination(destination); } if (messageUser != null) { headers.setUser(messageUser); } - return new GenericMessage("hi", headers.getMessageHeaders()); + return new GenericMessage<>("hi", headers.getMessageHeaders()); } @Controller diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java index b917f13c35..40ff4869f4 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/socket/AbstractSecurityWebSocketMessageBrokerConfigurerTests.java @@ -511,14 +511,14 @@ public class AbstractSecurityWebSocketMessageBrokerConfigurerTests { private Message message(SimpMessageHeaderAccessor headers, String destination) { headers.setSessionId("123"); - headers.setSessionAttributes(new HashMap()); + headers.setSessionAttributes(new HashMap<>()); if (destination != null) { headers.setDestination(destination); } if (messageUser != null) { headers.setUser(messageUser); } - return new GenericMessage("hi", headers.getMessageHeaders()); + return new GenericMessage<>("hi", headers.getMessageHeaders()); } private MessageChannel clientInboundChannel() { diff --git a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java index 89059e255b..34c6751571 100644 --- a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java @@ -114,7 +114,7 @@ public class AuthenticationManagerBeanDefinitionParserTests { private static class AuthListener implements ApplicationListener { - List events = new ArrayList(); + List events = new ArrayList<>(); public void onApplicationEvent(AbstractAuthenticationEvent event) { this.events.add(event); diff --git a/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java index d23d9e065b..ffb6a2dab2 100644 --- a/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java +++ b/config/src/test/java/org/springframework/security/config/method/GlobalMethodSecurityBeanDefinitionParserTests.java @@ -287,7 +287,7 @@ public class GlobalMethodSecurityBeanDefinitionParserTests { + AUTH_PROVIDER_XML); SecurityContextHolder.getContext().setAuthentication(bob); target = (BusinessService) appContext.getBean("target"); - List arg = new ArrayList(); + List arg = new ArrayList<>(); arg.add("joe"); arg.add("bob"); arg.add("sam"); diff --git a/core/src/main/java/org/springframework/security/access/SecurityConfig.java b/core/src/main/java/org/springframework/security/access/SecurityConfig.java index 3db3e49f5d..e17bfb5657 100644 --- a/core/src/main/java/org/springframework/security/access/SecurityConfig.java +++ b/core/src/main/java/org/springframework/security/access/SecurityConfig.java @@ -76,7 +76,7 @@ public class SecurityConfig implements ConfigAttribute { public static List createList(String... attributeNames) { Assert.notNull(attributeNames, "You must supply an array of attribute names"); - List attributes = new ArrayList( + List attributes = new ArrayList<>( attributeNames.length); for (String attribute : attributeNames) { diff --git a/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java index 6d7dceb810..dd1ede91c0 100644 --- a/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/annotation/Jsr250MethodSecurityMetadataSource.java @@ -75,7 +75,7 @@ public class Jsr250MethodSecurityMetadataSource extends if (annotations == null || annotations.length == 0) { return null; } - List attributes = new ArrayList(); + List attributes = new ArrayList<>(); for (Annotation a : annotations) { if (a instanceof DenyAll) { diff --git a/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java index 3ef0253d3a..b3ed85e38c 100644 --- a/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSource.java @@ -84,7 +84,7 @@ class SecuredAnnotationMetadataExtractor implements AnnotationMetadataExtractor< public Collection extractAttributes(Secured secured) { String[] attributeTokens = secured.value(); - List attributes = new ArrayList( + List attributes = new ArrayList<>( attributeTokens.length); for (String token : attributeTokens) { diff --git a/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java b/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java index bea1b6c3d0..80394c0b41 100644 --- a/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java +++ b/core/src/main/java/org/springframework/security/access/expression/SecurityExpressionRoot.java @@ -158,7 +158,7 @@ public abstract class SecurityExpressionRoot implements SecurityExpressionOperat private Set getAuthoritySet() { if (roles == null) { - roles = new HashSet(); + roles = new HashSet<>(); Collection userAuthorities = authentication .getAuthorities(); 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 58e718b6b4..417ebc618f 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 @@ -115,7 +115,7 @@ public class RoleHierarchyImpl implements RoleHierarchy { return AuthorityUtils.NO_AUTHORITIES; } - Set reachableRoles = new HashSet(); + Set reachableRoles = new HashSet<>(); for (GrantedAuthority authority : authorities) { addReachableRoles(reachableRoles, authority); @@ -132,7 +132,7 @@ public class RoleHierarchyImpl implements RoleHierarchy { + " in zero or more steps."); } - List reachableRoleList = new ArrayList( + List reachableRoleList = new ArrayList<>( reachableRoles.size()); reachableRoleList.addAll(reachableRoles); @@ -190,7 +190,7 @@ public class RoleHierarchyImpl implements RoleHierarchy { Set rolesReachableInOneStepSet; if (!this.rolesReachableInOneStepMap.containsKey(higherRole)) { - rolesReachableInOneStepSet = new HashSet(); + rolesReachableInOneStepSet = new HashSet<>(); this.rolesReachableInOneStepMap.put(higherRole, rolesReachableInOneStepSet); } @@ -212,17 +212,17 @@ public class RoleHierarchyImpl implements RoleHierarchy { * detected) */ private void buildRolesReachableInOneOrMoreStepsMap() { - this.rolesReachableInOneOrMoreStepsMap = new HashMap>(); + this.rolesReachableInOneOrMoreStepsMap = new HashMap<>(); // iterate over all higher roles from rolesReachableInOneStepMap for (GrantedAuthority role : this.rolesReachableInOneStepMap.keySet()) { - Set rolesToVisitSet = new HashSet(); + Set rolesToVisitSet = new HashSet<>(); if (this.rolesReachableInOneStepMap.containsKey(role)) { rolesToVisitSet.addAll(this.rolesReachableInOneStepMap.get(role)); } - Set visitedRolesSet = new HashSet(); + Set visitedRolesSet = new HashSet<>(); while (!rolesToVisitSet.isEmpty()) { // take a role from the rolesToVisit set diff --git a/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java index 10a906122e..373fa48b67 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AbstractSecurityInterceptor.java @@ -161,7 +161,7 @@ public abstract class AbstractSecurityInterceptor implements InitializingBean, return; } - Set unsupportedAttrs = new HashSet(); + Set unsupportedAttrs = new HashSet<>(); for (ConfigAttribute attr : attributeDefs) { if (!this.runAsManager.supports(attr) diff --git a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java index cb8735c830..d92c9db7ca 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java +++ b/core/src/main/java/org/springframework/security/access/intercept/AfterInvocationProviderManager.java @@ -91,7 +91,7 @@ public class AfterInvocationProviderManager implements AfterInvocationManager, public void setProviders(List newList) { checkIfValidList(newList); - providers = new ArrayList(newList.size()); + providers = new ArrayList<>(newList.size()); for (Object currentObject : newList) { Assert.isInstanceOf(AfterInvocationProvider.class, currentObject, diff --git a/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java index c92ff24f74..4f05a3d020 100644 --- a/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java +++ b/core/src/main/java/org/springframework/security/access/intercept/RunAsManagerImpl.java @@ -71,7 +71,7 @@ public class RunAsManagerImpl implements RunAsManager, InitializingBean { public Authentication buildRunAs(Authentication authentication, Object object, Collection attributes) { - List newAuthorities = new ArrayList(); + List newAuthorities = new ArrayList<>(); for (ConfigAttribute attribute : attributes) { if (this.supports(attribute)) { 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 4ce48b52ce..fda1fc4e1d 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 @@ -95,7 +95,7 @@ public final class DelegatingMethodSecurityMetadataSource extends @Override public Collection getAllConfigAttributes() { - Set set = new HashSet(); + Set set = new HashSet<>(); for (MethodSecurityMetadataSource s : methodSecurityMetadataSources) { Collection attrs = s.getAllConfigAttributes(); if (attrs != null) { diff --git a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java index 28957cce2c..fa1ffe99ef 100644 --- a/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/method/MapBasedMethodSecurityMetadataSource.java @@ -50,10 +50,10 @@ public class MapBasedMethodSecurityMetadataSource extends private ClassLoader beanClassLoader = ClassUtils.getDefaultClassLoader(); /** Map from RegisteredMethod to ConfigAttribute list */ - protected final Map> methodMap = new HashMap>(); + protected final Map> methodMap = new HashMap<>(); /** Map from RegisteredMethod to name pattern used for registration */ - private final Map nameMap = new HashMap(); + private final Map nameMap = new HashMap<>(); // ~ Methods // ======================================================================================================== @@ -150,7 +150,7 @@ public class MapBasedMethodSecurityMetadataSource extends } Method[] methods = javaType.getMethods(); - List matchingMethods = new ArrayList(); + List matchingMethods = new ArrayList<>(); for (Method m : methods) { if (m.getName().equals(mappedName) || isMatch(m.getName(), mappedName)) { @@ -236,7 +236,7 @@ public class MapBasedMethodSecurityMetadataSource extends */ @Override public Collection getAllConfigAttributes() { - Set allAttributes = new HashSet(); + Set allAttributes = new HashSet<>(); for (List attributeList : methodMap.values()) { allAttributes.addAll(attributeList); diff --git a/core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java b/core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java index 0aeb7db905..270411ec6a 100644 --- a/core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java +++ b/core/src/main/java/org/springframework/security/access/prepost/PrePostAnnotationSecurityMetadataSource.java @@ -84,7 +84,7 @@ public class PrePostAnnotationSecurityMetadataSource extends String postAuthorizeAttribute = postAuthorize == null ? null : postAuthorize .value(); - ArrayList attrs = new ArrayList(2); + ArrayList attrs = new ArrayList<>(2); PreInvocationAttribute pre = attributeFactory.createPreInvocationAttribute( preFilterAttribute, filterObject, preAuthorizeAttribute); diff --git a/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java index b835b1c8fa..b40df499ac 100644 --- a/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java +++ b/core/src/main/java/org/springframework/security/access/vote/UnanimousBased.java @@ -66,7 +66,7 @@ public class UnanimousBased extends AbstractAccessDecisionManager { int grant = 0; int abstain = 0; - List singleAttributeList = new ArrayList(1); + List singleAttributeList = new ArrayList<>(1); singleAttributeList.add(null); for (ConfigAttribute attribute : attributes) { diff --git a/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java index 1fa0ba60ce..7465a377aa 100644 --- a/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java +++ b/core/src/main/java/org/springframework/security/authentication/AbstractAuthenticationToken.java @@ -66,7 +66,7 @@ public abstract class AbstractAuthenticationToken implements Authentication, "Authorities collection cannot contain any null elements"); } } - ArrayList temp = new ArrayList( + ArrayList temp = new ArrayList<>( authorities.size()); temp.addAll(authorities); this.authorities = Collections.unmodifiableList(temp); diff --git a/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java b/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java index 30766ec469..de8b188393 100644 --- a/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java +++ b/core/src/main/java/org/springframework/security/authentication/jaas/AbstractJaasAuthenticationProvider.java @@ -181,7 +181,7 @@ public abstract class AbstractJaasAuthenticationProvider // Create a set to hold the authorities, and add any that have already been // applied. - authorities = new HashSet(); + authorities = new HashSet<>(); // Get the subject principals and pass them to each of the AuthorityGranters Set principals = loginContext.getSubject().getPrincipals(); @@ -203,7 +203,7 @@ public abstract class AbstractJaasAuthenticationProvider // Convert the authorities set back to an array and apply it to the token. JaasAuthenticationToken result = new JaasAuthenticationToken( request.getPrincipal(), request.getCredentials(), - new ArrayList(authorities), loginContext); + new ArrayList<>(authorities), loginContext); // Publish the success event publishSuccessEvent(result); diff --git a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java index 53285c960a..6372555537 100644 --- a/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java +++ b/core/src/main/java/org/springframework/security/concurrent/DelegatingSecurityContextCallable.java @@ -116,8 +116,8 @@ public final class DelegatingSecurityContextCallable implements Callable { */ public static Callable create(Callable delegate, SecurityContext securityContext) { - return securityContext == null ? new DelegatingSecurityContextCallable( - delegate) : new DelegatingSecurityContextCallable(delegate, + return securityContext == null ? new DelegatingSecurityContextCallable<>( + delegate) : new DelegatingSecurityContextCallable<>(delegate, securityContext); } } diff --git a/core/src/main/java/org/springframework/security/core/ComparableVersion.java b/core/src/main/java/org/springframework/security/core/ComparableVersion.java index 813299f496..77e38e2d6c 100644 --- a/core/src/main/java/org/springframework/security/core/ComparableVersion.java +++ b/core/src/main/java/org/springframework/security/core/ComparableVersion.java @@ -354,7 +354,7 @@ class ComparableVersion implements Comparable { ListItem list = items; - Stack stack = new Stack(); + Stack stack = new Stack<>(); stack.push(list); boolean isDigit = false; diff --git a/core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java b/core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java index 565a1ec0d6..3f35494086 100644 --- a/core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java +++ b/core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java @@ -55,7 +55,7 @@ public abstract class AuthorityUtils { */ public static Set authorityListToSet( Collection userAuthorities) { - Set set = new HashSet(userAuthorities.size()); + Set set = new HashSet<>(userAuthorities.size()); for (GrantedAuthority authority : userAuthorities) { set.add(authority.getAuthority()); @@ -65,7 +65,7 @@ public abstract class AuthorityUtils { } public static List createAuthorityList(String... roles) { - List authorities = new ArrayList(roles.length); + List authorities = new ArrayList<>(roles.length); for (String role : roles) { authorities.add(new SimpleGrantedAuthority(role)); 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 f6e45b6fbe..1ad9e290a8 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 @@ -47,7 +47,7 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper implements * Map the given array of attributes to Spring Security GrantedAuthorities. */ public List getGrantedAuthorities(Collection attributes) { - ArrayList gaList = new ArrayList(); + ArrayList gaList = new ArrayList<>(); for (String attribute : attributes) { Collection c = attributes2grantedAuthoritiesMap .get(attribute); @@ -107,7 +107,7 @@ public class MapBasedAttributes2GrantedAuthoritiesMapper implements * @return Collection containing the GrantedAuthority Collection */ private Collection getGrantedAuthorityCollection(Object value) { - Collection result = new ArrayList(); + Collection result = new ArrayList<>(); addGrantedAuthorityCollection(result, value); return result; } diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java index c493fd58ea..9f9c837a07 100755 --- a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java +++ b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAttributes2GrantedAuthoritiesMapper.java @@ -62,7 +62,7 @@ public class SimpleAttributes2GrantedAuthoritiesMapper implements * GrantedAuthorities. */ public List getGrantedAuthorities(Collection attributes) { - List result = new ArrayList(attributes.size()); + List result = new ArrayList<>(attributes.size()); for (String attribute : attributes) { result.add(getGrantedAuthority(attribute)); } diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAuthorityMapper.java b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAuthorityMapper.java index 1d766dd97b..e1f1593d9b 100644 --- a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAuthorityMapper.java +++ b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleAuthorityMapper.java @@ -54,7 +54,7 @@ public final class SimpleAuthorityMapper implements GrantedAuthoritiesMapper, */ public Set mapAuthorities( Collection authorities) { - HashSet mapped = new HashSet( + HashSet mapped = new HashSet<>( authorities.size()); for (GrantedAuthority authority : authorities) { mapped.add(mapAuthority(authority.getAuthority())); diff --git a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleMappableAttributesRetriever.java b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleMappableAttributesRetriever.java index 2dbd35f152..0bd3103e5b 100755 --- a/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleMappableAttributesRetriever.java +++ b/core/src/main/java/org/springframework/security/core/authority/mapping/SimpleMappableAttributesRetriever.java @@ -41,7 +41,7 @@ public class SimpleMappableAttributesRetriever implements MappableAttributesRetr } public void setMappableAttributes(Set aMappableRoles) { - this.mappableAttributes = new HashSet(); + this.mappableAttributes = new HashSet<>(); this.mappableAttributes.addAll(aMappableRoles); this.mappableAttributes = Collections.unmodifiableSet(this.mappableAttributes); } diff --git a/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java index cda07fe887..2a53f964c6 100644 --- a/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java +++ b/core/src/main/java/org/springframework/security/core/context/InheritableThreadLocalSecurityContextHolderStrategy.java @@ -31,7 +31,7 @@ final class InheritableThreadLocalSecurityContextHolderStrategy implements // ~ Static fields/initializers // ===================================================================================== - private static final ThreadLocal contextHolder = new InheritableThreadLocal(); + private static final ThreadLocal contextHolder = new InheritableThreadLocal<>(); // ~ Methods // ======================================================================================================== diff --git a/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java b/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java index 9c3ef9f163..2398206486 100644 --- a/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java +++ b/core/src/main/java/org/springframework/security/core/context/ThreadLocalSecurityContextHolderStrategy.java @@ -32,7 +32,7 @@ final class ThreadLocalSecurityContextHolderStrategy implements // ~ Static fields/initializers // ===================================================================================== - private static final ThreadLocal contextHolder = new ThreadLocal(); + private static final ThreadLocal contextHolder = new ThreadLocal<>(); // ~ Methods // ======================================================================================================== diff --git a/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java b/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java index d8dfef2371..a382ead30a 100644 --- a/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java +++ b/core/src/main/java/org/springframework/security/core/parameters/AnnotationParameterNameDiscoverer.java @@ -91,7 +91,7 @@ public class AnnotationParameterNameDiscoverer implements ParameterNameDiscovere private final Set annotationClassesToUse; public AnnotationParameterNameDiscoverer(String... annotationClassToUse) { - this(new HashSet(Arrays.asList(annotationClassToUse))); + this(new HashSet<>(Arrays.asList(annotationClassToUse))); } public AnnotationParameterNameDiscoverer(Set annotationClassesToUse) { @@ -210,4 +210,4 @@ public class AnnotationParameterNameDiscoverer implements ParameterNameDiscovere */ Annotation[][] findParameterAnnotations(T t); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscoverer.java b/core/src/main/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscoverer.java index 1a1ea61a95..f5a5fe584d 100644 --- a/core/src/main/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscoverer.java +++ b/core/src/main/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscoverer.java @@ -81,7 +81,7 @@ public class DefaultSecurityParameterNameDiscoverer extends addDiscoverer(discover); } - Set annotationClassesToUse = new HashSet(2); + Set annotationClassesToUse = new HashSet<>(2); annotationClassesToUse.add("org.springframework.security.access.method.P"); annotationClassesToUse.add(P.class.getName()); if (DATA_PARAM_PRESENT) { @@ -91,4 +91,4 @@ public class DefaultSecurityParameterNameDiscoverer extends addDiscoverer(new AnnotationParameterNameDiscoverer(annotationClassesToUse)); addDiscoverer(new DefaultParameterNameDiscoverer()); } -} \ No newline at end of file +} diff --git a/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java b/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java index f39c21299c..285c6c6747 100644 --- a/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java +++ b/core/src/main/java/org/springframework/security/core/session/SessionRegistryImpl.java @@ -56,8 +56,8 @@ public class SessionRegistryImpl implements SessionRegistry, // ======================================================================================================== public SessionRegistryImpl() { - this.principals = new ConcurrentHashMap>(); - this.sessionIds = new ConcurrentHashMap(); + this.principals = new ConcurrentHashMap<>(); + this.sessionIds = new ConcurrentHashMap<>(); } public SessionRegistryImpl(ConcurrentMap> principals, Map sessionIds) { @@ -66,7 +66,7 @@ public class SessionRegistryImpl implements SessionRegistry, } public List getAllPrincipals() { - return new ArrayList(principals.keySet()); + return new ArrayList<>(principals.keySet()); } public List getAllSessions(Object principal, @@ -77,7 +77,7 @@ public class SessionRegistryImpl implements SessionRegistry, return Collections.emptyList(); } - List list = new ArrayList( + List list = new ArrayList<>( sessionsUsedByPrincipal.size()); for (String sessionId : sessionsUsedByPrincipal) { @@ -135,7 +135,7 @@ public class SessionRegistryImpl implements SessionRegistry, Set sessionsUsedByPrincipal = principals.get(principal); if (sessionsUsedByPrincipal == null) { - sessionsUsedByPrincipal = new CopyOnWriteArraySet(); + sessionsUsedByPrincipal = new CopyOnWriteArraySet<>(); Set prevSessionsUsedByPrincipal = principals.putIfAbsent(principal, sessionsUsedByPrincipal); if (prevSessionsUsedByPrincipal != null) { diff --git a/core/src/main/java/org/springframework/security/core/userdetails/User.java b/core/src/main/java/org/springframework/security/core/userdetails/User.java index 2b4e3d4794..1b418fb8d8 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/User.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/User.java @@ -159,7 +159,7 @@ public class User implements UserDetails, CredentialsContainer { Assert.notNull(authorities, "Cannot pass a null GrantedAuthority collection"); // Ensure array iteration order is predictable (as per // UserDetails.getAuthorities() contract and SEC-717) - SortedSet sortedAuthorities = new TreeSet( + SortedSet sortedAuthorities = new TreeSet<>( new AuthorityComparator()); for (GrantedAuthority grantedAuthority : authorities) { @@ -367,7 +367,7 @@ public class User implements UserDetails, CredentialsContainer { * additional attributes for this user) */ public UserBuilder roles(String... roles) { - List authorities = new ArrayList( + List authorities = new ArrayList<>( roles.length); for (String role : roles) { Assert.isTrue(!role.startsWith("ROLE_"), role @@ -400,7 +400,7 @@ public class User implements UserDetails, CredentialsContainer { * @see #roles(String...) */ public UserBuilder authorities(Collection authorities) { - this.authorities = new ArrayList(authorities); + this.authorities = new ArrayList<>(authorities); return this; } diff --git a/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java b/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java index f84eefefa2..7bfce9158b 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/jdbc/JdbcDaoImpl.java @@ -193,7 +193,7 @@ public class JdbcDaoImpl extends JdbcDaoSupport UserDetails user = users.get(0); // contains no GrantedAuthority[] - Set dbAuthsSet = new HashSet(); + Set dbAuthsSet = new HashSet<>(); if (this.enableAuthorities) { dbAuthsSet.addAll(loadUserAuthorities(user.getUsername())); @@ -203,7 +203,7 @@ public class JdbcDaoImpl extends JdbcDaoSupport dbAuthsSet.addAll(loadGroupAuthorities(user.getUsername())); } - List dbAuths = new ArrayList(dbAuthsSet); + List dbAuths = new ArrayList<>(dbAuthsSet); addCustomAuthorities(user.getUsername(), dbAuths); diff --git a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java index 6a6cd82ee4..e98f0068ad 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttribute.java @@ -33,7 +33,7 @@ public class UserAttribute { // ~ Instance fields // ================================================================================================ - private List authorities = new Vector(); + private List authorities = new Vector<>(); private String password; private boolean enabled = true; @@ -66,7 +66,7 @@ public class UserAttribute { * @since 1.1 */ public void setAuthoritiesAsString(List authoritiesAsStrings) { - setAuthorities(new ArrayList(authoritiesAsStrings.size())); + setAuthorities(new ArrayList<>(authoritiesAsStrings.size())); for (String authority : authoritiesAsStrings) { addAuthority(new SimpleGrantedAuthority(authority)); } diff --git a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java index 684ce26f77..5a7fd3509a 100644 --- a/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java +++ b/core/src/main/java/org/springframework/security/core/userdetails/memory/UserAttributeEditor.java @@ -37,7 +37,7 @@ public class UserAttributeEditor extends PropertyEditorSupport { String[] tokens = StringUtils.commaDelimitedListToStringArray(s); UserAttribute userAttrib = new UserAttribute(); - List authoritiesAsStrings = new ArrayList(); + List authoritiesAsStrings = new ArrayList<>(); for (int i = 0; i < tokens.length; i++) { String currentToken = tokens[i].trim(); diff --git a/core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java b/core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java index 79e8afdd96..19b0f90f61 100644 --- a/core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java +++ b/core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java @@ -95,7 +95,7 @@ public final class SecurityJackson2Modules { * @return List of available security modules in classpath. */ public static List getModules(ClassLoader loader) { - List modules = new ArrayList(); + List modules = new ArrayList<>(); for (String className : securityJackson2ModuleClasses) { Module module = loadAndGetInstance(className, loader); if (module != null) { diff --git a/core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetDeserializer.java b/core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetDeserializer.java index 97256a8de0..f41e921cbf 100644 --- a/core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetDeserializer.java +++ b/core/src/main/java/org/springframework/security/jackson2/UnmodifiableSetDeserializer.java @@ -43,7 +43,7 @@ class UnmodifiableSetDeserializer extends JsonDeserializer { public Set deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { ObjectMapper mapper = (ObjectMapper) jp.getCodec(); JsonNode node = mapper.readTree(jp); - Set resultSet = new HashSet(); + Set resultSet = new HashSet<>(); if (node != null) { if (node instanceof ArrayNode) { ArrayNode arrayNode = (ArrayNode) node; diff --git a/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java b/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java index 7407aedb5f..6592d63b40 100644 --- a/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java +++ b/core/src/main/java/org/springframework/security/provisioning/InMemoryUserDetailsManager.java @@ -48,7 +48,7 @@ import org.springframework.util.Assert; public class InMemoryUserDetailsManager implements UserDetailsManager { protected final Log logger = LogFactory.getLog(getClass()); - private final Map users = new HashMap(); + private final Map users = new HashMap<>(); private AuthenticationManager authenticationManager; diff --git a/core/src/test/java/org/springframework/security/access/annotation/BusinessServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/BusinessServiceImpl.java index 8819fd1e7e..10e9f170a0 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/BusinessServiceImpl.java +++ b/core/src/test/java/org/springframework/security/access/annotation/BusinessServiceImpl.java @@ -57,7 +57,7 @@ public class BusinessServiceImpl implements BusinessService { } public List methodReturningAList(String userName, String arg2) { - return new ArrayList(); + return new ArrayList<>(); } public Object[] methodReturningAnArray(Object[] someArray) { diff --git a/core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java index 956891650f..dec60b6c4f 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java +++ b/core/src/test/java/org/springframework/security/access/annotation/ExpressionProtectedBusinessServiceImpl.java @@ -51,7 +51,7 @@ public class ExpressionProtectedBusinessServiceImpl implements BusinessService { } public List methodReturningAList(String userName, String arg2) { - return new ArrayList(); + return new ArrayList<>(); } @PostFilter("filterObject == 'bob'") diff --git a/core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java b/core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java index d8151397f1..8503a373a7 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java +++ b/core/src/test/java/org/springframework/security/access/annotation/Jsr250BusinessServiceImpl.java @@ -57,7 +57,7 @@ public class Jsr250BusinessServiceImpl implements BusinessService { } public List methodReturningAList(String userName, String arg2) { - return new ArrayList(); + return new ArrayList<>(); } public Object[] methodReturningAnArray(Object[] someArray) { diff --git a/core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java b/core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java index 22b282c167..cf5f575f1f 100644 --- a/core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java +++ b/core/src/test/java/org/springframework/security/access/annotation/Jsr250VoterTests.java @@ -35,7 +35,7 @@ public class Jsr250VoterTests { // SEC-1443 @Test public void supportsMultipleRolesCorrectly() throws Exception { - List attrs = new ArrayList(); + List attrs = new ArrayList<>(); Jsr250Voter voter = new Jsr250Voter(); attrs.add(new Jsr250SecurityConfig("A")); diff --git a/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java b/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java index 0c36074b97..8dd5fe4956 100644 --- a/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java +++ b/core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java @@ -50,7 +50,7 @@ public class MethodExpressionVoterTests { @Test public void hasRoleExpressionDeniesUserWithoutRole() throws Exception { - List cad = new ArrayList(1); + List cad = new ArrayList<>(1); cad.add(new PreInvocationExpressionAttribute(null, null, "hasRole('joedoesnt')")); MethodInvocation mi = new SimpleMethodInvocation(new TargetImpl(), methodTakingAnArray()); diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/HierarchicalRolesTestHelper.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/HierarchicalRolesTestHelper.java index 056971424c..2d68f0179c 100755 --- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/HierarchicalRolesTestHelper.java +++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/HierarchicalRolesTestHelper.java @@ -63,7 +63,7 @@ public abstract class HierarchicalRolesTestHelper { return null; } - List result = new ArrayList(authorities.size()); + List result = new ArrayList<>(authorities.size()); for (GrantedAuthority authority : authorities) { result.add(authority.getAuthority()); } @@ -71,7 +71,7 @@ public abstract class HierarchicalRolesTestHelper { } public static List createAuthorityList(final String... roles) { - List authorities = new ArrayList(roles.length); + List authorities = new ArrayList<>(roles.length); for (final String role : roles) { // Use non SimpleGrantedAuthority (SEC-863) diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java index 456face892..2e29b73529 100644 --- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java +++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/RoleHierarchyImplTests.java @@ -35,7 +35,7 @@ public class RoleHierarchyImplTests { @Test public void testRoleHierarchyWithNullOrEmptyAuthorities() { List authorities0 = null; - List authorities1 = new ArrayList(); + List authorities1 = new ArrayList<>(); RoleHierarchyImpl roleHierarchyImpl = new RoleHierarchyImpl(); roleHierarchyImpl.setHierarchy("ROLE_A > ROLE_B"); diff --git a/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java b/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java index 6e9c08d435..3293ad3f83 100644 --- a/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java +++ b/core/src/test/java/org/springframework/security/access/hierarchicalroles/TestHelperTests.java @@ -85,22 +85,22 @@ public class TestHelperTests { Collection authorities5 = AuthorityUtils.createAuthorityList( "ROLE_A", "ROLE_A"); - List authoritiesStrings1 = new ArrayList(); + List authoritiesStrings1 = new ArrayList<>(); authoritiesStrings1.add("ROLE_A"); authoritiesStrings1.add("ROLE_B"); - List authoritiesStrings2 = new ArrayList(); + List authoritiesStrings2 = new ArrayList<>(); authoritiesStrings2.add("ROLE_B"); authoritiesStrings2.add("ROLE_A"); - List authoritiesStrings3 = new ArrayList(); + List authoritiesStrings3 = new ArrayList<>(); authoritiesStrings3.add("ROLE_A"); authoritiesStrings3.add("ROLE_C"); - List authoritiesStrings4 = new ArrayList(); + List authoritiesStrings4 = new ArrayList<>(); authoritiesStrings4.add("ROLE_A"); - List authoritiesStrings5 = new ArrayList(); + List authoritiesStrings5 = new ArrayList<>(); authoritiesStrings5.add("ROLE_A"); authoritiesStrings5.add("ROLE_A"); diff --git a/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java b/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java index df14e8473d..2e734ad047 100644 --- a/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/AbstractAclVoterTests.java @@ -60,7 +60,7 @@ public class AbstractAclVoterTests { public void correctArgumentIsSelectedFromMultipleArgs() throws Exception { voter.setProcessDomainObjectClass(String.class); MethodInvocation mi = MethodInvocationUtils.create(new TestClass(), - "methodTakingAListAndAString", new ArrayList(), "The Argument"); + "methodTakingAListAndAString", new ArrayList<>(), "The Argument"); assertThat(voter.getDomainObjectInstance(mi)).isEqualTo("The Argument"); } diff --git a/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java b/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java index 8093e43deb..1453ca9039 100644 --- a/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java +++ b/core/src/test/java/org/springframework/security/access/vote/AffirmativeBasedTests.java @@ -38,7 +38,7 @@ import org.springframework.security.core.Authentication; * @author Ben Alex */ public class AffirmativeBasedTests { - private final List attrs = new ArrayList(); + private final List attrs = new ArrayList<>(); private final Authentication user = new TestingAuthenticationToken("somebody", "password", "ROLE_1", "ROLE_2"); private AffirmativeBased mgr; diff --git a/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java b/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java index 846f856b95..aca4248827 100644 --- a/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java +++ b/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java @@ -27,7 +27,6 @@ import org.junit.Test; import org.springframework.context.MessageSource; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.GrantedAuthority; /** * Tests {@link ProviderManager}. @@ -318,12 +317,12 @@ public class ProviderManagerTests { private TestingAuthenticationToken createAuthenticationToken() { return new TestingAuthenticationToken("name", "password", - new ArrayList(0)); + new ArrayList<>(0)); } private ProviderManager makeProviderManager() throws Exception { MockProvider provider1 = new MockProvider(); - List providers = new ArrayList(); + List providers = new ArrayList<>(); providers.add(provider1); return new ProviderManager(providers); diff --git a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java index d09ae5bba7..66c54c7b97 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/DaoAuthenticationProviderTests.java @@ -561,14 +561,14 @@ public class DaoAuthenticationProviderTests { int sampleSize = 100; - List userFoundTimes = new ArrayList(sampleSize); + List userFoundTimes = new ArrayList<>(sampleSize); for (int i = 0; i < sampleSize; i++) { long start = System.currentTimeMillis(); provider.authenticate(foundUser); userFoundTimes.add(System.currentTimeMillis() - start); } - List userNotFoundTimes = new ArrayList(sampleSize); + List userNotFoundTimes = new ArrayList<>(sampleSize); for (int i = 0; i < sampleSize; i++) { long start = System.currentTimeMillis(); try { diff --git a/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java b/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java index 7610101143..0a83c8c3f7 100644 --- a/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java +++ b/core/src/test/java/org/springframework/security/authentication/dao/MockUserCache.java @@ -26,7 +26,7 @@ import org.springframework.security.core.userdetails.UserCache; import org.springframework.security.core.userdetails.UserDetails; public class MockUserCache implements UserCache { - private Map cache = new HashMap(); + private Map cache = new HashMap<>(); public UserDetails getUserFromCache(String username) { return (User) cache.get(username); diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java b/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java index d3520ab375..9cd71b9923 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/SecurityContextLoginModuleTests.java @@ -16,7 +16,6 @@ package org.springframework.security.authentication.jaas; -import java.security.Principal; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -44,8 +43,8 @@ public class SecurityContextLoginModuleTests { // ================================================================================================ private SecurityContextLoginModule module = null; - private Subject subject = new Subject(false, new HashSet(), - new HashSet(), new HashSet()); + private Subject subject = new Subject(false, new HashSet<>(), + new HashSet<>(), new HashSet<>()); private UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken( "principal", "credentials"); @@ -127,7 +126,7 @@ public class SecurityContextLoginModuleTests { public void testNullAuthenticationInSecurityContextIgnored() throws Exception { this.module = new SecurityContextLoginModule(); - Map options = new HashMap(); + Map options = new HashMap<>(); options.put("ignoreMissingAuthentication", "true"); this.module.initialize(this.subject, null, null, options); diff --git a/core/src/test/java/org/springframework/security/authentication/jaas/TestAuthorityGranter.java b/core/src/test/java/org/springframework/security/authentication/jaas/TestAuthorityGranter.java index 3bf8cbd55f..d945498074 100644 --- a/core/src/test/java/org/springframework/security/authentication/jaas/TestAuthorityGranter.java +++ b/core/src/test/java/org/springframework/security/authentication/jaas/TestAuthorityGranter.java @@ -32,7 +32,7 @@ public class TestAuthorityGranter implements AuthorityGranter { // ======================================================================================================== public Set grant(Principal principal) { - Set rtnSet = new HashSet(); + Set rtnSet = new HashSet<>(); if (principal.getName().equals("TEST_PRINCIPAL")) { rtnSet.add("ROLE_TEST1"); diff --git a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java index 2d4e28d790..fa50247da0 100644 --- a/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java +++ b/core/src/test/java/org/springframework/security/authentication/rememberme/RememberMeAuthenticationTokenTests.java @@ -58,7 +58,7 @@ public class RememberMeAuthenticationTokenTests { } try { - List authsContainingNull = new ArrayList(); + List authsContainingNull = new ArrayList<>(); authsContainingNull.add(null); new RememberMeAuthenticationToken("key", "Test", authsContainingNull); fail("Should have thrown IllegalArgumentException"); diff --git a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java index 2a758d9b40..5b72cc501e 100644 --- a/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java +++ b/core/src/test/java/org/springframework/security/concurrent/DelegatingSecurityContextCallableTests.java @@ -78,29 +78,29 @@ public class DelegatingSecurityContextCallableTests { @Test(expected = IllegalArgumentException.class) public void constructorNullDelegate() { - new DelegatingSecurityContextCallable(null); + new DelegatingSecurityContextCallable<>(null); } @Test(expected = IllegalArgumentException.class) public void constructorNullDelegateNonNullSecurityContext() { - new DelegatingSecurityContextCallable(null, securityContext); + new DelegatingSecurityContextCallable<>(null, securityContext); } @Test(expected = IllegalArgumentException.class) public void constructorNullDelegateAndSecurityContext() { - new DelegatingSecurityContextCallable(null, null); + new DelegatingSecurityContextCallable<>(null, null); } @Test(expected = IllegalArgumentException.class) public void constructorNullSecurityContext() { - new DelegatingSecurityContextCallable(delegate, null); + new DelegatingSecurityContextCallable<>(delegate, null); } // --- call --- @Test public void call() throws Exception { - callable = new DelegatingSecurityContextCallable(delegate, + callable = new DelegatingSecurityContextCallable<>(delegate, securityContext); assertWrapped(callable); } @@ -108,7 +108,7 @@ public class DelegatingSecurityContextCallableTests { @Test public void callDefaultSecurityContext() throws Exception { SecurityContextHolder.setContext(securityContext); - callable = new DelegatingSecurityContextCallable(delegate); + callable = new DelegatingSecurityContextCallable<>(delegate); SecurityContextHolder.clearContext(); // ensure callable is what sets up the // SecurityContextHolder assertWrapped(callable); @@ -119,7 +119,7 @@ public class DelegatingSecurityContextCallableTests { public void callOnSameThread() throws Exception { originalSecurityContext = securityContext; SecurityContextHolder.setContext(originalSecurityContext); - callable = new DelegatingSecurityContextCallable(delegate, + callable = new DelegatingSecurityContextCallable<>(delegate, securityContext); assertWrapped(callable.call()); } @@ -156,7 +156,7 @@ public class DelegatingSecurityContextCallableTests { // SEC-2682 @Test public void toStringDelegates() { - callable = new DelegatingSecurityContextCallable(delegate, + callable = new DelegatingSecurityContextCallable<>(delegate, securityContext); assertThat(callable.toString()).isEqualTo(delegate.toString()); } diff --git a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java index e4665448e1..3477ed184b 100644 --- a/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java +++ b/core/src/test/java/org/springframework/security/core/authority/mapping/SimpleRoles2GrantedAuthoritiesMapperTests.java @@ -128,7 +128,7 @@ public class SimpleRoles2GrantedAuthoritiesMapperTests { String[] expectedGas) { List result = mapper .getGrantedAuthorities(Arrays.asList(roles)); - Collection resultColl = new ArrayList(result.size()); + Collection resultColl = new ArrayList<>(result.size()); for (int i = 0; i < result.size(); i++) { resultColl.add(result.get(i).getAuthority()); } diff --git a/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java b/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java index 2e255752aa..d0be6973c2 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/MockUserDetailsService.java @@ -30,7 +30,7 @@ import org.springframework.security.core.authority.AuthorityUtils; * @author Luke Taylor */ public class MockUserDetailsService implements UserDetailsService { - private Map users = new HashMap(); + private Map users = new HashMap<>(); private List auths = AuthorityUtils .createAuthorityList("ROLE_USER"); diff --git a/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java b/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java index f2026b09a8..c9a6df29ce 100644 --- a/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java +++ b/core/src/test/java/org/springframework/security/core/userdetails/UserTests.java @@ -56,7 +56,7 @@ public class UserTests { @Test public void hashLookupOnlyDependsOnUsername() throws Exception { User user1 = new User("rod", "koala", true, true, true, true, ROLE_12); - Set users = new HashSet(); + Set users = new HashSet<>(); users.add(user1); assertThat(users).contains(new User("rod", "koala", true, true, true, true, diff --git a/core/src/test/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixinTests.java b/core/src/test/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixinTests.java index 32d520abcf..5ed28285b7 100644 --- a/core/src/test/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixinTests.java +++ b/core/src/test/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixinTests.java @@ -26,7 +26,6 @@ import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.User; @@ -138,7 +137,7 @@ public class UsernamePasswordAuthenticationTokenMixinTests extends AbstractMixin NonUserPrincipal principal = new NonUserPrincipal(); principal.setUsername("admin"); UsernamePasswordAuthenticationToken token = - new UsernamePasswordAuthenticationToken(principal, null, new ArrayList()); + new UsernamePasswordAuthenticationToken(principal, null, new ArrayList<>()); String actualJson = mapper.writeValueAsString(token); JSONAssert.assertEquals(AUTHENTICATED_NON_USER_PRINCIPAL_JSON, actualJson, true); } diff --git a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java index 782486d0bb..72db6bbdad 100644 --- a/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java +++ b/core/src/test/java/org/springframework/security/provisioning/JdbcUserDetailsManagerTests.java @@ -359,7 +359,7 @@ public class JdbcUserDetailsManagerTests { } private class MockUserCache implements UserCache { - private Map cache = new HashMap(); + private Map cache = new HashMap<>(); public UserDetails getUserFromCache(String username) { return (User) cache.get(username); diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java index 81a09a1cc6..280b5f7f34 100644 --- a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java +++ b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java @@ -72,7 +72,7 @@ public class PythonInterpreterPreInvocationAdvice implements targetObject.getClass()); String[] paramNames = parameterNameDiscoverer.getParameterNames(method); - Map argMap = new HashMap(); + Map argMap = new HashMap<>(); for (int i = 0; i < args.length; i++) { argMap.put(paramNames[i], args[i]); } diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java index 60dde3ac93..320e9e0444 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/DefaultSpringSecurityContextSourceTests.java @@ -104,7 +104,7 @@ public class DefaultSpringSecurityContextSourceTests extends AbstractLdapIntegra @Test(expected = IllegalArgumentException.class) public void instantiationFailsWithEmptyServerList() throws Exception { - List serverUrls = new ArrayList(); + List serverUrls = new ArrayList<>(); DefaultSpringSecurityContextSource ctxSrc = new DefaultSpringSecurityContextSource( serverUrls, "dc=springframework,dc=org"); ctxSrc.afterPropertiesSet(); @@ -112,7 +112,7 @@ public class DefaultSpringSecurityContextSourceTests extends AbstractLdapIntegra @Test public void instantiationSuceedsWithProperServerList() throws Exception { - List serverUrls = new ArrayList(); + List serverUrls = new ArrayList<>(); serverUrls.add("ldap://foo:789"); serverUrls.add("ldap://bar:389"); serverUrls.add("ldaps://blah:636"); @@ -127,7 +127,7 @@ public class DefaultSpringSecurityContextSourceTests extends AbstractLdapIntegra @Test public void instantiationSuceedsWithEmtpyBaseDn() throws Exception { String baseDn = ""; - List serverUrls = new ArrayList(); + List serverUrls = new ArrayList<>(); serverUrls.add("ldap://foo:789"); serverUrls.add("ldap://bar:389"); serverUrls.add("ldaps://blah:636"); @@ -140,7 +140,7 @@ public class DefaultSpringSecurityContextSourceTests extends AbstractLdapIntegra @Test(expected = IllegalArgumentException.class) public void instantiationFailsWithIncorrectServerUrl() throws Exception { - List serverUrls = new ArrayList(); + List serverUrls = new ArrayList<>(); // a simple trailing slash should be ok serverUrls.add("ldaps://blah:636/"); // this url should be rejected because the root DN goes into a separate parameter diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java index 40eca85a2f..61aa972071 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/SpringSecurityLdapTemplateITests.java @@ -185,7 +185,7 @@ public class SpringSecurityLdapTemplateITests extends AbstractLdapIntegrationTes @Test public void nonSpringLdapSearchCodeTestMethod() throws Exception { - java.util.Hashtable env = new java.util.Hashtable(); + java.util.Hashtable env = new java.util.Hashtable<>(); env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); env.put(Context.PROVIDER_URL, "ldap://localhost:" + ApacheDSServerIntegrationTests.getServerPort()); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java index 59202e0973..3b5acdda2f 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/authentication/BindAuthenticatorTests.java @@ -114,7 +114,7 @@ public class BindAuthenticatorTests extends AbstractLdapIntegrationTests { /* * @Test public void messingWithEscapedChars() throws Exception { - * Hashtable env = new Hashtable(); + * Hashtable env = new Hashtable<>(); * env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); * env.put(Context.PROVIDER_URL, "ldap://127.0.0.1:22389/dc=springsource,dc=com"); * env.put(Context.SECURITY_AUTHENTICATION, "simple"); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/server/ApacheDSContainerTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/server/ApacheDSContainerTests.java index c52f54c8d7..6aab554193 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/server/ApacheDSContainerTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/server/ApacheDSContainerTests.java @@ -196,8 +196,8 @@ public class ApacheDSContainerTests { } private List getDefaultPorts(int count) throws IOException { - List connections = new ArrayList(); - List availablePorts = new ArrayList(count); + List connections = new ArrayList<>(); + List availablePorts = new ArrayList<>(count); try { for (int i = 0; i < count; i++) { ServerSocket socket = new ServerSocket(0); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/server/UnboundIdContainerTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/server/UnboundIdContainerTests.java index 9b0348bb96..7a5231d183 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/server/UnboundIdContainerTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/server/UnboundIdContainerTests.java @@ -46,8 +46,8 @@ public class UnboundIdContainerTests { } private List getDefaultPorts(int count) throws IOException { - List connections = new ArrayList(); - List availablePorts = new ArrayList(count); + List connections = new ArrayList<>(); + List availablePorts = new ArrayList<>(count); try { for (int i = 0; i < count; i++) { ServerSocket socket = new ServerSocket(0); diff --git a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java index e5473e0807..77d6ebf11f 100644 --- a/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java +++ b/ldap/src/integration-test/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulatorTests.java @@ -147,7 +147,7 @@ public class DefaultLdapAuthoritiesPopulatorTests extends AbstractLdapIntegratio @Override protected Set getAdditionalRoles(DirContextOperations user, String username) { - return new HashSet( + return new HashSet<>( AuthorityUtils.createAuthorityList("ROLE_EXTRA")); } }; diff --git a/ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java b/ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java index 2c2ab77966..fda58a003a 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java +++ b/ldap/src/main/java/org/springframework/security/ldap/DefaultSpringSecurityContextSource.java @@ -64,7 +64,7 @@ public class DefaultSpringSecurityContextSource extends LdapContextSource { StringTokenizer st = new StringTokenizer(providerUrl); - ArrayList urls = new ArrayList(); + ArrayList urls = new ArrayList<>(); // Work out rootDn from the first URL and check that the other URLs (if any) match while (st.hasMoreTokens()) { 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 98766e6564..8cb4a729de 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java +++ b/ldap/src/main/java/org/springframework/security/ldap/SpringSecurityLdapTemplate.java @@ -165,7 +165,7 @@ public class SpringSecurityLdapTemplate extends LdapTemplate { String[] attributeNames = new String[] { attributeName }; Set>> multipleAttributeValues = searchForMultipleAttributeValues( base, filter, params, attributeNames); - Set result = new HashSet(); + Set result = new HashSet<>(); for (Map> map : multipleAttributeValues) { List values = map.get(attributeName); if (values != null) { @@ -274,7 +274,7 @@ public class SpringSecurityLdapTemplate extends LdapTemplate { } return; } - List svalues = new ArrayList(); + List svalues = new ArrayList<>(); for (Object o : values) { if (o != null) { if (String.class.isAssignableFrom(o.getClass())) { @@ -338,7 +338,7 @@ public class SpringSecurityLdapTemplate extends LdapTemplate { + searchBaseDn + "', filter = '" + filter + "'"); } - Set results = new HashSet(); + Set results = new HashSet<>(); try { while (resultsEnum.hasMore()) { SearchResult searchResult = resultsEnum.next(); diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java index 91885265fa..499c173fcc 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/AbstractLdapAuthenticator.java @@ -102,7 +102,7 @@ public abstract class AbstractLdapAuthenticator implements LdapAuthenticator, return Collections.emptyList(); } - List userDns = new ArrayList(userDnFormat.length); + List userDns = new ArrayList<>(userDnFormat.length); String[] args = new String[] { LdapEncoder.nameEncode(username) }; synchronized (userDnFormat) { diff --git a/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java b/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java index 5599260c71..826896a146 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java +++ b/ldap/src/main/java/org/springframework/security/ldap/authentication/ad/ActiveDirectoryLdapAuthenticationProvider.java @@ -175,7 +175,7 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends logger.debug("'memberOf' attribute values: " + Arrays.asList(groups)); } - ArrayList authorities = new ArrayList( + ArrayList authorities = new ArrayList<>( groups.length); for (String group : groups) { @@ -190,7 +190,7 @@ public final class ActiveDirectoryLdapAuthenticationProvider extends // TODO. add DNS lookup based on domain final String bindUrl = url; - Hashtable env = new Hashtable(); + Hashtable env = new Hashtable<>(); env.put(Context.SECURITY_AUTHENTICATION, "simple"); String bindPrincipal = createBindPrincipal(username); env.put(Context.SECURITY_PRINCIPAL, bindPrincipal); diff --git a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java index 64d696ab36..0a1f38f65f 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java +++ b/ldap/src/main/java/org/springframework/security/ldap/server/ApacheDSContainer.java @@ -92,7 +92,7 @@ public class ApacheDSContainer implements InitializingBean, DisposableBean, Life public ApacheDSContainer(String root, String ldifs) throws Exception { this.ldifResources = ldifs; service = new DefaultDirectoryService(); - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(new NormalizationInterceptor()); list.add(new AuthenticationInterceptor()); diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java index 1acdedc826..e4f7cbf776 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/DefaultLdapAuthoritiesPopulator.java @@ -219,7 +219,7 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator roles.add(this.defaultRole); } - List result = new ArrayList(roles.size()); + List result = new ArrayList<>(roles.size()); result.addAll(roles); return result; @@ -227,10 +227,10 @@ public class DefaultLdapAuthoritiesPopulator implements LdapAuthoritiesPopulator public Set getGroupMembershipRoles(String userDn, String username) { if (getGroupSearchBase() == null) { - return new HashSet(); + return new HashSet<>(); } - Set authorities = new HashSet(); + Set authorities = new HashSet<>(); if (logger.isDebugEnabled()) { logger.debug("Searching for roles for user '" + username + "', DN = " + "'" diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java index 065e0d19a6..3e22a542f6 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsImpl.java @@ -186,7 +186,7 @@ public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData */ public static class Essence { protected LdapUserDetailsImpl instance = createTarget(); - private List mutableAuthorities = new ArrayList(); + private List mutableAuthorities = new ArrayList<>(); public Essence() { } @@ -257,7 +257,7 @@ public class LdapUserDetailsImpl implements LdapUserDetails, PasswordPolicyData } public void setAuthorities(Collection authorities) { - mutableAuthorities = new ArrayList(); + mutableAuthorities = new ArrayList<>(); mutableAuthorities.addAll(authorities); } diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java index def2b2bacc..d0b6758e0a 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/LdapUserDetailsManager.java @@ -274,7 +274,7 @@ public class LdapUserDetailsManager implements UserDetailsManager { copyToContext(user, ctx); // Remove the objectclass attribute from the list of mods (if present). - List mods = new LinkedList(Arrays.asList(ctx + List mods = new LinkedList<>(Arrays.asList(ctx .getModificationItems())); ListIterator modIt = mods.listIterator(); diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulator.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulator.java index 4f3859527b..847f76511b 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulator.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/NestedLdapAuthoritiesPopulator.java @@ -151,10 +151,10 @@ public class NestedLdapAuthoritiesPopulator extends DefaultLdapAuthoritiesPopula @Override public Set getGroupMembershipRoles(String userDn, String username) { if (getGroupSearchBase() == null) { - return new HashSet(); + return new HashSet<>(); } - Set authorities = new HashSet(); + Set authorities = new HashSet<>(); performNestedSearch(userDn, username, authorities, getMaxSearchDepth()); @@ -190,7 +190,7 @@ public class NestedLdapAuthoritiesPopulator extends DefaultLdapAuthoritiesPopula } if (getAttributeNames() == null) { - setAttributeNames(new HashSet()); + setAttributeNames(new HashSet<>()); } if (StringUtils.hasText(getGroupRoleAttribute()) && !getAttributeNames().contains(getGroupRoleAttribute())) { @@ -211,7 +211,7 @@ public class NestedLdapAuthoritiesPopulator extends DefaultLdapAuthoritiesPopula boolean circular = false; String dn = record.get(SpringSecurityLdapTemplate.DN_KEY).get(0); List roleValues = record.get(getGroupRoleAttribute()); - Set roles = new HashSet(); + Set roles = new HashSet<>(); if (roleValues != null) { roles.addAll(roleValues); } diff --git a/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java b/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java index 44ddf8c04a..6f27921b8c 100644 --- a/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java +++ b/ldap/src/main/java/org/springframework/security/ldap/userdetails/Person.java @@ -42,7 +42,7 @@ public class Person extends LdapUserDetailsImpl { private String sn; private String description; private String telephoneNumber; - private List cn = new ArrayList(); + private List cn = new ArrayList<>(); protected Person() { } @@ -106,7 +106,7 @@ public class Person extends LdapUserDetailsImpl { setSn(copyMe.sn); setDescription(copyMe.getDescription()); setTelephoneNumber(copyMe.getTelephoneNumber()); - ((Person) instance).cn = new ArrayList(copyMe.cn); + ((Person) instance).cn = new ArrayList<>(copyMe.cn); } protected LdapUserDetailsImpl createTarget() { 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 ffd92f711e..2290a76fc7 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 @@ -230,7 +230,7 @@ public class ActiveDirectoryLdapAuthenticationProviderTests { when( ctx.search(any(Name.class), any(String.class), any(Object[].class), any(SearchControls.class))).thenReturn( - new EmptyEnumeration()); + new EmptyEnumeration<>()); provider.contextFactory = createContextFactoryReturning(ctx); diff --git a/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java b/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java index 004d522deb..b4edcd19e0 100644 --- a/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java +++ b/ldap/src/test/java/org/springframework/security/ldap/userdetails/InetOrgPersonTests.java @@ -43,7 +43,7 @@ public class InetOrgPersonTests { InetOrgPerson p = (InetOrgPerson) essence.createUserDetails(); essence = new InetOrgPerson.Essence(createUserContext()); InetOrgPerson p2 = (InetOrgPerson) essence.createUserDetails(); - Set set = new HashSet(); + Set set = new HashSet<>(); set.add(p); assertThat(set.contains(p2)).isTrue(); } 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 ca56134578..67c6f32315 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 @@ -68,7 +68,7 @@ public final class ExpressionBasedMessageSecurityMetadataSourceFactory { */ public static MessageSecurityMetadataSource createExpressionMessageMetadataSource( LinkedHashMap, String> matcherToExpression) { - return createExpressionMessageMetadataSource(matcherToExpression, new DefaultMessageSecurityExpressionHandler()); + return createExpressionMessageMetadataSource(matcherToExpression, new DefaultMessageSecurityExpressionHandler<>()); } /** @@ -121,4 +121,4 @@ public final class ExpressionBasedMessageSecurityMetadataSourceFactory { private ExpressionBasedMessageSecurityMetadataSourceFactory() { } -} \ No newline at end of file +} diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java index 16307327e0..1d03af6b88 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/expression/MessageExpressionVoter.java @@ -37,7 +37,7 @@ import java.util.Collection; * @author Rob Winch */ public class MessageExpressionVoter implements AccessDecisionVoter> { - private SecurityExpressionHandler> expressionHandler = new DefaultMessageSecurityExpressionHandler(); + private SecurityExpressionHandler> expressionHandler = new DefaultMessageSecurityExpressionHandler<>(); public int vote(Authentication authentication, Message message, Collection attributes) { diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java index 214960f61d..6c4627d7ee 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/ChannelSecurityInterceptor.java @@ -38,7 +38,7 @@ import org.springframework.util.Assert; */ public final class ChannelSecurityInterceptor extends AbstractSecurityInterceptor implements ChannelInterceptor { - private static final ThreadLocal tokenHolder = new ThreadLocal(); + private static final ThreadLocal tokenHolder = new ThreadLocal<>(); private final MessageSecurityMetadataSource metadataSource; diff --git a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java index 394c90d06c..e10b37e47e 100644 --- a/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java +++ b/messaging/src/main/java/org/springframework/security/messaging/access/intercept/DefaultMessageSecurityMetadataSource.java @@ -60,7 +60,7 @@ public final class DefaultMessageSecurityMetadataSource implements } public Collection getAllConfigAttributes() { - Set allAttributes = new HashSet(); + Set allAttributes = new HashSet<>(); for (Collection entry : messageMap.values()) { allAttributes.addAll(entry); 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 6ca94176b4..cf01238880 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 @@ -115,7 +115,7 @@ public final class SecurityContextChannelInterceptor extends ChannelInterceptorA Stack contextStack = ORIGINAL_CONTEXT.get(); if (contextStack == null) { - contextStack = new Stack(); + contextStack = new Stack<>(); ORIGINAL_CONTEXT.set(contextStack); } contextStack.push(currentContext); diff --git a/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java b/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java index 7947fa66e3..acb07a2673 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/access/expression/DefaultMessageSecurityExpressionHandlerTests.java @@ -51,9 +51,9 @@ public class DefaultMessageSecurityExpressionHandlerTests { @Before public void setup() { - handler = new DefaultMessageSecurityExpressionHandler(); + handler = new DefaultMessageSecurityExpressionHandler<>(); - message = new GenericMessage(""); + message = new GenericMessage<>(""); authentication = new AnonymousAuthenticationToken("key", "anonymous", AuthorityUtils.createAuthorityList("ROLE_ANONYMOUS")); } diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java index 5bafcda5f1..7e58d5979f 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/AndMessageMatcherTest.java @@ -43,39 +43,39 @@ public class AndMessageMatcherTest { @Test(expected = NullPointerException.class) public void constructorNullArray() { - new AndMessageMatcher((MessageMatcher[]) null); + new AndMessageMatcher<>((MessageMatcher[]) null); } @Test(expected = IllegalArgumentException.class) public void constructorArrayContainsNull() { - new AndMessageMatcher((MessageMatcher) null); + new AndMessageMatcher<>((MessageMatcher) null); } @SuppressWarnings("unchecked") @Test(expected = IllegalArgumentException.class) public void constructorEmptyArray() { - new AndMessageMatcher((MessageMatcher[]) new MessageMatcher[0]); + new AndMessageMatcher<>((MessageMatcher[]) new MessageMatcher[0]); } @Test(expected = IllegalArgumentException.class) public void constructorNullList() { - new AndMessageMatcher((List>) null); + new AndMessageMatcher<>((List>) null); } @Test(expected = IllegalArgumentException.class) public void constructorListContainsNull() { - new AndMessageMatcher(Arrays.asList((MessageMatcher) null)); + new AndMessageMatcher<>(Arrays.asList((MessageMatcher) null)); } @Test(expected = IllegalArgumentException.class) public void constructorEmptyList() { - new AndMessageMatcher(Collections.> emptyList()); + new AndMessageMatcher<>(Collections.emptyList()); } @Test public void matchesSingleTrue() { when(delegate.matches(message)).thenReturn(true); - matcher = new AndMessageMatcher(delegate); + matcher = new AndMessageMatcher<>(delegate); assertThat(matcher.matches(message)).isTrue(); } @@ -84,7 +84,7 @@ public class AndMessageMatcherTest { public void matchesMultiTrue() { when(delegate.matches(message)).thenReturn(true); when(delegate2.matches(message)).thenReturn(true); - matcher = new AndMessageMatcher(delegate, delegate2); + matcher = new AndMessageMatcher<>(delegate, delegate2); assertThat(matcher.matches(message)).isTrue(); } @@ -92,7 +92,7 @@ public class AndMessageMatcherTest { @Test public void matchesSingleFalse() { when(delegate.matches(message)).thenReturn(false); - matcher = new AndMessageMatcher(delegate); + matcher = new AndMessageMatcher<>(delegate); assertThat(matcher.matches(message)).isFalse(); } @@ -100,7 +100,7 @@ public class AndMessageMatcherTest { @Test public void matchesMultiBothFalse() { when(delegate.matches(message)).thenReturn(false); - matcher = new AndMessageMatcher(delegate, delegate2); + matcher = new AndMessageMatcher<>(delegate, delegate2); assertThat(matcher.matches(message)).isFalse(); } @@ -109,7 +109,7 @@ public class AndMessageMatcherTest { public void matchesMultiSingleFalse() { when(delegate.matches(message)).thenReturn(true); when(delegate2.matches(message)).thenReturn(false); - matcher = new AndMessageMatcher(delegate, delegate2); + matcher = new AndMessageMatcher<>(delegate, delegate2); assertThat(matcher.matches(message)).isFalse(); } diff --git a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java index 94873e4610..bd914d05ab 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java +++ b/messaging/src/test/java/org/springframework/security/messaging/util/matcher/OrMessageMatcherTest.java @@ -43,39 +43,39 @@ public class OrMessageMatcherTest { @Test(expected = NullPointerException.class) public void constructorNullArray() { - new OrMessageMatcher((MessageMatcher[]) null); + new OrMessageMatcher<>((MessageMatcher[]) null); } @Test(expected = IllegalArgumentException.class) public void constructorArrayContainsNull() { - new OrMessageMatcher((MessageMatcher) null); + new OrMessageMatcher<>((MessageMatcher) null); } @SuppressWarnings("unchecked") @Test(expected = IllegalArgumentException.class) public void constructorEmptyArray() { - new OrMessageMatcher((MessageMatcher[]) new MessageMatcher[0]); + new OrMessageMatcher<>((MessageMatcher[]) new MessageMatcher[0]); } @Test(expected = IllegalArgumentException.class) public void constructorNullList() { - new OrMessageMatcher((List>) null); + new OrMessageMatcher<>((List>) null); } @Test(expected = IllegalArgumentException.class) public void constructorListContainsNull() { - new OrMessageMatcher(Arrays.asList((MessageMatcher) null)); + new OrMessageMatcher<>(Arrays.asList((MessageMatcher) null)); } @Test(expected = IllegalArgumentException.class) public void constructorEmptyList() { - new OrMessageMatcher(Collections.> emptyList()); + new OrMessageMatcher<>(Collections.emptyList()); } @Test public void matchesSingleTrue() { when(delegate.matches(message)).thenReturn(true); - matcher = new OrMessageMatcher(delegate); + matcher = new OrMessageMatcher<>(delegate); assertThat(matcher.matches(message)).isTrue(); } @@ -83,7 +83,7 @@ public class OrMessageMatcherTest { @Test public void matchesMultiTrue() { when(delegate.matches(message)).thenReturn(true); - matcher = new OrMessageMatcher(delegate, delegate2); + matcher = new OrMessageMatcher<>(delegate, delegate2); assertThat(matcher.matches(message)).isTrue(); } @@ -91,7 +91,7 @@ public class OrMessageMatcherTest { @Test public void matchesSingleFalse() { when(delegate.matches(message)).thenReturn(false); - matcher = new OrMessageMatcher(delegate); + matcher = new OrMessageMatcher<>(delegate); assertThat(matcher.matches(message)).isFalse(); } @@ -100,7 +100,7 @@ public class OrMessageMatcherTest { public void matchesMultiBothFalse() { when(delegate.matches(message)).thenReturn(false); when(delegate2.matches(message)).thenReturn(false); - matcher = new OrMessageMatcher(delegate, delegate2); + matcher = new OrMessageMatcher<>(delegate, delegate2); assertThat(matcher.matches(message)).isFalse(); } @@ -108,7 +108,7 @@ public class OrMessageMatcherTest { @Test public void matchesMultiSingleFalse() { when(delegate.matches(message)).thenReturn(true); - matcher = new OrMessageMatcher(delegate, delegate2); + matcher = new OrMessageMatcher<>(delegate, delegate2); assertThat(matcher.matches(message)).isTrue(); } diff --git a/messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java index f850b9d765..70ce804680 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/web/csrf/CsrfChannelInterceptorTests.java @@ -51,7 +51,7 @@ public class CsrfChannelInterceptorTests { messageHeaders = SimpMessageHeaderAccessor.create(SimpMessageType.CONNECT); messageHeaders.setNativeHeader(token.getHeaderName(), token.getToken()); - messageHeaders.setSessionAttributes(new HashMap()); + messageHeaders.setSessionAttributes(new HashMap<>()); messageHeaders.getSessionAttributes().put(CsrfToken.class.getName(), token); } diff --git a/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java b/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java index ed857bc4cf..9738bde439 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java +++ b/messaging/src/test/java/org/springframework/security/messaging/web/socket/server/CsrfTokenHandshakeInterceptorTests.java @@ -55,7 +55,7 @@ public class CsrfTokenHandshakeInterceptorTests { @Before public void setup() { httpRequest = new MockHttpServletRequest(); - attributes = new HashMap(); + attributes = new HashMap<>(); request = new ServletServerHttpRequest(httpRequest); interceptor = new CsrfTokenHandshakeInterceptor(); diff --git a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java index 55d605dcca..4011c0c5ab 100644 --- a/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java +++ b/oauth2/oauth2-jose/src/main/java/org/springframework/security/oauth2/jwt/NimbusJwtDecoderJwkSupport.java @@ -76,7 +76,7 @@ public final class NimbusJwtDecoderJwkSupport implements JwtDecoder { ResourceRetriever jwkSetRetriever = new DefaultResourceRetriever(30000, 30000); JWKSource jwkSource = new RemoteJWKSet(this.jwkSetUrl, jwkSetRetriever); JWSKeySelector jwsKeySelector = - new JWSVerificationKeySelector(this.jwsAlgorithm, jwkSource); + new JWSVerificationKeySelector<>(this.jwsAlgorithm, jwkSource); this.jwtProcessor = new DefaultJWTProcessor<>(); this.jwtProcessor.setJWSKeySelector(jwsKeySelector); diff --git a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java index 7588106a8f..3503e2c197 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenID4JavaConsumer.java @@ -208,7 +208,7 @@ public class OpenID4JavaConsumer implements OpenIDConsumer { MessageExtension ext = authSuccess.getExtension(AxMessage.OPENID_NS_AX); if (ext instanceof FetchResponse) { FetchResponse fetchResp = (FetchResponse) ext; - attributes = new ArrayList(attributesToFetch.size()); + attributes = new ArrayList<>(attributesToFetch.size()); for (OpenIDAttribute attr : attributesToFetch) { List values = fetchResp.getAttributeValues(attr.getName()); diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java index 00f96594ea..5d10312d10 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationFilter.java @@ -104,7 +104,7 @@ public class OpenIDAuthenticationFilter extends AbstractAuthenticationProcessing if (returnToUrlParameters.isEmpty() && getRememberMeServices() instanceof AbstractRememberMeServices) { - returnToUrlParameters = new HashSet(); + returnToUrlParameters = new HashSet<>(); returnToUrlParameters .add(((AbstractRememberMeServices) getRememberMeServices()) .getParameter()); diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java index 294aa3a743..c77119b32b 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationProvider.java @@ -136,7 +136,7 @@ public class OpenIDAuthenticationProvider * Used to load the {@code UserDetails} for the authenticated OpenID user. */ public void setUserDetailsService(UserDetailsService userDetailsService) { - this.userDetailsService = new UserDetailsByNameServiceWrapper( + this.userDetailsService = new UserDetailsByNameServiceWrapper<>( userDetailsService); } diff --git a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java index 6f4cadef75..6c08d23c3d 100644 --- a/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java +++ b/openid/src/main/java/org/springframework/security/openid/OpenIDAuthenticationToken.java @@ -46,7 +46,7 @@ public class OpenIDAuthenticationToken extends AbstractAuthenticationToken { public OpenIDAuthenticationToken(OpenIDAuthenticationStatus status, String identityUrl, String message, List attributes) { - super(new ArrayList(0)); + super(new ArrayList<>(0)); this.principal = identityUrl; this.status = status; this.identityUrl = identityUrl; diff --git a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java index f952dd476e..fefb628c3b 100644 --- a/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java +++ b/openid/src/test/java/org/springframework/security/openid/OpenIDAuthenticationProviderTests.java @@ -104,7 +104,7 @@ public class OpenIDAuthenticationProviderTests { public void testAuthenticateFailure() { OpenIDAuthenticationProvider provider = new OpenIDAuthenticationProvider(); provider.setAuthenticationUserDetailsService( - new UserDetailsByNameServiceWrapper( + new UserDetailsByNameServiceWrapper<>( new MockUserDetailsService())); Authentication preAuth = new OpenIDAuthenticationToken( diff --git a/remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java b/remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java index d90f7a5929..8541fe66fb 100644 --- a/remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java +++ b/remoting/src/main/java/org/springframework/security/remoting/dns/JndiDnsResolver.java @@ -172,7 +172,7 @@ public class JndiDnsResolver implements DnsResolver { private static class DefaultInitialContextFactory implements InitialContextFactory { public DirContext getCtx() { - Hashtable env = new Hashtable(); + Hashtable env = new Hashtable<>(); env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.dns.DnsContextFactory"); env.put(Context.PROVIDER_URL, "dns:"); // This is needed for IBM JDK/JRE diff --git a/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java b/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java index 2e68c3c0b8..197ca56bb1 100644 --- a/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java +++ b/remoting/src/test/java/org/springframework/security/remoting/httpinvoker/AuthenticationSimpleHttpInvokerRequestExecutorTests.java @@ -103,7 +103,7 @@ public class AuthenticationSimpleHttpInvokerRequestExecutorTests { private class MockHttpURLConnection extends HttpURLConnection { - private Map requestProperties = new HashMap(); + private Map requestProperties = new HashMap<>(); public MockHttpURLConnection(URL u) { super(u); diff --git a/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java b/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java index 1f2be6963c..c1e8657a36 100644 --- a/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java +++ b/samples/javaconfig/hellojs/src/main/java/org/springframework/security/samples/mvc/MessageJsonController.java @@ -48,7 +48,7 @@ public class MessageJsonController { @RequestMapping public ResponseEntity> list() { Iterable messages = messageRepository.findAll(); - return new ResponseEntity>(messages, HttpStatus.OK); + return new ResponseEntity<>(messages, HttpStatus.OK); } @RequestMapping("{id}") @@ -61,13 +61,13 @@ public class MessageJsonController { public ResponseEntity create(@Valid @RequestBody Message message, BindingResult result, RedirectAttributes redirect) { if (result.hasErrors()) { - List errors = new ArrayList(result.getErrorCount()); + List errors = new ArrayList<>(result.getErrorCount()); for (ObjectError r : result.getAllErrors()) { errors.add(r.getDefaultMessage()); } - return new ResponseEntity>(errors, HttpStatus.BAD_REQUEST); + return new ResponseEntity<>(errors, HttpStatus.BAD_REQUEST); } message = messageRepository.save(message); - return new ResponseEntity(message, HttpStatus.OK); + return new ResponseEntity<>(message, HttpStatus.OK); } } diff --git a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java index 448ab513e2..343bd1688c 100644 --- a/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java +++ b/samples/javaconfig/messages/src/main/java/org/springframework/security/samples/mvc/config/WebMvcConfiguration.java @@ -82,6 +82,6 @@ public class WebMvcConfiguration implements WebMvcConfigurer { @Bean public DomainClassConverter domainClassConverter() { - return new DomainClassConverter(mvcConversionService); + return new DomainClassConverter<>(mvcConversionService); } } diff --git a/samples/xml/contacts/src/main/java/sample/contact/AdminPermissionController.java b/samples/xml/contacts/src/main/java/sample/contact/AdminPermissionController.java index 2ee284682b..9fbeabb0cd 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/AdminPermissionController.java +++ b/samples/xml/contacts/src/main/java/sample/contact/AdminPermissionController.java @@ -71,7 +71,7 @@ public final class AdminPermissionController implements MessageSourceAware { Contact contact = contactManager.getById(Long.valueOf(contactId)); Acl acl = aclService.readAclById(new ObjectIdentityImpl(contact)); - Map model = new HashMap(); + Map model = new HashMap<>(); model.put("contact", contact); model.put("acl", acl); @@ -89,7 +89,7 @@ public final class AdminPermissionController implements MessageSourceAware { AddPermission addPermission = new AddPermission(); addPermission.setContact(contact); - Map model = new HashMap(); + Map model = new HashMap<>(); model.put("addPermission", addPermission); model.put("recipients", listRecipients()); model.put("permissions", listPermissions()); @@ -151,7 +151,7 @@ public final class AdminPermissionController implements MessageSourceAware { contactManager.deletePermission(contact, sidObject, permission); - Map model = new HashMap(); + Map model = new HashMap<>(); model.put("contact", contact); model.put("sid", sidObject); model.put("permission", permission); @@ -160,7 +160,7 @@ public final class AdminPermissionController implements MessageSourceAware { } private Map listPermissions() { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); map.put(Integer.valueOf(BasePermission.ADMINISTRATION.getMask()), messages.getMessage("select.administer", "Administer")); map.put(Integer.valueOf(BasePermission.READ.getMask()), @@ -172,7 +172,7 @@ public final class AdminPermissionController implements MessageSourceAware { } private Map listRecipients() { - Map map = new LinkedHashMap(); + Map map = new LinkedHashMap<>(); map.put("", messages.getMessage("select.pleaseSelect", "-- please select --")); for (String recipient : contactManager.getAllRecipients()) { diff --git a/samples/xml/contacts/src/main/java/sample/contact/IndexController.java b/samples/xml/contacts/src/main/java/sample/contact/IndexController.java index 44cbc3d018..5d6bd196f7 100644 --- a/samples/xml/contacts/src/main/java/sample/contact/IndexController.java +++ b/samples/xml/contacts/src/main/java/sample/contact/IndexController.java @@ -84,9 +84,9 @@ public class IndexController { @RequestMapping(value = "/secure/index.htm", method = RequestMethod.GET) public ModelAndView displayUserContacts() { List myContactsList = contactManager.getAll(); - Map hasDelete = new HashMap( + Map hasDelete = new HashMap<>( myContactsList.size()); - Map hasAdmin = new HashMap( + Map hasAdmin = new HashMap<>( myContactsList.size()); Authentication user = SecurityContextHolder.getContext().getAuthentication(); @@ -98,7 +98,7 @@ public class IndexController { contact, HAS_ADMIN))); } - Map model = new HashMap(); + Map model = new HashMap<>(); model.put("contacts", myContactsList); model.put("hasDeletePermission", hasDelete); model.put("hasAdminPermission", hasAdmin); diff --git a/samples/xml/dms/src/main/java/sample/dms/AbstractElement.java b/samples/xml/dms/src/main/java/sample/dms/AbstractElement.java index 2d457a9896..b583c726f4 100755 --- a/samples/xml/dms/src/main/java/sample/dms/AbstractElement.java +++ b/samples/xml/dms/src/main/java/sample/dms/AbstractElement.java @@ -79,7 +79,7 @@ public abstract class AbstractElement { * @return the fully-qualified name of this element, including any parents */ public String getFullName() { - List strings = new ArrayList(); + List strings = new ArrayList<>(); AbstractElement currentElement = this; while (currentElement != null) { strings.add(0, currentElement.getName()); diff --git a/samples/xml/gae/src/main/java/samples/gae/security/GaeUserAuthentication.java b/samples/xml/gae/src/main/java/samples/gae/security/GaeUserAuthentication.java index 8384cb7020..25df67c9bf 100644 --- a/samples/xml/gae/src/main/java/samples/gae/security/GaeUserAuthentication.java +++ b/samples/xml/gae/src/main/java/samples/gae/security/GaeUserAuthentication.java @@ -39,7 +39,7 @@ public class GaeUserAuthentication implements Authentication { } public Collection getAuthorities() { - return new HashSet(principal.getAuthorities()); + return new HashSet<>(principal.getAuthorities()); } public Object getCredentials() { diff --git a/samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java b/samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java index 613d7ce838..8ad010bad0 100644 --- a/samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java +++ b/samples/xml/gae/src/main/java/samples/gae/users/InMemoryUserRegistry.java @@ -30,7 +30,7 @@ public class InMemoryUserRegistry implements UserRegistry { private final Logger logger = LoggerFactory.getLogger(getClass()); private final Map users = Collections - .synchronizedMap(new HashMap()); + .synchronizedMap(new HashMap<>()); public GaeUser findUser(String userId) { return users.get(userId); diff --git a/samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java b/samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java index 4ee2f29c73..c68eb5ebe9 100644 --- a/samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java +++ b/samples/xml/openid/src/main/java/org/springframework/security/samples/openid/CustomUserDetailsService.java @@ -38,7 +38,7 @@ import org.springframework.security.openid.OpenIDAuthenticationToken; public class CustomUserDetailsService implements UserDetailsService, AuthenticationUserDetailsService { - private final Map registeredUsers = new HashMap(); + private final Map registeredUsers = new HashMap<>(); private static final List DEFAULT_AUTHORITIES = AuthorityUtils .createAuthorityList("ROLE_USER"); diff --git a/samples/xml/tutorial/src/main/java/bigbank/BankDaoStub.java b/samples/xml/tutorial/src/main/java/bigbank/BankDaoStub.java index 81c289aa97..dec86f2ea7 100644 --- a/samples/xml/tutorial/src/main/java/bigbank/BankDaoStub.java +++ b/samples/xml/tutorial/src/main/java/bigbank/BankDaoStub.java @@ -20,7 +20,7 @@ import java.util.Map; public class BankDaoStub implements BankDao { private long id = 0; - private final Map accounts = new HashMap(); + private final Map accounts = new HashMap<>(); public void createOrUpdateAccount(Account account) { if (account.getId() == -1) { diff --git a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java index 8750191c30..632549df5b 100644 --- a/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java +++ b/taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java @@ -109,7 +109,7 @@ public class AccessControlListTag extends TagSupport { private List parseHasPermission(String hasPermission) { String[] requiredPermissions = hasPermission.split(","); - List parsedPermissions = new ArrayList(requiredPermissions.length); + List parsedPermissions = new ArrayList<>(requiredPermissions.length); for (String permissionToParse : requiredPermissions) { Object parsedPermission = permissionToParse; try { diff --git a/test/src/main/java/org/springframework/security/test/context/TestSecurityContextHolder.java b/test/src/main/java/org/springframework/security/test/context/TestSecurityContextHolder.java index df4ab00306..03c4b43b6a 100644 --- a/test/src/main/java/org/springframework/security/test/context/TestSecurityContextHolder.java +++ b/test/src/main/java/org/springframework/security/test/context/TestSecurityContextHolder.java @@ -56,7 +56,7 @@ import org.springframework.util.Assert; */ public final class TestSecurityContextHolder { - private static final ThreadLocal contextHolder = new ThreadLocal(); + private static final ThreadLocal contextHolder = new ThreadLocal<>(); /** * Clears the {@link SecurityContext} from {@link TestSecurityContextHolder} and diff --git a/test/src/main/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactory.java b/test/src/main/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactory.java index 9ac88da90d..857e922324 100644 --- a/test/src/main/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactory.java +++ b/test/src/main/java/org/springframework/security/test/context/support/WithMockUserSecurityContextFactory.java @@ -46,7 +46,7 @@ final class WithMockUserSecurityContextFactory implements + " cannot have null username on both username and value properites"); } - List grantedAuthorities = new ArrayList(); + List grantedAuthorities = new ArrayList<>(); for (String authority : withUser.authorities()) { grantedAuthorities.add(new SimpleGrantedAuthority(authority)); } @@ -71,4 +71,4 @@ final class WithMockUserSecurityContextFactory implements context.setAuthentication(authentication); return context; } -} \ No newline at end of file +} diff --git a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java index 5c52a56dda..78d9206daa 100644 --- a/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java +++ b/test/src/main/java/org/springframework/security/test/web/servlet/request/SecurityMockMvcRequestPostProcessors.java @@ -796,7 +796,7 @@ public final class SecurityMockMvcRequestPostProcessors { * @return the UserRequestPostProcessor for further customizations */ public UserRequestPostProcessor roles(String... roles) { - List authorities = new ArrayList( + List authorities = new ArrayList<>( roles.length); for (String role : roles) { if (role.startsWith(ROLE_PREFIX)) { diff --git a/test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java b/test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java index 810c577029..d7d422feb0 100644 --- a/test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java +++ b/test/src/main/java/org/springframework/security/test/web/servlet/response/SecurityMockMvcResultMatchers.java @@ -213,7 +213,7 @@ public final class SecurityMockMvcResultMatchers { * @return the {@link AuthenticatedMatcher} for further customization */ public AuthenticatedMatcher withRoles(String... roles) { - Collection authorities = new ArrayList(); + Collection authorities = new ArrayList<>(); for (String role : roles) { authorities.add(new SimpleGrantedAuthority("ROLE_" + role)); } @@ -251,4 +251,4 @@ public final class SecurityMockMvcResultMatchers { private SecurityMockMvcResultMatchers() { } -} \ No newline at end of file +} diff --git a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java index 54ff04cee6..051b57dbad 100644 --- a/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java +++ b/test/src/test/java/org/springframework/security/test/context/support/WithSecurityContextTestExcecutionListenerTests.java @@ -114,7 +114,7 @@ public class WithSecurityContextTestExcecutionListenerTests { AbstractTestExecutionListener otherListener = new AbstractTestExecutionListener() { }; - List listeners = new ArrayList(); + List listeners = new ArrayList<>(); listeners.add(otherListener); listeners.add(this.listener); diff --git a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java index 1aa3541ba3..92a807948c 100644 --- a/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java +++ b/test/src/test/java/org/springframework/security/test/web/servlet/response/SecurityMockWithAuthoritiesMvcResultMatchersTests.java @@ -62,7 +62,7 @@ public class SecurityMockWithAuthoritiesMvcResultMatchersTests { @Test public void withAuthoritiesNotOrderSensitive() throws Exception { - List grantedAuthorities = new ArrayList(); + List grantedAuthorities = new ArrayList<>(); grantedAuthorities.add(new SimpleGrantedAuthority("ROLE_ADMIN")); grantedAuthorities.add(new SimpleGrantedAuthority("ROLE_SELLER")); mockMvc.perform(formLogin()) @@ -71,7 +71,7 @@ public class SecurityMockWithAuthoritiesMvcResultMatchersTests { @Test(expected = AssertionError.class) public void withAuthoritiesFailsIfNotAllRoles() throws Exception { - List grantedAuthorities = new ArrayList(); + List grantedAuthorities = new ArrayList<>(); grantedAuthorities.add(new SimpleGrantedAuthority("ROLE_ADMIN")); mockMvc.perform(formLogin()).andExpect(authenticated().withAuthorities(grantedAuthorities)); } diff --git a/web/src/main/java/org/springframework/security/web/DefaultSecurityFilterChain.java b/web/src/main/java/org/springframework/security/web/DefaultSecurityFilterChain.java index 08a3b47631..f10325085f 100644 --- a/web/src/main/java/org/springframework/security/web/DefaultSecurityFilterChain.java +++ b/web/src/main/java/org/springframework/security/web/DefaultSecurityFilterChain.java @@ -42,7 +42,7 @@ public final class DefaultSecurityFilterChain implements SecurityFilterChain { public DefaultSecurityFilterChain(RequestMatcher requestMatcher, List filters) { logger.info("Creating filter chain: " + requestMatcher + ", " + filters); this.requestMatcher = requestMatcher; - this.filters = new ArrayList(filters); + this.filters = new ArrayList<>(filters); } public RequestMatcher getRequestMatcher() { diff --git a/web/src/main/java/org/springframework/security/web/PortMapperImpl.java b/web/src/main/java/org/springframework/security/web/PortMapperImpl.java index 2bfaf3d8e3..7950d88fda 100644 --- a/web/src/main/java/org/springframework/security/web/PortMapperImpl.java +++ b/web/src/main/java/org/springframework/security/web/PortMapperImpl.java @@ -41,7 +41,7 @@ public class PortMapperImpl implements PortMapper { // =================================================================================================== public PortMapperImpl() { - this.httpsPortMappings = new HashMap(); + this.httpsPortMappings = new HashMap<>(); this.httpsPortMappings.put(Integer.valueOf(80), Integer.valueOf(443)); this.httpsPortMappings.put(Integer.valueOf(8080), Integer.valueOf(8443)); } diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java index 7bea5b2651..de7963571b 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelDecisionManagerImpl.java @@ -88,7 +88,7 @@ public class ChannelDecisionManagerImpl implements ChannelDecisionManager, @SuppressWarnings("cast") public void setChannelProcessors(List newList) { Assert.notEmpty(newList, "A list of ChannelProcessors is required"); - channelProcessors = new ArrayList(newList.size()); + channelProcessors = new ArrayList<>(newList.size()); for (Object currentObject : newList) { Assert.isInstanceOf(ChannelProcessor.class, currentObject, diff --git a/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java b/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java index d559d2c9d5..c609d24cf3 100644 --- a/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java +++ b/web/src/main/java/org/springframework/security/web/access/channel/ChannelProcessingFilter.java @@ -114,7 +114,7 @@ public class ChannelProcessingFilter extends GenericFilterBean { return; } - Set unsupportedAttributes = new HashSet(); + Set unsupportedAttributes = new HashSet<>(); for (ConfigAttribute attr : attrDefs) { if (!this.channelDecisionManager.supports(attr)) { 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 c38bb09b1e..827e48e44a 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 @@ -68,7 +68,7 @@ public final class ExpressionBasedFilterInvocationSecurityMetadataSource RequestMatcher request = entry.getKey(); Assert.isTrue(entry.getValue().size() == 1, "Expected a single expression attribute for " + request); - ArrayList attributes = new ArrayList(1); + ArrayList attributes = new ArrayList<>(1); String expression = entry.getValue().toArray(new ConfigAttribute[1])[0] .getAttribute(); logger.debug("Adding web access control expression '" + expression + "', for " diff --git a/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java b/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java index 0900fdd63c..b4a26b2daa 100644 --- a/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java +++ b/web/src/main/java/org/springframework/security/web/access/intercept/DefaultFilterInvocationSecurityMetadataSource.java @@ -78,7 +78,7 @@ public class DefaultFilterInvocationSecurityMetadataSource implements // ======================================================================================================== public Collection getAllConfigAttributes() { - Set allAttributes = new HashSet(); + Set allAttributes = new HashSet<>(); for (Map.Entry> entry : requestMap .entrySet()) { diff --git a/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java b/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java index fae985c91f..94995bf8d7 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java +++ b/web/src/main/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandler.java @@ -42,7 +42,7 @@ import org.springframework.util.Assert; */ public class ExceptionMappingAuthenticationFailureHandler extends SimpleUrlAuthenticationFailureHandler { - private final Map failureUrlMap = new HashMap(); + private final Map failureUrlMap = new HashMap<>(); @Override public void onAuthenticationFailure(HttpServletRequest request, diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java index 76884425a0..d216ed7119 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails.java @@ -42,7 +42,7 @@ public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetails extends HttpServletRequest request, Collection authorities) { super(request); - List temp = new ArrayList(authorities.size()); + List temp = new ArrayList<>(authorities.size()); temp.addAll(authorities); this.authorities = Collections.unmodifiableList(temp); } diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java index 994773338b..4364fd536d 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource.java @@ -67,7 +67,7 @@ public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSource * making the request. */ protected Collection getUserRoles(HttpServletRequest request) { - ArrayList j2eeUserRolesList = new ArrayList(); + ArrayList j2eeUserRolesList = new ArrayList<>(); for (String role : j2eeMappableRoles) { if (request.isUserInRole(role)) { diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java index 39a93d89eb..55b1a7c624 100755 --- a/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java +++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/j2ee/WebXmlMappableAttributesRetriever.java @@ -82,7 +82,7 @@ public class WebXmlMappableAttributesRetriever implements ResourceLoaderAware, NodeList securityRoles = ((Element) webApp.item(0)) .getElementsByTagName("security-role"); - ArrayList roleNames = new ArrayList(); + ArrayList roleNames = new ArrayList<>(); for (int i = 0; i < securityRoles.getLength(); i++) { Element secRoleElt = (Element) securityRoles.item(i); @@ -98,7 +98,7 @@ public class WebXmlMappableAttributesRetriever implements ResourceLoaderAware, } } - mappableAttributes = Collections.unmodifiableSet(new HashSet(roleNames)); + mappableAttributes = Collections.unmodifiableSet(new HashSet<>(roleNames)); } /** diff --git a/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java b/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java index a49256e1c3..cc7e189406 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java +++ b/web/src/main/java/org/springframework/security/web/authentication/rememberme/InMemoryTokenRepositoryImpl.java @@ -29,7 +29,7 @@ import java.util.Map; * @author Luke Taylor */ public class InMemoryTokenRepositoryImpl implements PersistentTokenRepository { - private final Map seriesTokens = new HashMap(); + private final Map seriesTokens = new HashMap<>(); public synchronized void createNewToken(PersistentRememberMeToken token) { PersistentRememberMeToken current = seriesTokens.get(token.getSeries()); diff --git a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java index efe526a202..f51ddd1059 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java +++ b/web/src/main/java/org/springframework/security/web/authentication/session/SessionFixationProtectionStrategy.java @@ -117,7 +117,7 @@ public class SessionFixationProtectionStrategy extends @SuppressWarnings("unchecked") private HashMap createMigratedAttributeMap(HttpSession session) { - HashMap attributesToMigrate = new HashMap(); + HashMap attributesToMigrate = new HashMap<>(); Enumeration enumer = session.getAttributeNames(); diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java index a35fac4b56..c7eee60524 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java +++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java @@ -335,7 +335,7 @@ public class SwitchUserFilter extends GenericFilterBean } // add the new switch user authority - List newAuths = new ArrayList(orig); + List newAuths = new ArrayList<>(orig); newAuths.add(switchAuthority); // create the new authentication token diff --git a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthUtils.java b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthUtils.java index 84a92cc178..57f9c72d12 100644 --- a/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthUtils.java +++ b/web/src/main/java/org/springframework/security/web/authentication/www/DigestAuthUtils.java @@ -47,7 +47,7 @@ final class DigestAuthUtils { return EMPTY_STRING_ARRAY; } - List list = new ArrayList(); + List list = new ArrayList<>(); int i = 0; int start = 0; boolean match = false; @@ -158,7 +158,7 @@ final class DigestAuthUtils { return null; } - Map map = new HashMap(); + Map map = new HashMap<>(); for (String s : array) { String postRemove; diff --git a/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java b/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java index 0a62e303bc..dfecf589f0 100644 --- a/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java +++ b/web/src/main/java/org/springframework/security/web/csrf/CsrfFilter.java @@ -160,7 +160,7 @@ public final class CsrfFilter extends OncePerRequestFilter { } private static final class DefaultRequiresCsrfMatcher implements RequestMatcher { - private final HashSet allowedMethods = new HashSet( + private final HashSet allowedMethods = new HashSet<>( Arrays.asList("GET", "HEAD", "TRACE", "OPTIONS")); /* diff --git a/web/src/main/java/org/springframework/security/web/header/writers/CacheControlHeadersWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/CacheControlHeadersWriter.java index c4415fbe78..c172ac3c07 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/CacheControlHeadersWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/CacheControlHeadersWriter.java @@ -74,7 +74,7 @@ public final class CacheControlHeadersWriter implements HeaderWriter { } private static List
createHeaders() { - List
headers = new ArrayList
(2); + List
headers = new ArrayList<>(2); headers.add(new Header(CACHE_CONTROL, "no-cache, no-store, max-age=0, must-revalidate")); headers.add(new Header(PRAGMA, "no-cache")); diff --git a/web/src/main/java/org/springframework/security/web/header/writers/HpkpHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/HpkpHeaderWriter.java index 66a3efbfde..e9cd6481ce 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/HpkpHeaderWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/HpkpHeaderWriter.java @@ -113,7 +113,7 @@ public final class HpkpHeaderWriter implements HeaderWriter { private final RequestMatcher requestMatcher = new SecureRequestMatcher(); - private Map pins = new LinkedHashMap(); + private Map pins = new LinkedHashMap<>(); private long maxAgeInSeconds; diff --git a/web/src/main/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriter.java b/web/src/main/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriter.java index a453774cea..52df0c3136 100644 --- a/web/src/main/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriter.java +++ b/web/src/main/java/org/springframework/security/web/header/writers/ReferrerPolicyHeaderWriter.java @@ -106,7 +106,7 @@ public class ReferrerPolicyHeaderWriter implements HeaderWriter { private static final Map REFERRER_POLICIES; static { - Map referrerPolicies = new HashMap(); + Map referrerPolicies = new HashMap<>(); for (ReferrerPolicy referrerPolicy : values()) { referrerPolicies.put(referrerPolicy.getPolicy(), referrerPolicy); } 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 9ad5e36827..7139f0086b 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 @@ -62,11 +62,11 @@ public class DefaultSavedRequest implements SavedRequest { // ~ Instance fields // ================================================================================================ - private final ArrayList cookies = new ArrayList(); - private final ArrayList locales = new ArrayList(); - private final Map> headers = new TreeMap>( + private final ArrayList cookies = new ArrayList<>(); + private final ArrayList locales = new ArrayList<>(); + private final Map> headers = new TreeMap<>( String.CASE_INSENSITIVE_ORDER); - private final Map parameters = new TreeMap(); + private final Map parameters = new TreeMap<>(); private final String contextPath; private final String method; private final String pathInfo; @@ -163,7 +163,7 @@ public class DefaultSavedRequest implements SavedRequest { List values = headers.get(name); if (values == null) { - values = new ArrayList(); + values = new ArrayList<>(); headers.put(name, values); } @@ -407,8 +407,8 @@ public class DefaultSavedRequest implements SavedRequest { private List cookies = null; private List locales = null; - private Map> headers = new TreeMap>(String.CASE_INSENSITIVE_ORDER); - private Map parameters = new TreeMap(); + private Map> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + private Map parameters = new TreeMap<>(); private String contextPath; private String method; private String pathInfo; diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java b/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java index 02750d9b46..90f71a351f 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/Enumerator.java @@ -92,7 +92,7 @@ public class Enumerator implements Enumeration { this.iterator = iterator; } else { - List list = new ArrayList(); + List list = new ArrayList<>(); while (iterator.hasNext()) { list.add(iterator.next()); diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java b/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java index 2c0f4499fe..5b884c359e 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/FastHttpDateFormat.java @@ -65,10 +65,10 @@ public class FastHttpDateFormat { protected static String currentDate = null; /** Formatter cache. */ - protected static final HashMap formatCache = new HashMap(); + protected static final HashMap formatCache = new HashMap<>(); /** Parser cache. */ - protected static final HashMap parseCache = new HashMap(); + protected static final HashMap parseCache = new HashMap<>(); // ~ Methods // ======================================================================================================== diff --git a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java index e6e39f1a63..959c7049b0 100644 --- a/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java +++ b/web/src/main/java/org/springframework/security/web/savedrequest/SavedRequestAwareWrapper.java @@ -121,13 +121,13 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { @Override @SuppressWarnings("unchecked") public Enumeration getHeaderNames() { - return new Enumerator(savedRequest.getHeaderNames()); + return new Enumerator<>(savedRequest.getHeaderNames()); } @Override @SuppressWarnings("unchecked") public Enumeration getHeaders(String name) { - return new Enumerator(savedRequest.getHeaderValues(name)); + return new Enumerator<>(savedRequest.getHeaderValues(name)); } @Override @@ -156,11 +156,11 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { if (locales.isEmpty()) { // Fall back to default locale - locales = new ArrayList(1); + locales = new ArrayList<>(1); locales.add(Locale.getDefault()); } - return new Enumerator(locales); + return new Enumerator<>(locales); } @Override @@ -199,7 +199,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { @SuppressWarnings("unchecked") public Map getParameterMap() { Set names = getCombinedParameterNames(); - Map parameterMap = new HashMap(names.size()); + Map parameterMap = new HashMap<>(names.size()); for (String name : names) { parameterMap.put(name, getParameterValues(name)); @@ -210,7 +210,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { @SuppressWarnings("unchecked") private Set getCombinedParameterNames() { - Set names = new HashSet(); + Set names = new HashSet<>(); names.addAll(super.getParameterMap().keySet()); names.addAll(savedRequest.getParameterMap().keySet()); @@ -238,7 +238,7 @@ class SavedRequestAwareWrapper extends HttpServletRequestWrapper { // We have parameters in both saved and wrapped requests so have to merge them List wrappedParamsList = Arrays.asList(wrappedRequestParams); - List combinedParams = new ArrayList(wrappedParamsList); + List combinedParams = new ArrayList<>(wrappedParamsList); // We want to add all parameters of the saved request *apart from* duplicates of // those already added diff --git a/web/src/main/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessor.java b/web/src/main/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessor.java index 376f31dd9e..d0e1369637 100644 --- a/web/src/main/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessor.java +++ b/web/src/main/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessor.java @@ -67,7 +67,7 @@ public final class CsrfRequestDataValueProcessor implements RequestDataValueProc if (token == null) { return Collections.emptyMap(); } - Map hiddenFields = new HashMap(1); + Map hiddenFields = new HashMap<>(1); hiddenFields.put(token.getParameterName(), token.getToken()); return hiddenFields; } @@ -75,4 +75,4 @@ public final class CsrfRequestDataValueProcessor implements RequestDataValueProc public String processUrl(HttpServletRequest request, String url) { return url; } -} \ No newline at end of file +} diff --git a/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java b/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java index 711c9cf3e4..364dbfea72 100644 --- a/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java +++ b/web/src/main/java/org/springframework/security/web/session/HttpSessionDestroyedEvent.java @@ -50,7 +50,7 @@ public class HttpSessionDestroyedEvent extends SessionDestroyedEvent { Enumeration attributes = session.getAttributeNames(); - ArrayList contexts = new ArrayList(); + ArrayList contexts = new ArrayList<>(); while (attributes.hasMoreElements()) { String attributeName = attributes.nextElement(); 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 a5162a129a..0efd6794fe 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 @@ -174,7 +174,7 @@ public class ThrowableAnalyzer { throw new IllegalArgumentException("Invalid throwable: null"); } - List chain = new ArrayList(); + List chain = new ArrayList<>(); Throwable currentThrowable = throwable; while (currentThrowable != null) { diff --git a/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java b/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java index 27cb050296..b0653c997f 100644 --- a/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java +++ b/web/src/test/java/org/springframework/security/web/PortMapperImplTests.java @@ -51,7 +51,7 @@ public class PortMapperImplTests { PortMapperImpl portMapper = new PortMapperImpl(); try { - portMapper.setPortMappings(new HashMap()); + portMapper.setPortMappings(new HashMap<>()); fail("Should have thrown IllegalArgumentException"); } catch (IllegalArgumentException expected) { @@ -81,7 +81,7 @@ public class PortMapperImplTests { @Test public void testRejectsOutOfRangeMappings() { PortMapperImpl portMapper = new PortMapperImpl(); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("79", "80559"); try { @@ -102,7 +102,7 @@ public class PortMapperImplTests { @Test public void testSupportsCustomMappings() { PortMapperImpl portMapper = new PortMapperImpl(); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("79", "442"); portMapper.setPortMappings(map); diff --git a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java index bc5a22375c..77931d6066 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpEntryPointTests.java @@ -148,7 +148,7 @@ public class RetryWithHttpEntryPointTests { MockHttpServletResponse response = new MockHttpServletResponse(); PortMapperImpl portMapper = new PortMapperImpl(); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("8888", "9999"); portMapper.setPortMappings(map); diff --git a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java index bab0d81a25..ed8798e2a1 100644 --- a/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/access/channel/RetryWithHttpsEntryPointTests.java @@ -138,7 +138,7 @@ public class RetryWithHttpsEntryPointTests { MockHttpServletResponse response = new MockHttpServletResponse(); PortMapperImpl portMapper = new PortMapperImpl(); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("8888", "9999"); portMapper.setPortMappings(map); diff --git a/web/src/test/java/org/springframework/security/web/access/expression/DelegatingEvaluationContextTests.java b/web/src/test/java/org/springframework/security/web/access/expression/DelegatingEvaluationContextTests.java index 2153670e81..177583e435 100644 --- a/web/src/test/java/org/springframework/security/web/access/expression/DelegatingEvaluationContextTests.java +++ b/web/src/test/java/org/springframework/security/web/access/expression/DelegatingEvaluationContextTests.java @@ -60,7 +60,7 @@ public class DelegatingEvaluationContextTests { @Test public void getConstructorResolvers() { - List expected = new ArrayList(); + List expected = new ArrayList<>(); when(this.delegate.getConstructorResolvers()).thenReturn(expected); assertThat(this.context.getConstructorResolvers()).isEqualTo(expected); @@ -68,7 +68,7 @@ public class DelegatingEvaluationContextTests { @Test public void getMethodResolvers() { - List expected = new ArrayList(); + List expected = new ArrayList<>(); when(this.delegate.getMethodResolvers()).thenReturn(expected); assertThat(this.context.getMethodResolvers()).isEqualTo(expected); @@ -76,7 +76,7 @@ public class DelegatingEvaluationContextTests { @Test public void getPropertyAccessors() { - List expected = new ArrayList(); + List expected = new ArrayList<>(); when(this.delegate.getPropertyAccessors()).thenReturn(expected); assertThat(this.context.getPropertyAccessors()).isEqualTo(expected); diff --git a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java index 531e41add0..6e69aac2ce 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/DelegatingAuthenticationEntryPointTests.java @@ -44,7 +44,7 @@ public class DelegatingAuthenticationEntryPointTests { @Before public void before() { defaultEntryPoint = mock(AuthenticationEntryPoint.class); - entryPoints = new LinkedHashMap(); + entryPoints = new LinkedHashMap<>(); daep = new DelegatingAuthenticationEntryPoint(entryPoints); daep.setDefaultEntryPoint(defaultEntryPoint); } diff --git a/web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java index 8fe6601bd7..f1e3fb7bb7 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/ExceptionMappingAuthenticationFailureHandlerTests.java @@ -43,7 +43,7 @@ public class ExceptionMappingAuthenticationFailureHandlerTests { @Test public void exceptionMapIsUsedIfMappingExists() throws Exception { ExceptionMappingAuthenticationFailureHandler fh = new ExceptionMappingAuthenticationFailureHandler(); - HashMap mapping = new HashMap(); + HashMap mapping = new HashMap<>(); mapping.put( "org.springframework.security.authentication.BadCredentialsException", "/badcreds"); diff --git a/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java b/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java index 1899277520..5a3116646c 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPointTests.java @@ -109,7 +109,7 @@ public class LoginUrlAuthenticationEntryPointTests { assertThat(response.getRedirectedUrl()).isEqualTo("https://www.example.com:8443/bigWebApp/hello"); PortMapperImpl portMapper = new PortMapperImpl(); - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("8888", "9999"); portMapper.setPortMappings(map); response = new MockHttpServletResponse(); diff --git a/web/src/test/java/org/springframework/security/web/authentication/logout/DelegatingLogoutSuccessHandlerTests.java b/web/src/test/java/org/springframework/security/web/authentication/logout/DelegatingLogoutSuccessHandlerTests.java index 2cd7f72bf1..573dc9253f 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/logout/DelegatingLogoutSuccessHandlerTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/logout/DelegatingLogoutSuccessHandlerTests.java @@ -63,7 +63,7 @@ public class DelegatingLogoutSuccessHandlerTests { @Before public void setup() { - LinkedHashMap matcherToHandler = new LinkedHashMap(); + LinkedHashMap matcherToHandler = new LinkedHashMap<>(); matcherToHandler.put(this.matcher, this.handler); matcherToHandler.put(this.matcher2, this.handler2); this.delegatingHandler = new DelegatingLogoutSuccessHandler(matcherToHandler); diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java index 8cc798d0d0..6ef0ee41d0 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests.java @@ -55,7 +55,7 @@ public class PreAuthenticatedGrantedAuthoritiesWebAuthenticationDetailsTests { private HttpServletRequest getRequest(final String userName, final String[] aRoles) { MockHttpServletRequest req = new MockHttpServletRequest() { - private Set roles = new HashSet(Arrays.asList(aRoles)); + private Set roles = new HashSet<>(Arrays.asList(aRoles)); public boolean isUserInRole(String arg0) { return roles.contains(arg0); 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 cc7cbf0cd5..13b974e21e 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 @@ -127,7 +127,7 @@ public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests { assertThat(gas).hasSize(expectedRoles.length); Collection expectedRolesColl = Arrays.asList(expectedRoles); - Collection gasRolesSet = new HashSet(); + Collection gasRolesSet = new HashSet<>(); for (int i = 0; i < gas.size(); i++) { gasRolesSet.add(gas.get(i).getAuthority()); } @@ -170,7 +170,7 @@ public class J2eeBasedPreAuthenticatedWebAuthenticationDetailsSourceTests { private HttpServletRequest getRequest(final String userName, final String[] aRoles) { MockHttpServletRequest req = new MockHttpServletRequest() { - private Set roles = new HashSet(Arrays.asList(aRoles)); + private Set roles = new HashSet<>(Arrays.asList(aRoles)); public boolean isUserInRole(String arg0) { return roles.contains(arg0); diff --git a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java index 25d4069fc9..f69a4f2a94 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/preauth/j2ee/J2eePreAuthenticatedProcessingFilterTests.java @@ -53,7 +53,7 @@ public class J2eePreAuthenticatedProcessingFilterTests { final String[] aRoles) { MockHttpServletRequest req = new MockHttpServletRequest() { - private Set roles = new HashSet(Arrays.asList(aRoles)); + private Set roles = new HashSet<>(Arrays.asList(aRoles)); public boolean isUserInRole(String arg0) { return roles.contains(arg0); diff --git a/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java index c51a6852df..ba48a56e89 100644 --- a/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilterTests.java @@ -232,7 +232,7 @@ public class SwitchUserFilterTests { "dano", "hawaii50", ROLES_12); // set current user (Admin) - List adminAuths = new ArrayList(); + List adminAuths = new ArrayList<>(); adminAuths.addAll(ROLES_12); adminAuths.add(new SwitchUserGrantedAuthority("PREVIOUS_ADMINISTRATOR", source)); UsernamePasswordAuthenticationToken admin = new UsernamePasswordAuthenticationToken( @@ -394,7 +394,7 @@ public class SwitchUserFilterTests { public Collection modifyGrantedAuthorities( UserDetails targetUser, Authentication currentAuthentication, Collection authoritiesToBeGranted) { - List auths = new ArrayList(); + List auths = new ArrayList<>(); auths.add(new SimpleGrantedAuthority("ROLE_NEW")); return auths; } diff --git a/web/src/test/java/org/springframework/security/web/firewall/RequestWrapperTests.java b/web/src/test/java/org/springframework/security/web/firewall/RequestWrapperTests.java index a8c42db150..9543861302 100644 --- a/web/src/test/java/org/springframework/security/web/firewall/RequestWrapperTests.java +++ b/web/src/test/java/org/springframework/security/web/firewall/RequestWrapperTests.java @@ -33,7 +33,7 @@ import org.springframework.mock.web.MockHttpServletRequest; * @author Luke Taylor */ public class RequestWrapperTests { - private static Map testPaths = new LinkedHashMap(); + private static Map testPaths = new LinkedHashMap<>(); @BeforeClass // Some of these may be unrealistic values, but we can't be sure because of the diff --git a/web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java b/web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java index 126174b403..1038f59298 100644 --- a/web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/HeaderWriterFilterTests.java @@ -48,7 +48,7 @@ public class HeaderWriterFilterTests { @Test(expected = IllegalArgumentException.class) public void noHeadersConfigured() throws Exception { - List headerWriters = new ArrayList(); + List headerWriters = new ArrayList<>(); new HeaderWriterFilter(headerWriters); } @@ -59,7 +59,7 @@ public class HeaderWriterFilterTests { @Test public void additionalHeadersShouldBeAddedToTheResponse() throws Exception { - List headerWriters = new ArrayList(); + List headerWriters = new ArrayList<>(); headerWriters.add(writer1); headerWriters.add(writer2); diff --git a/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java b/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java index 24493f3ae7..e97e77148a 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/HpkpHeaderWriterTests.java @@ -37,7 +37,7 @@ public class HpkpHeaderWriterTests { private static final Map DEFAULT_PINS; static { - Map defaultPins = new LinkedHashMap(); + Map defaultPins = new LinkedHashMap<>(); defaultPins.put("d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=", "sha256"); DEFAULT_PINS = Collections.unmodifiableMap(defaultPins); } @@ -54,7 +54,7 @@ public class HpkpHeaderWriterTests { writer = new HpkpHeaderWriter(); - Map defaultPins = new LinkedHashMap(); + Map defaultPins = new LinkedHashMap<>(); defaultPins.put("d6qzRu9zOECb90Uez27xWltNsj0e1Md7GkYYkVoZWmM=", "sha256"); writer.setPins(defaultPins); diff --git a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java index f75b47b428..b7cb459c60 100644 --- a/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java +++ b/web/src/test/java/org/springframework/security/web/header/writers/frameoptions/WhiteListedAllowFromStrategyTests.java @@ -33,7 +33,7 @@ public class WhiteListedAllowFromStrategyTests { @Test(expected = IllegalArgumentException.class) public void emptyListShouldThrowException() { - new WhiteListedAllowFromStrategy(new ArrayList()); + new WhiteListedAllowFromStrategy(new ArrayList<>()); } @Test(expected = IllegalArgumentException.class) @@ -43,7 +43,7 @@ public class WhiteListedAllowFromStrategyTests { @Test public void listWithSingleElementShouldMatch() { - List allowed = new ArrayList(); + List allowed = new ArrayList<>(); allowed.add("http://www.test.com"); WhiteListedAllowFromStrategy strategy = new WhiteListedAllowFromStrategy(allowed); strategy.setAllowFromParameterName("from"); @@ -56,7 +56,7 @@ public class WhiteListedAllowFromStrategyTests { @Test public void listWithMultipleElementShouldMatch() { - List allowed = new ArrayList(); + List allowed = new ArrayList<>(); allowed.add("http://www.test.com"); allowed.add("http://www.springsource.org"); WhiteListedAllowFromStrategy strategy = new WhiteListedAllowFromStrategy(allowed); @@ -70,7 +70,7 @@ public class WhiteListedAllowFromStrategyTests { @Test public void listWithSingleElementShouldNotMatch() { - List allowed = new ArrayList(); + List allowed = new ArrayList<>(); allowed.add("http://www.test.com"); WhiteListedAllowFromStrategy strategy = new WhiteListedAllowFromStrategy(allowed); strategy.setAllowFromParameterName("from"); @@ -83,7 +83,7 @@ public class WhiteListedAllowFromStrategyTests { @Test public void requestWithoutParameterShouldNotMatch() { - List allowed = new ArrayList(); + List allowed = new ArrayList<>(); allowed.add("http://www.test.com"); WhiteListedAllowFromStrategy strategy = new WhiteListedAllowFromStrategy(allowed); strategy.setAllowFromParameterName("from"); diff --git a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java index 818bda68f2..1f296ac9aa 100644 --- a/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/jaasapi/JaasApiIntegrationFilterTests.java @@ -122,7 +122,7 @@ public class JaasApiIntegrationFilterTests { public AppConfigurationEntry[] getAppConfigurationEntry(String name) { return new AppConfigurationEntry[] { new AppConfigurationEntry( TestLoginModule.class.getName(), LoginModuleControlFlag.REQUIRED, - new HashMap()) }; + new HashMap<>()) }; } }; LoginContext ctx = new LoginContext("SubjectDoAsFilterTest", authenticatedSubject, diff --git a/web/src/test/java/org/springframework/security/web/jackson2/SavedCookieMixinTests.java b/web/src/test/java/org/springframework/security/web/jackson2/SavedCookieMixinTests.java index b58972c9be..c078835744 100644 --- a/web/src/test/java/org/springframework/security/web/jackson2/SavedCookieMixinTests.java +++ b/web/src/test/java/org/springframework/security/web/jackson2/SavedCookieMixinTests.java @@ -75,7 +75,7 @@ public class SavedCookieMixinTests extends AbstractMixinTests { @Test public void serializeSavedCookieWithList() throws JsonProcessingException, JSONException { - List savedCookies = new ArrayList(); + List savedCookies = new ArrayList<>(); savedCookies.add(new SavedCookie(new Cookie("SESSION", "123456789"))); String actualJson = mapper.writeValueAsString(savedCookies); JSONAssert.assertEquals(COOKIES_JSON, actualJson, true); 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 fe33730317..deaf833251 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 @@ -42,7 +42,7 @@ public class CsrfRequestDataValueProcessorTests { private CsrfRequestDataValueProcessor processor = new CsrfRequestDataValueProcessor(); private CsrfToken token = new DefaultCsrfToken("1", "a", "b"); - private Map expected = new HashMap(); + private Map expected = new HashMap<>(); @Before public void setup() { diff --git a/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java b/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java index 62d02439cd..66e48bac97 100644 --- a/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java +++ b/web/src/test/java/org/springframework/security/web/servlet/support/csrf/CsrfRequestDataValueProcessorTests.java @@ -39,7 +39,7 @@ public class CsrfRequestDataValueProcessorTests { private CsrfRequestDataValueProcessor processor; private CsrfToken token; - private Map expected = new HashMap(); + private Map expected = new HashMap<>(); @Before public void setup() { @@ -129,7 +129,7 @@ public class CsrfRequestDataValueProcessorTests { public void createGetExtraHiddenFieldsHasCsrfToken() { CsrfToken token = new DefaultCsrfToken("1", "a", "b"); request.setAttribute(CsrfToken.class.getName(), token); - Map expected = new HashMap(); + Map expected = new HashMap<>(); expected.put(token.getParameterName(), token.getToken()); RequestDataValueProcessor processor = new CsrfRequestDataValueProcessor();