8273261: Replace 'while' cycles with iterator with enhanced-for in java.base

Reviewed-by: dfuchs, rriggs, iris, mullan

src/java.base/share/classes/java/security/cert/X509CRLSelector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -314,9 +314,7 @@ public class X509CRLSelector implements CRLSelector {
         throws IOException
     {
         HashSet<Object> namesCopy = new HashSet<>();
-        Iterator<?> i = names.iterator();
+        for (Object nameObject : names) {
-        while (i.hasNext()) {
-            Object nameObject = i.next();
             if (!(nameObject instanceof byte []) &&
                 !(nameObject instanceof String))
                 throw new IOException("name not byte array or String");
@@ -573,9 +571,8 @@ public class X509CRLSelector implements CRLSelector {
         sb.append("X509CRLSelector: [\n");
         if (issuerNames != null) {
             sb.append("  IssuerNames:\n");
-            Iterator<Object> i = issuerNames.iterator();
+            for (Object issuerName : issuerNames)
-            while (i.hasNext())
+                sb.append("    " + issuerName + "\n");
-                sb.append("    " + i.next() + "\n");
         }
         if (minCRL != null)
             sb.append("  minCRLNumber: " + minCRL + "\n");

src/java.base/share/classes/java/security/cert/X509CertSelector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -1778,9 +1778,7 @@ public class X509CertSelector implements CertSelector {
                   + String.valueOf(matchAllSubjectAltNames) + "\n");
         if (subjectAlternativeNames != null) {
             sb.append("  SubjectAlternativeNames:\n");
-            Iterator<List<?>> i = subjectAlternativeNames.iterator();
+            for (List<?> list : subjectAlternativeNames) {
-            while (i.hasNext()) {
-                List<?> list = i.next();
                 sb.append("    type " + list.get(0) +
                           ", name " + list.get(1) + "\n");
             }
@@ -1823,9 +1821,8 @@ public class X509CertSelector implements CertSelector {
         }
         if (pathToGeneralNames != null) {
             sb.append("  Path to names:\n");
-            Iterator<GeneralNameInterface> i = pathToGeneralNames.iterator();
+            for (GeneralNameInterface pathToGeneralName : pathToGeneralNames) {
-            while (i.hasNext()) {
+                sb.append("    " + pathToGeneralName + "\n");
-                sb.append("    " + i.next() + "\n");
             }
         }
         sb.append("]");
@@ -2399,10 +2396,8 @@ public class X509CertSelector implements CertSelector {
             }
             if ((debug != null) && Debug.isOn("certpath")) {
                 debug.println("X509CertSelector.match pathToNames:\n");
-                Iterator<GeneralNameInterface> i =
+                for (GeneralNameInterface pathToGeneralName : pathToGeneralNames) {
-                                        pathToGeneralNames.iterator();
+                    debug.println("    " + pathToGeneralName + "\n");
-                while (i.hasNext()) {
-                    debug.println("    " + i.next() + "\n");
                 }
             }
 
@@ -2439,9 +2434,7 @@ public class X509CertSelector implements CertSelector {
         for (Iterator<GeneralSubtree> t = excluded.iterator(); t.hasNext(); ) {
             GeneralSubtree tree = t.next();
             GeneralNameInterface excludedName = tree.getName().getName();
-            Iterator<GeneralNameInterface> i = pathToGeneralNames.iterator();
+            for (GeneralNameInterface pathToName : pathToGeneralNames) {
-            while (i.hasNext()) {
-                GeneralNameInterface pathToName = i.next();
                 if (excludedName.getType() == pathToName.getType()) {
                     switch (pathToName.constrains(excludedName)) {
                     case GeneralNameInterface.NAME_WIDENS:
@@ -2468,9 +2461,7 @@ public class X509CertSelector implements CertSelector {
          * If not, return false. However, if no subtrees of a given type
          * are listed, all names of that type are permitted.
          */
-        Iterator<GeneralNameInterface> i = pathToGeneralNames.iterator();
+        for (GeneralNameInterface pathToName : pathToGeneralNames) {
-        while (i.hasNext()) {
-            GeneralNameInterface pathToName = i.next();
             Iterator<GeneralSubtree> t = permitted.iterator();
             boolean permittedNameFound = false;
             boolean nameTypeFound = false;

src/java.base/share/classes/java/text/AttributedString.java

@@ -158,9 +158,7 @@ public class AttributedString {
             runAttributes[0] = newRunAttributes;
             runAttributeValues[0] = newRunAttributeValues;
 
-            Iterator<? extends Map.Entry<? extends Attribute, ?>> iterator = attributes.entrySet().iterator();
+            for (Map.Entry<? extends Attribute, ?> entry : attributes.entrySet()) {
-            while (iterator.hasNext()) {
-                Map.Entry<? extends Attribute, ?> entry = iterator.next();
                 newRunAttributes.addElement(entry.getKey());
                 newRunAttributeValues.addElement(entry.getValue());
             }
@@ -264,9 +262,7 @@ public class AttributedString {
         // Get and set attribute runs for each attribute name. Need to
         // scan from the top of the text so that we can discard any
         // Annotation that is no longer applied to a subset text segment.
-        Iterator<Attribute> itr = keys.iterator();
+        for (Attribute attributeKey : keys) {
-        while (itr.hasNext()) {
-            Attribute attributeKey = itr.next();
             text.setIndex(textBeginIndex);
             while (text.getIndex() < endIndex) {
                 int start = text.getRunStart(attributeKey);
@@ -388,10 +384,7 @@ public class AttributedString {
         int beginRunIndex = ensureRunBreak(beginIndex);
         int endRunIndex = ensureRunBreak(endIndex);
 
-        Iterator<? extends Map.Entry<? extends Attribute, ?>> iterator =
+        for (Map.Entry<? extends Attribute, ?> entry : attributes.entrySet()) {
-            attributes.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry<? extends Attribute, ?> entry = iterator.next();
             addAttributeRunData(entry.getKey(), entry.getValue(), beginRunIndex, endRunIndex);
         }
     }
@@ -656,10 +649,8 @@ public class AttributedString {
 
     // returns whether all specified attributes have equal values in the runs with the given indices
     private boolean attributeValuesMatch(Set<? extends Attribute> attributes, int runIndex1, int runIndex2) {
-        Iterator<? extends Attribute> iterator = attributes.iterator();
+        for (Attribute key : attributes) {
-        while (iterator.hasNext()) {
+            if (!valuesMatch(getAttribute(key, runIndex1), getAttribute(key, runIndex2))) {
-            Attribute key = iterator.next();
-           if (!valuesMatch(getAttribute(key, runIndex1), getAttribute(key, runIndex2))) {
                 return false;
             }
         }
@@ -706,11 +697,8 @@ public class AttributedString {
         if (attrs != null && (size = attrs.size()) > 0) {
             Vector<Attribute> runAttrs = new Vector<>(size);
             Vector<Object> runValues = new Vector<>(size);
-            Iterator<Map.Entry<Attribute, Object>> iterator = attrs.entrySet().iterator();
-
-            while (iterator.hasNext()) {
-                Map.Entry<Attribute, Object> entry = iterator.next();
 
+            for (Map.Entry<Attribute, Object> entry : attrs.entrySet()) {
                 runAttrs.add(entry.getKey());
                 runValues.add(entry.getValue());
             }

src/java.base/share/classes/javax/security/auth/PrivateCredentialPermission.java

@@ -145,9 +145,7 @@ public final class PrivateCredentialPermission extends Permission {
             } else {
                 this.credOwners = new CredOwner[principals.size()];
                 int index = 0;
-                Iterator<Principal> i = principals.iterator();
+                for (Principal p : principals) {
-                while (i.hasNext()) {
-                    Principal p = i.next();
                     this.credOwners[index++] = new CredOwner
                                                 (p.getClass().getName(),
                                                 p.getName());

src/java.base/share/classes/javax/security/auth/Subject.java

@@ -886,18 +886,14 @@ public final class Subject implements java.io.Serializable {
         String suffix = "";
 
         synchronized(principals) {
-            Iterator<Principal> pI = principals.iterator();
+            for (Principal p : principals) {
-            while (pI.hasNext()) {
-                Principal p = pI.next();
                 suffix = suffix + ResourcesMgr.getString(".Principal.") +
                         p.toString() + ResourcesMgr.getString("NEWLINE");
             }
         }
 
         synchronized(pubCredentials) {
-            Iterator<Object> pI = pubCredentials.iterator();
+            for (Object o : pubCredentials) {
-            while (pI.hasNext()) {
-                Object o = pI.next();
                 suffix = suffix +
                         ResourcesMgr.getString(".Public.Credential.") +
                         o.toString() + ResourcesMgr.getString("NEWLINE");
@@ -951,17 +947,14 @@ public final class Subject implements java.io.Serializable {
         int hashCode = 0;
 
         synchronized(principals) {
-            Iterator<Principal> pIterator = principals.iterator();
+            for (Principal p : principals) {
-            while (pIterator.hasNext()) {
-                Principal p = pIterator.next();
                 hashCode ^= p.hashCode();
             }
         }
 
         synchronized(pubCredentials) {
-            Iterator<Object> pubCIterator = pubCredentials.iterator();
+            for (Object pubCredential : pubCredentials) {
-            while (pubCIterator.hasNext()) {
+                hashCode ^= getCredHashCode(pubCredential);
-                hashCode ^= getCredHashCode(pubCIterator.next());
             }
         }
         return hashCode;
@@ -1308,13 +1301,12 @@ public final class Subject implements java.io.Serializable {
                     });
                 }
 
-                Iterator<?> ce = c.iterator();
+                for (Object o : c) {
-                while (ce.hasNext()) {
+                    if (next.equals(o)) {
-                    if (next.equals(ce.next())) {
+                        e.remove();
-                            e.remove();
+                        modified = true;
-                            modified = true;
+                        break;
-                            break;
+                    }
-                        }
                 }
             }
             return modified;

src/java.base/share/classes/jdk/internal/util/jar/JarIndex.java

@@ -263,9 +263,8 @@ public class JarIndex {
                 bw.write(jar + "\n");
                 List<String> jarlist = jarMap.get(jar);
                 if (jarlist != null) {
-                    Iterator<String> listitr = jarlist.iterator();
+                    for (String s : jarlist) {
-                    while(listitr.hasNext()) {
+                        bw.write(s + "\n");
-                        bw.write(listitr.next() + "\n");
                     }
                 }
                 bw.write("\n");
@@ -320,14 +319,10 @@ public class JarIndex {
      *
      */
     public void merge(JarIndex toIndex, String path) {
-        Iterator<Map.Entry<String, List<String>>> itr = indexMap.entrySet().iterator();
+        for (Map.Entry<String, List<String>> e : indexMap.entrySet()) {
-        while(itr.hasNext()) {
-            Map.Entry<String, List<String>> e = itr.next();
             String packageName = e.getKey();
             List<String> from_list = e.getValue();
-            Iterator<String> listItr = from_list.iterator();
+            for (String jarName : from_list) {
-            while(listItr.hasNext()) {
-                String jarName = listItr.next();
                 if (path != null) {
                     jarName = path.concat(jarName);
                 }

src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java

@@ -46,7 +46,6 @@ import java.net.Proxy;
 import java.net.ProxySelector;
 import java.util.List;
 import java.util.StringTokenizer;
-import java.util.Iterator;
 import java.security.Permission;
 import java.util.Properties;
 import sun.net.NetworkClient;
@@ -250,9 +249,8 @@ public class FtpURLConnection extends URLConnection {
                 } catch (IllegalArgumentException iae) {
                     throw new IOException("Failed to select a proxy", iae);
                 }
-                final Iterator<Proxy> it = proxies.iterator();
+                for (Proxy proxy : proxies) {
-                while (it.hasNext()) {
+                    p = proxy;
-                    p = it.next();
                     if (p == null || p == Proxy.NO_PROXY ||
                         p.type() == Proxy.Type.SOCKS) {
                         break;

src/java.base/share/classes/sun/net/www/protocol/http/AuthCacheImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -79,9 +79,8 @@ public class AuthCacheImpl implements AuthCache {
             // list should contain only one element
             return (AuthenticationInfo)list.get (0);
         }
-        ListIterator<AuthCacheValue> iter = list.listIterator();
+        for (AuthCacheValue authCacheValue : list) {
-        while (iter.hasNext()) {
+            AuthenticationInfo inf = (AuthenticationInfo) authCacheValue;
-            AuthenticationInfo inf = (AuthenticationInfo)iter.next();
             if (skey.startsWith (inf.path)) {
                 return inf;
             }

src/java.base/share/classes/sun/security/provider/SubjectCodeSource.java

@@ -384,9 +384,7 @@ class SubjectCodeSource extends CodeSource implements java.io.Serializable {
             }
         }
         if (principals != null) {
-            ListIterator<PrincipalEntry> li = principals.listIterator();
+            for (PrincipalEntry pppe : principals) {
-            while (li.hasNext()) {
-                PrincipalEntry pppe = li.next();
                 returnMe = returnMe + ResourcesMgr.getAuthResourceString("NEWLINE") +
                         pppe.getPrincipalClass() + " " +
                         pppe.getPrincipalName();

src/java.base/share/classes/sun/security/tools/keytool/Main.java

@@ -1489,9 +1489,7 @@ public final class Main {
         info.set(X509CertInfo.SUBJECT,
                     dname==null?req.getSubjectName():new X500Name(dname));
         CertificateExtensions reqex = null;
-        Iterator<PKCS10Attribute> attrs = req.getAttributes().getAttributes().iterator();
+        for (PKCS10Attribute attr : req.getAttributes().getAttributes()) {
-        while (attrs.hasNext()) {
-            PKCS10Attribute attr = attrs.next();
             if (attr.getAttributeId().equals(PKCS9Attribute.EXTENSION_REQUEST_OID)) {
                 reqex = (CertificateExtensions)attr.getAttributeValue();
             }

src/java.base/share/classes/sun/security/x509/PolicyInformation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,6 @@ import java.io.IOException;
 import java.security.cert.PolicyQualifierInfo;
 import java.util.Collections;
 import java.util.Enumeration;
-import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -201,9 +200,7 @@ public class PolicyInformation {
                     "PolicyQualifierInfo can be set.");
             }
             if (obj instanceof Set) {
-                Iterator<?> i = ((Set<?>)obj).iterator();
+                for (Object obj1 : (Set<?>) obj) {
-                while (i.hasNext()) {
-                    Object obj1 = i.next();
                     if (!(obj1 instanceof PolicyQualifierInfo)) {
                         throw new IOException("Attribute value must be a" +
                                     "Set of PolicyQualifierInfo objects.");