From 0ba2e05f1a43401f4b223f0069253ae652cc4f02 Mon Sep 17 00:00:00 2001 From: smarks Date: Fri, 7 Jan 2011 15:39:58 -0800 Subject: [PATCH] 7008728: diamond conversion of basic security, permissions, authentication Reviewed-by: mullan --- .../classes/com/sun/security/auth/PolicyFile.java | 2 +- .../auth/callback/DialogCallbackHandler.java | 4 ++-- .../com/sun/security/auth/login/ConfigFile.java | 7 +++---- .../sun/security/auth/module/JndiLoginModule.java | 2 +- .../security/auth/module/KeyStoreLoginModule.java | 3 +-- .../security/auth/module/SolarisLoginModule.java | 2 +- .../sun/security/auth/module/UnixLoginModule.java | 2 +- .../java/security/AccessControlContext.java | 2 +- .../classes/java/security/BasicPermission.java | 2 +- src/share/classes/java/security/CodeSource.java | 6 +++--- src/share/classes/java/security/Permissions.java | 4 ++-- .../classes/java/security/ProtectionDomain.java | 4 ++-- src/share/classes/java/security/Provider.java | 6 +++--- .../classes/java/security/SecureClassLoader.java | 2 +- src/share/classes/java/security/Security.java | 12 +++++------- .../java/security/UnresolvedPermission.java | 2 +- .../security/UnresolvedPermissionCollection.java | 10 ++++------ .../security/auth/PrivateCredentialPermission.java | 2 +- .../javax/security/auth/SubjectDomainCombiner.java | 2 +- .../auth/kerberos/DelegationPermission.java | 2 +- .../security/auth/kerberos/ServicePermission.java | 2 +- .../classes/sun/security/acl/AclEntryImpl.java | 2 +- src/share/classes/sun/security/acl/AclImpl.java | 14 +++++++------- src/share/classes/sun/security/acl/GroupImpl.java | 4 ++-- .../auth/module/LdapLoginModule/CheckConfigs.java | 6 +++--- .../auth/module/LdapLoginModule/CheckOptions.java | 6 +++--- 26 files changed, 53 insertions(+), 59 deletions(-) diff --git a/src/share/classes/com/sun/security/auth/PolicyFile.java b/src/share/classes/com/sun/security/auth/PolicyFile.java index fa9caf79e..2005f0440 100644 --- a/src/share/classes/com/sun/security/auth/PolicyFile.java +++ b/src/share/classes/com/sun/security/auth/PolicyFile.java @@ -1180,7 +1180,7 @@ public class PolicyFile extends javax.security.auth.Policy { // Done return certs; - ArrayList userCertList = new ArrayList(); + ArrayList userCertList = new ArrayList<>(); i = 0; while (i < certs.length) { userCertList.add(certs[i]); diff --git a/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java b/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java index 63212fafb..5f2171904 100644 --- a/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java +++ b/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java @@ -99,10 +99,10 @@ public class DialogCallbackHandler implements CallbackHandler { throws UnsupportedCallbackException { /* Collect messages to display in the dialog */ - final List messages = new ArrayList(3); + final List messages = new ArrayList<>(3); /* Collection actions to perform if the user clicks OK */ - final List okActions = new ArrayList(2); + final List okActions = new ArrayList<>(2); ConfirmationInfo confirmation = new ConfirmationInfo(); diff --git a/src/share/classes/com/sun/security/auth/login/ConfigFile.java b/src/share/classes/com/sun/security/auth/login/ConfigFile.java index ad186566f..b3689ff21 100644 --- a/src/share/classes/com/sun/security/auth/login/ConfigFile.java +++ b/src/share/classes/com/sun/security/auth/login/ConfigFile.java @@ -152,7 +152,7 @@ public class ConfigFile extends javax.security.auth.login.Configuration { // new configuration HashMap> newConfig = - new HashMap>(); + new HashMap<>(); if (url != null) { @@ -392,8 +392,7 @@ public class ConfigFile extends javax.security.auth.login.Configuration { String moduleClass; String sflag; AppConfigurationEntry.LoginModuleControlFlag controlFlag; - LinkedList configEntries = - new LinkedList(); + LinkedList configEntries = new LinkedList<>(); // application name appName = st.sval; @@ -433,7 +432,7 @@ public class ConfigFile extends javax.security.auth.login.Configuration { } // get the args - HashMap options = new HashMap(); + HashMap options = new HashMap<>(); String key; String value; while (peek(";") == false) { diff --git a/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java b/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java index 59a19849d..cede6b640 100644 --- a/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java +++ b/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java @@ -184,7 +184,7 @@ public class JndiLoginModule implements LoginModule { private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; private LinkedList supplementaryGroups = - new LinkedList(); + new LinkedList<>(); // initial state private Subject subject; diff --git a/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java b/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java index ff6185e38..f2199ed89 100644 --- a/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java +++ b/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java @@ -658,8 +658,7 @@ public class KeyStoreLoginModule implements LoginModule { throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); } else { - LinkedList certList = - new LinkedList(); + LinkedList certList = new LinkedList<>(); for (int i=0; i < fromKeyStore.length; i++) { certList.add(fromKeyStore[i]); } diff --git a/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java b/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java index 2767b9a4a..cca9be656 100644 --- a/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java +++ b/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java @@ -76,7 +76,7 @@ public class SolarisLoginModule implements LoginModule { private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; private LinkedList supplementaryGroups = - new LinkedList(); + new LinkedList<>(); /** * Initialize this LoginModule. diff --git a/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java b/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java index a29153fb6..6f9a443f3 100644 --- a/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java +++ b/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java @@ -70,7 +70,7 @@ public class UnixLoginModule implements LoginModule { private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; private LinkedList supplementaryGroups = - new LinkedList(); + new LinkedList<>(); /** * Initialize this LoginModule. diff --git a/src/share/classes/java/security/AccessControlContext.java b/src/share/classes/java/security/AccessControlContext.java index d4f167b64..e80953b66 100644 --- a/src/share/classes/java/security/AccessControlContext.java +++ b/src/share/classes/java/security/AccessControlContext.java @@ -121,7 +121,7 @@ public final class AccessControlContext { this.context = null; } } else { - List v = new ArrayList(context.length); + List v = new ArrayList<>(context.length); for (int i =0; i< context.length; i++) { if ((context[i] != null) && (!v.contains(context[i]))) v.add(context[i]); diff --git a/src/share/classes/java/security/BasicPermission.java b/src/share/classes/java/security/BasicPermission.java index 7f3b9479d..f22e4c755 100644 --- a/src/share/classes/java/security/BasicPermission.java +++ b/src/share/classes/java/security/BasicPermission.java @@ -515,7 +515,7 @@ implements java.io.Serializable // Copy perms into a Hashtable Hashtable permissions = - new Hashtable(perms.size()*2); + new Hashtable<>(perms.size()*2); synchronized (this) { permissions.putAll(perms); diff --git a/src/share/classes/java/security/CodeSource.java b/src/share/classes/java/security/CodeSource.java index d762b2dda..5ec8cebc0 100644 --- a/src/share/classes/java/security/CodeSource.java +++ b/src/share/classes/java/security/CodeSource.java @@ -188,7 +188,7 @@ public class CodeSource implements java.io.Serializable { } else if (signers != null) { // Convert the code signers to certs ArrayList certChains = - new ArrayList(); + new ArrayList<>(); for (int i = 0; i < signers.length; i++) { certChains.addAll( signers[i].getSignerCertPath().getCertificates()); @@ -606,10 +606,10 @@ public class CodeSource implements java.io.Serializable { // Iterate through all the certificates int i = 0; - List signers = new ArrayList(); + List signers = new ArrayList<>(); while (i < certs.length) { List certChain = - new ArrayList(); + new ArrayList<>(); certChain.add(certs[i++]); // first cert is an end-entity cert int j = i; diff --git a/src/share/classes/java/security/Permissions.java b/src/share/classes/java/security/Permissions.java index 3f41ac408..e480db0fd 100644 --- a/src/share/classes/java/security/Permissions.java +++ b/src/share/classes/java/security/Permissions.java @@ -362,7 +362,7 @@ implements Serializable // Copy perms into a Hashtable Hashtable, PermissionCollection> perms = - new Hashtable, PermissionCollection>(permsMap.size()*2); // no sync; estimate + new Hashtable<>(permsMap.size()*2); // no sync; estimate synchronized (this) { perms.putAll(permsMap); } @@ -567,7 +567,7 @@ implements Serializable // Copy perms into a Hashtable Hashtable perms = - new Hashtable(permsMap.size()*2); + new Hashtable<>(permsMap.size()*2); synchronized (this) { perms.putAll(permsMap); } diff --git a/src/share/classes/java/security/ProtectionDomain.java b/src/share/classes/java/security/ProtectionDomain.java index 6079436a5..43a39028e 100644 --- a/src/share/classes/java/security/ProtectionDomain.java +++ b/src/share/classes/java/security/ProtectionDomain.java @@ -336,8 +336,8 @@ public class ProtectionDomain { int swag = 32; int vcap = 8; Enumeration e; - List pdVector = new ArrayList(vcap); - List plVector = new ArrayList(swag); + List pdVector = new ArrayList<>(vcap); + List plVector = new ArrayList<>(swag); // // Build a vector of domain permissions for subsequent merge diff --git a/src/share/classes/java/security/Provider.java b/src/share/classes/java/security/Provider.java index 11dc07ae4..e13303526 100644 --- a/src/share/classes/java/security/Provider.java +++ b/src/share/classes/java/security/Provider.java @@ -437,7 +437,7 @@ public abstract class Provider extends Properties { private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - Map copy = new HashMap(); + Map copy = new HashMap<>(); for (Map.Entry entry : super.entrySet()) { copy.put(entry.getKey(), entry.getValue()); } @@ -719,7 +719,7 @@ public abstract class Provider extends Properties { } if (serviceSet == null) { ensureLegacyParsed(); - Set set = new LinkedHashSet(); + Set set = new LinkedHashSet<>(); if (serviceMap != null) { set.addAll(serviceMap.values()); } @@ -1395,7 +1395,7 @@ public abstract class Provider extends Properties { if (s != null) { String[] classNames = s.split("\\|"); List classList = - new ArrayList(classNames.length); + new ArrayList<>(classNames.length); for (String className : classNames) { Class clazz = getKeyClass(className); if (clazz != null) { diff --git a/src/share/classes/java/security/SecureClassLoader.java b/src/share/classes/java/security/SecureClassLoader.java index 3d53dffe1..4f774ca8f 100644 --- a/src/share/classes/java/security/SecureClassLoader.java +++ b/src/share/classes/java/security/SecureClassLoader.java @@ -50,7 +50,7 @@ public class SecureClassLoader extends ClassLoader { // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") private final HashMap pdcache = - new HashMap(11); + new HashMap<>(11); private static final Debug debug = Debug.getInstance("scl"); diff --git a/src/share/classes/java/security/Security.java b/src/share/classes/java/security/Security.java index 28bc22e58..72d0b0b87 100644 --- a/src/share/classes/java/security/Security.java +++ b/src/share/classes/java/security/Security.java @@ -545,8 +545,7 @@ public final class Security { value = filter.substring(index + 1); } - Hashtable hashtableFilter = - new Hashtable(1); + Hashtable hashtableFilter = new Hashtable<>(1); hashtableFilter.put(key, value); return (getProviders(hashtableFilter)); @@ -606,7 +605,7 @@ public final class Security { // Then only return those providers who satisfy the selection criteria. Provider[] allProviders = Security.getProviders(); Set keySet = filter.keySet(); - LinkedHashSet candidates = new LinkedHashSet(5); + LinkedHashSet candidates = new LinkedHashSet<>(5); // Returns all installed providers // if the selection criteria is null. @@ -660,8 +659,7 @@ public final class Security { } // Map containing cached Spi Class objects of the specified type - private static final Map spiMap = - new ConcurrentHashMap(); + private static final Map spiMap = new ConcurrentHashMap<>(); /** * Return the Class object for the given engine type @@ -885,7 +883,7 @@ public final class Security { String attrName, String filterValue, Provider[] allProviders) { - LinkedHashSet candidates = new LinkedHashSet(5); + LinkedHashSet candidates = new LinkedHashSet<>(5); for (int i = 0; i < allProviders.length; i++) { if (isCriterionSatisfied(allProviders[i], serviceName, algName, @@ -1082,7 +1080,7 @@ public final class Security { return Collections.EMPTY_SET; } - HashSet result = new HashSet(); + HashSet result = new HashSet<>(); Provider[] providers = Security.getProviders(); for (int i = 0; i < providers.length; i++) { diff --git a/src/share/classes/java/security/UnresolvedPermission.java b/src/share/classes/java/security/UnresolvedPermission.java index eeeccebca..9e4e1aed0 100644 --- a/src/share/classes/java/security/UnresolvedPermission.java +++ b/src/share/classes/java/security/UnresolvedPermission.java @@ -198,7 +198,7 @@ implements java.io.Serializable if (this.certs == null) { // extract the signer certs ArrayList signerCerts = - new ArrayList(); + new ArrayList<>(); i = 0; while (i < certs.length) { signerCerts.add(certs[i]); diff --git a/src/share/classes/java/security/UnresolvedPermissionCollection.java b/src/share/classes/java/security/UnresolvedPermissionCollection.java index c186596ee..01cf9f7ed 100644 --- a/src/share/classes/java/security/UnresolvedPermissionCollection.java +++ b/src/share/classes/java/security/UnresolvedPermissionCollection.java @@ -119,7 +119,7 @@ implements java.io.Serializable public Enumeration elements() { List results = - new ArrayList(); // where results are stored + new ArrayList<>(); // where results are stored // Get iterator of Map values (which are lists of permissions) synchronized (this) { @@ -161,7 +161,7 @@ implements java.io.Serializable // Copy perms into a Hashtable Hashtable> permissions = - new Hashtable>(perms.size()*2); + new Hashtable<>(perms.size()*2); // Convert each entry (List) into a Vector synchronized (this) { @@ -169,8 +169,7 @@ implements java.io.Serializable for (Map.Entry> e : set) { // Convert list into Vector List list = e.getValue(); - Vector vec = - new Vector(list.size()); + Vector vec = new Vector<>(list.size()); synchronized (list) { vec.addAll(list); } @@ -207,8 +206,7 @@ implements java.io.Serializable for (Map.Entry> e : set) { // Convert Vector into ArrayList Vector vec = e.getValue(); - List list = - new ArrayList(vec.size()); + List list = new ArrayList<>(vec.size()); list.addAll(vec); // Add to Hashtable being serialized diff --git a/src/share/classes/javax/security/auth/PrivateCredentialPermission.java b/src/share/classes/javax/security/auth/PrivateCredentialPermission.java index e78df3fdb..22cb6ef2d 100644 --- a/src/share/classes/javax/security/auth/PrivateCredentialPermission.java +++ b/src/share/classes/javax/security/auth/PrivateCredentialPermission.java @@ -329,7 +329,7 @@ public final class PrivateCredentialPermission extends Permission { throw new IllegalArgumentException("invalid empty name"); } - ArrayList pList = new ArrayList(); + ArrayList pList = new ArrayList<>(); StringTokenizer tokenizer = new StringTokenizer(name, " ", true); String principalClass = null; String principalName = null; diff --git a/src/share/classes/javax/security/auth/SubjectDomainCombiner.java b/src/share/classes/javax/security/auth/SubjectDomainCombiner.java index 9dc82fc01..6ac38515e 100644 --- a/src/share/classes/javax/security/auth/SubjectDomainCombiner.java +++ b/src/share/classes/javax/security/auth/SubjectDomainCombiner.java @@ -48,7 +48,7 @@ public class SubjectDomainCombiner implements java.security.DomainCombiner { private Subject subject; private WeakKeyValueMap cachedPDs = - new WeakKeyValueMap(); + new WeakKeyValueMap<>(); private Set principalSet; private Principal[] principals; diff --git a/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java b/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java index 09387897d..76dbf65af 100644 --- a/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java +++ b/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java @@ -361,7 +361,7 @@ final class KrbDelegationPermissionCollection extends PermissionCollection // Don't call out.defaultWriteObject() // Write out Vector - Vector permissions = new Vector(perms.size()); + Vector permissions = new Vector<>(perms.size()); synchronized (this) { permissions.addAll(perms); diff --git a/src/share/classes/javax/security/auth/kerberos/ServicePermission.java b/src/share/classes/javax/security/auth/kerberos/ServicePermission.java index 98d287815..e9aedd09b 100644 --- a/src/share/classes/javax/security/auth/kerberos/ServicePermission.java +++ b/src/share/classes/javax/security/auth/kerberos/ServicePermission.java @@ -569,7 +569,7 @@ final class KrbServicePermissionCollection extends PermissionCollection // Don't call out.defaultWriteObject() // Write out Vector - Vector permissions = new Vector(perms.size()); + Vector permissions = new Vector<>(perms.size()); synchronized (this) { permissions.addAll(perms); diff --git a/src/share/classes/sun/security/acl/AclEntryImpl.java b/src/share/classes/sun/security/acl/AclEntryImpl.java index 521e73b8f..2bc035469 100644 --- a/src/share/classes/sun/security/acl/AclEntryImpl.java +++ b/src/share/classes/sun/security/acl/AclEntryImpl.java @@ -37,7 +37,7 @@ import java.security.acl.*; */ public class AclEntryImpl implements AclEntry { private Principal user = null; - private Vector permissionSet = new Vector(10, 10); + private Vector permissionSet = new Vector<>(10, 10); private boolean negative = false; /** diff --git a/src/share/classes/sun/security/acl/AclImpl.java b/src/share/classes/sun/security/acl/AclImpl.java index 6a6da4bea..d8ea50d3f 100644 --- a/src/share/classes/sun/security/acl/AclImpl.java +++ b/src/share/classes/sun/security/acl/AclImpl.java @@ -41,15 +41,15 @@ public class AclImpl extends OwnerImpl implements Acl { // or principal. // private Hashtable allowedUsersTable = - new Hashtable(23); + new Hashtable<>(23); private Hashtable allowedGroupsTable = - new Hashtable(23); + new Hashtable<>(23); private Hashtable deniedUsersTable = - new Hashtable(23); + new Hashtable<>(23); private Hashtable deniedGroupsTable = - new Hashtable(23); + new Hashtable<>(23); private String aclName = null; - private Vector zeroSet = new Vector(1,1); + private Vector zeroSet = new Vector<>(1,1); /** @@ -294,7 +294,7 @@ public class AclImpl extends OwnerImpl implements Acl { // private static Enumeration union(Enumeration e1, Enumeration e2) { - Vector v = new Vector(20, 20); + Vector v = new Vector<>(20, 20); while (e1.hasMoreElements()) v.addElement(e1.nextElement()); @@ -313,7 +313,7 @@ public class AclImpl extends OwnerImpl implements Acl { // private Enumeration subtract(Enumeration e1, Enumeration e2) { - Vector v = new Vector(20, 20); + Vector v = new Vector<>(20, 20); while (e1.hasMoreElements()) v.addElement(e1.nextElement()); diff --git a/src/share/classes/sun/security/acl/GroupImpl.java b/src/share/classes/sun/security/acl/GroupImpl.java index e475b795c..586c705bc 100644 --- a/src/share/classes/sun/security/acl/GroupImpl.java +++ b/src/share/classes/sun/security/acl/GroupImpl.java @@ -34,7 +34,7 @@ import java.security.acl.*; * @author Satish Dharmaraj */ public class GroupImpl implements Group { - private Vector groupMembers = new Vector(50, 100); + private Vector groupMembers = new Vector<>(50, 100); private String group; /** @@ -131,7 +131,7 @@ public class GroupImpl implements Group { if (groupMembers.contains(member)) { return true; } else { - Vector alreadySeen = new Vector(10); + Vector alreadySeen = new Vector<>(10); return isMemberRecurse(member, alreadySeen); } } diff --git a/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java b/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java index 12c1db497..f74e69079 100644 --- a/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java +++ b/test/com/sun/security/auth/module/LdapLoginModule/CheckConfigs.java @@ -178,7 +178,7 @@ class SearchFirstMode extends LdapConfiguration { public SearchFirstMode() { super(); - Map options = new HashMap(4); + Map options = new HashMap<>(4); options.put("userProvider", "ldap://localhost:23456/dc=example,dc=com"); options.put("userFilter", "(&(uid={USERNAME})(objectClass=inetOrgPerson))"); @@ -213,7 +213,7 @@ class AuthFirstMode extends LdapConfiguration { public AuthFirstMode() { super(); - Map options = new HashMap(5); + Map options = new HashMap<>(5); options.put("userProvider", "ldap://localhost:23456/dc=example,dc=com"); options.put("authIdentity", "{USERNAME}"); options.put("userFilter", @@ -248,7 +248,7 @@ class AuthOnlyMode extends LdapConfiguration { public AuthOnlyMode() { super(); - Map options = new HashMap(4); + Map options = new HashMap<>(4); options.put("userProvider", "ldap://localhost:23456 ldap://localhost:23457"); options.put("authIdentity", diff --git a/test/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java b/test/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java index fb175ca71..3f7d8e3ba 100644 --- a/test/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java +++ b/test/com/sun/security/auth/module/LdapLoginModule/CheckOptions.java @@ -73,7 +73,7 @@ public class CheckOptions { // bad value for userProvider option - Map options = new HashMap(); + Map options = new HashMap<>(); options.put(USER_PROVIDER_OPTION, "ldap://localhost:23456"); ldap.initialize(subject, null, null, options); @@ -93,7 +93,7 @@ public class CheckOptions { LdapLoginModule ldap = new LdapLoginModule(); Subject subject = new Subject(); - Map options = new HashMap(); + Map options = new HashMap<>(); ldap.initialize(subject, null, null, options); try { @@ -110,7 +110,7 @@ public class CheckOptions { LdapLoginModule ldap = new LdapLoginModule(); Subject subject = new Subject(); - Map options = new HashMap(); + Map options = new HashMap<>(); CallbackHandler goodHandler = new MyCallbackHandler(true); ldap.initialize(subject, goodHandler, null, options); -- GitLab