diff --git a/core/src/main/java/hudson/ExtensionList.java b/core/src/main/java/hudson/ExtensionList.java index 566e3de404911db2fbc418bab933a4bdd8261c79..b4d32bd06de26ce86f0e55ea1f03606e098736bf 100644 --- a/core/src/main/java/hudson/ExtensionList.java +++ b/core/src/main/java/hudson/ExtensionList.java @@ -245,8 +245,7 @@ public class ExtensionList extends AbstractList implements OnMaster { } private boolean removeComponent(Collection> collection, Object t) { - for (Iterator> itr = collection.iterator(); itr.hasNext();) { - ExtensionComponent c = itr.next(); + for (ExtensionComponent c : collection) { if (c.getInstance().equals(t)) { return collection.remove(c); } diff --git a/core/src/main/java/hudson/Util.java b/core/src/main/java/hudson/Util.java index 64ebe02eb7b59b2ef385b8016cb0a87a37162fdd..9699df02c892fd24444ea6282765c55531d31cd9 100644 --- a/core/src/main/java/hudson/Util.java +++ b/core/src/main/java/hudson/Util.java @@ -1463,9 +1463,9 @@ public class Util { public static int permissionsToMode(Set permissions) { PosixFilePermission[] allPermissions = PosixFilePermission.values(); int result = 0; - for (int i = 0; i < allPermissions.length; i++) { + for (PosixFilePermission allPermission : allPermissions) { result <<= 1; - result |= permissions.contains(allPermissions[i]) ? 1 : 0; + result |= permissions.contains(allPermission) ? 1 : 0; } return result; } diff --git a/core/src/main/java/hudson/model/DependencyGraph.java b/core/src/main/java/hudson/model/DependencyGraph.java index 237eba1b40f50ad180a722999aca36a9559b94f9..6c7469a3021b397ba34b512502290ff7f053b21d 100644 --- a/core/src/main/java/hudson/model/DependencyGraph.java +++ b/core/src/main/java/hudson/model/DependencyGraph.java @@ -339,10 +339,9 @@ public class DependencyGraph implements Comparator { set = new ArrayList(); map.put(key,set); } - for (ListIterator it = set.listIterator(); it.hasNext();) { - DependencyGroup d = it.next(); + for (DependencyGroup d : set) { // Check for existing edge that connects the same two projects: - if (d.getUpstreamProject()==dep.getUpstreamProject() && d.getDownstreamProject()==dep.getDownstreamProject()) { + if (d.getUpstreamProject() == dep.getUpstreamProject() && d.getDownstreamProject() == dep.getDownstreamProject()) { d.add(dep); return; } diff --git a/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java b/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java index c93d4c77c21f2f98cc3743ea4b128451b6344a91..c412919d5915b80ce0d8a8ccf4636d29e74ace5b 100644 --- a/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java +++ b/core/src/main/java/hudson/security/TokenBasedRememberMeServices2.java @@ -189,9 +189,9 @@ public class TokenBasedRememberMeServices2 extends TokenBasedRememberMeServices return null; } - for (int i = 0; i < cookies.length; i++) { - if (ACEGI_SECURITY_HASHED_REMEMBER_ME_COOKIE_KEY.equals(cookies[i].getName())) { - return cookies[i].getValue(); + for (Cookie cookie : cookies) { + if (ACEGI_SECURITY_HASHED_REMEMBER_ME_COOKIE_KEY.equals(cookie.getName())) { + return cookie.getValue(); } } diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java index c563180e0130d1c4060d335942979db68779ff25..959bbaebc0ae90686cc3296bda7f78c8dc92cf7b 100644 --- a/core/src/main/java/hudson/tasks/Fingerprinter.java +++ b/core/src/main/java/hudson/tasks/Fingerprinter.java @@ -154,8 +154,8 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD RunList builds = owner.getBuilds(); Set seenUpstreamProjects = new HashSet(); - for ( ListIterator iter = builds.listIterator(); iter.hasNext(); ) { - Run build = (Run) iter.next(); + for (Object build1 : builds) { + Run build = (Run) build1; for (FingerprintAction action : build.getActions(FingerprintAction.class)) { for (AbstractProject key : action.getDependencies().keySet()) { if (key == owner) { diff --git a/core/src/main/java/hudson/util/MultipartFormDataParser.java b/core/src/main/java/hudson/util/MultipartFormDataParser.java index a09a153046610a9522bb6cfe3687da80964dd874..96296247a8809a95b352ccca293e20485950d842 100644 --- a/core/src/main/java/hudson/util/MultipartFormDataParser.java +++ b/core/src/main/java/hudson/util/MultipartFormDataParser.java @@ -96,8 +96,8 @@ public class MultipartFormDataParser implements AutoCloseable { return false; } - for (int i = 0; i < parts.length; i++) { - if ("multipart/form-data".equals(parts[i])) { + for (String part : parts) { + if ("multipart/form-data".equals(part)) { return true; } } diff --git a/core/src/main/java/hudson/util/RobustReflectionConverter.java b/core/src/main/java/hudson/util/RobustReflectionConverter.java index 92271bf1c35b908dc1048b8e474260a46666c341..68d2dc816fa28111fe65edd3e688a343b15b9419 100644 --- a/core/src/main/java/hudson/util/RobustReflectionConverter.java +++ b/core/src/main/java/hudson/util/RobustReflectionConverter.java @@ -212,8 +212,7 @@ public class RobustReflectionConverter implements Converter { if (mapping != null) { if (mapping.getItemFieldName() != null) { Collection list = (Collection) newObj; - for (Iterator iter = list.iterator(); iter.hasNext();) { - Object obj = iter.next(); + for (Object obj : list) { writeField(fieldName, mapping.getItemFieldName(), mapping.getItemType(), definedIn, obj); } } else { diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/RegexValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/RegexValidator.java index eebc3747d9ab4f85a0896b1da1d240d1f1068456..c6a7bb1cb25b2b6a861d8ebcde3b9d6fa24ce29a 100644 --- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/RegexValidator.java +++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/RegexValidator.java @@ -149,8 +149,8 @@ public class RegexValidator implements Serializable { if (value == null) { return false; } - for (int i = 0; i < patterns.length; i++) { - if (patterns[i].matcher(value).matches()) { + for (Pattern pattern : patterns) { + if (pattern.matcher(value).matches()) { return true; } } @@ -169,13 +169,13 @@ public class RegexValidator implements Serializable { if (value == null) { return null; } - for (int i = 0; i < patterns.length; i++) { - Matcher matcher = patterns[i].matcher(value); + for (Pattern pattern : patterns) { + Matcher matcher = pattern.matcher(value); if (matcher.matches()) { int count = matcher.groupCount(); String[] groups = new String[count]; for (int j = 0; j < count; j++) { - groups[j] = matcher.group(j+1); + groups[j] = matcher.group(j + 1); } return groups; } @@ -196,8 +196,8 @@ public class RegexValidator implements Serializable { if (value == null) { return null; } - for (int i = 0; i < patterns.length; i++) { - Matcher matcher = patterns[i].matcher(value); + for (Pattern pattern : patterns) { + Matcher matcher = pattern.matcher(value); if (matcher.matches()) { int count = matcher.groupCount(); if (count == 1) { @@ -205,7 +205,7 @@ public class RegexValidator implements Serializable { } StringBuilder buffer = new StringBuilder(); for (int j = 0; j < count; j++) { - String component = matcher.group(j+1); + String component = matcher.group(j + 1); if (component != null) { buffer.append(component); } diff --git a/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java b/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java index f309b177e63653a46b491c15cbefa44ba432900c..3d7e082f35b20bde8fb36da91be945965cf0335b 100644 --- a/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java +++ b/core/src/main/java/jenkins/org/apache/commons/validator/routines/UrlValidator.java @@ -284,8 +284,8 @@ public class UrlValidator implements Serializable { schemes = DEFAULT_SCHEMES; } allowedSchemes = new HashSet(schemes.length); - for(int i=0; i < schemes.length; i++) { - allowedSchemes.add(schemes[i].toLowerCase(Locale.ENGLISH)); + for (String scheme : schemes) { + allowedSchemes.add(scheme.toLowerCase(Locale.ENGLISH)); } } diff --git a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java index 5172188b1710f7c3dc64fe4a579d3c17c564e88e..2f851ac2d786c3086242789290a950b414ec06d7 100644 --- a/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java +++ b/core/src/main/java/jenkins/security/LastGrantedAuthoritiesProperty.java @@ -56,10 +56,10 @@ public class LastGrantedAuthoritiesProperty extends UserProperty { List grantedAuthorities = new ArrayList<>(roles.length + 1); grantedAuthorities.add(new GrantedAuthorityImpl(authenticatedRole)); - for (int i = 0; i < roles.length; i++){ + for (String role : roles) { // to avoid having twice that role - if(!authenticatedRole.equals(roles[i])){ - grantedAuthorities.add(new GrantedAuthorityImpl(roles[i])); + if (!authenticatedRole.equals(role)) { + grantedAuthorities.add(new GrantedAuthorityImpl(role)); } } diff --git a/core/src/main/java/jenkins/util/TreeString.java b/core/src/main/java/jenkins/util/TreeString.java index 86dbced012f2569690d84ea8d7760602c343ef7a..6d548891440048c9c7ec15a799150e3943b82d69 100644 --- a/core/src/main/java/jenkins/util/TreeString.java +++ b/core/src/main/java/jenkins/util/TreeString.java @@ -124,8 +124,8 @@ public final class TreeString implements Serializable { public int hashCode() { int h = parent == null ? 0 : parent.hashCode(); - for (int i = 0; i < label.length; i++) { - h = 31 * h + label[i]; + for (char c : label) { + h = 31 * h + c; } assert toString().hashCode() == h; diff --git a/core/src/main/java/jenkins/util/VirtualFile.java b/core/src/main/java/jenkins/util/VirtualFile.java index 24c32b211bdc0feeb049432737463c2f7d01df29..a79c06a2f262740e342b256e464647846b851ea9 100644 --- a/core/src/main/java/jenkins/util/VirtualFile.java +++ b/core/src/main/java/jenkins/util/VirtualFile.java @@ -191,8 +191,7 @@ public abstract class VirtualFile implements Comparable, Serializab public @Nonnull List listOnlyDescendants() throws IOException { VirtualFile[] children = list(); List result = new ArrayList<>(); - for (int i = 0; i < children.length; i++) { - VirtualFile child = children[i]; + for (VirtualFile child : children) { if (child.isDescendant("")) { result.add(child); }