Use diamond type

acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java

@@ -52,7 +52,7 @@ public class AclPermissionCacheOptimizer implements PermissionCacheOptimizer {
 			return;
 		}
 
-		List<ObjectIdentity> oidsToCache = new ArrayList<ObjectIdentity>(objects.size());
+		List<ObjectIdentity> oidsToCache = new ArrayList<>(objects.size());
 
 		for (Object domainObject : objects) {
 			if (domainObject == null) {

acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java

@@ -52,7 +52,7 @@ class ArrayFilterer<T> implements Filterer<T> {
 		// Collect the removed objects to a HashSet so that
 		// it is fast to lookup them when a filtered array
 		// is constructed.
-		removeList = new HashSet<T>();
+		removeList = new HashSet<>();
 	}
 
 	// ~ Methods

acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java

@@ -56,7 +56,7 @@ class CollectionFilterer<T> implements Filterer<T> {
 		// 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<T>();
+		removeList = new HashSet<>();
 	}
 
 	// ~ Methods

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<AccessControlEntry> aces = new ArrayList<AccessControlEntry>();
+	private final List<AccessControlEntry> 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<AccessControlEntry> getEntries() {
 		// Can safely return AccessControlEntry directly, as they're immutable outside the
 		// ACL package
-		return new ArrayList<AccessControlEntry>(aces);
+		return new ArrayList<>(aces);
 	}
 
 	@Override

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<Integer, Permission> registeredPermissionsByInteger = new HashMap<Integer, Permission>();
-	private final Map<String, Permission> registeredPermissionsByName = new HashMap<String, Permission>();
+	private final Map<Integer, Permission> registeredPermissionsByInteger = new HashMap<>();
+	private final Map<String, Permission> registeredPermissionsByName = new HashMap<>();
 
 	/**
 	 * Registers the <tt>Permission</tt> fields from the <tt>BasePermission</tt> class.
@@ -156,7 +156,7 @@ public class DefaultPermissionFactory implements PermissionFactory {
 			return Collections.emptyList();
 		}
 
-		List<Permission> permissions = new ArrayList<Permission>(names.size());
+		List<Permission> permissions = new ArrayList<>(names.size());
 
 		for (String name : names) {
 			permissions.add(buildFromName(name));

acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java

@@ -57,7 +57,7 @@ public class SidRetrievalStrategyImpl implements SidRetrievalStrategy {
 	public List<Sid> getSids(Authentication authentication) {
 		Collection<? extends GrantedAuthority> authorities = roleHierarchy
 				.getReachableGrantedAuthorities(authentication.getAuthorities());
-		List<Sid> sids = new ArrayList<Sid>(authorities.size() + 1);
+		List<Sid> sids = new ArrayList<>(authorities.size() + 1);
 
 		sids.add(new PrincipalSid(authentication));
 

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<ObjectIdentity,Acl>
-		Map<ObjectIdentity, Acl> result = new HashMap<ObjectIdentity, Acl>(); // contains
+		Map<ObjectIdentity, Acl> result = new HashMap<>(); // contains
 																				// FULLY
 																				// loaded
 																				// Acl
 																				// objects
 
-		Set<ObjectIdentity> currentBatchToLoad = new HashSet<ObjectIdentity>();
+		Set<ObjectIdentity> 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<ObjectIdentity> objectIdentities, List<Sid> sids) {
 		Assert.notEmpty(objectIdentities, "Must provide identities to lookup");
 
-		final Map<Serializable, Acl> acls = new HashMap<Serializable, Acl>(); // contains
+		final Map<Serializable, Acl> 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<ObjectIdentity, Acl> resultMap = new HashMap<ObjectIdentity, Acl>();
+		Map<ObjectIdentity, Acl> resultMap = new HashMap<>();
 
 		for (Acl inputAcl : acls.values()) {
 			Assert.isInstanceOf(AclImpl.class, inputAcl,
@@ -463,7 +463,7 @@ public class BasicLookupStrategy implements LookupStrategy {
 		List<AccessControlEntryImpl> aces = readAces(inputAcl);
 
 		// Create a list in which to store the "aces" for the "result" AclImpl instance
-		List<AccessControlEntryImpl> acesNew = new ArrayList<AccessControlEntryImpl>();
+		List<AccessControlEntryImpl> 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<Long> extractData(ResultSet rs) throws SQLException {
-			Set<Long> parentIdsToLookup = new HashSet<Long>(); // Set of parent_id Longs
+			Set<Long> parentIdsToLookup = new HashSet<>(); // Set of parent_id Longs
 
 			while (rs.next()) {
 				// Convert current row into an Acl (albeit with a StubAclParent)

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<Permission>(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<Sid>(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<Sid>(0))).isTrue();
+		assertThat(acl.isSidLoaded(new ArrayList<>(0))).isTrue();
 		assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
 				"ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_IGNORED"))))
 			.isTrue();

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<ObjectIdentity, Acl> result = new HashMap<ObjectIdentity, Acl>();
+		Map<ObjectIdentity, Acl> result = new HashMap<>();
 		when(
 				lookupStrategy.readAclsById(anyListOf(ObjectIdentity.class),
 						anyListOf(Sid.class))).thenReturn(result);