Collapse loops using the removeIf syntax

Change-Id: I9d51ad16f375541f6cd0a7f231d5f2771d7c3ef9

java/com/google/gerrit/common/data/AccessSection.java

@@ -18,7 +18,6 @@ import com.google.gerrit.common.Nullable;
 import com.google.gerrit.reviewdb.client.Project;
 import java.util.ArrayList;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -94,11 +93,7 @@ public class AccessSection extends RefConfigSection implements Comparable<Access
 
   public void removePermission(String name) {
     if (permissions != null) {
-      for (Iterator<Permission> itr = permissions.iterator(); itr.hasNext(); ) {
+      permissions.removeIf(permission -> name.equalsIgnoreCase(permission.getName()));
-        if (name.equalsIgnoreCase(itr.next().getName())) {
-          itr.remove();
-        }
-      }
     }
   }
 

java/com/google/gerrit/common/data/Permission.java

@@ -177,11 +177,7 @@ public class Permission implements Comparable<Permission> {
 
   public void removeRule(GroupReference group) {
     if (rules != null) {
-      for (Iterator<PermissionRule> itr = rules.iterator(); itr.hasNext(); ) {
+      rules.removeIf(permissionRule -> sameGroup(permissionRule, group));
-        if (sameGroup(itr.next(), group)) {
-          itr.remove();
-        }
-      }
     }
   }
 

java/com/google/gerrit/metrics/dropwizard/BucketedCallback.java

@@ -21,7 +21,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import com.google.gerrit.metrics.Description;
 import com.google.gerrit.metrics.Field;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -67,12 +66,7 @@ abstract class BucketedCallback<V> implements BucketedMetric {
   }
 
   void doPrune() {
-    Iterator<Map.Entry<Object, ValueGauge>> i = cells.entrySet().iterator();
+    cells.entrySet().removeIf(objectValueGaugeEntry -> !objectValueGaugeEntry.getValue().set);
-    while (i.hasNext()) {
-      if (!i.next().getValue().set) {
-        i.remove();
-      }
-    }
   }
 
   void doEndSet() {

java/com/google/gerrit/pgm/init/BaseInit.java

@@ -72,7 +72,6 @@ import java.nio.file.SimpleFileVisitor;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import javax.sql.DataSource;
@@ -202,12 +201,7 @@ public class BaseInit extends SiteProgram {
       }
       List<String> names = pluginsDistribution.listPluginNames();
       if (pluginsToInstall != null) {
-        for (Iterator<String> i = names.iterator(); i.hasNext(); ) {
+        names.removeIf(n -> !pluginsToInstall.contains(n));
-          String n = i.next();
-          if (!pluginsToInstall.contains(n)) {
-            i.remove();
-          }
-        }
       }
       return names;
     } catch (FileNotFoundException e) {

java/com/google/gerrit/server/mail/send/EmailHeader.java

@@ -23,7 +23,6 @@ import java.io.Writer;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -185,11 +184,7 @@ public abstract class EmailHeader {
     }
 
     void remove(java.lang.String email) {
-      for (Iterator<Address> i = list.iterator(); i.hasNext(); ) {
+      list.removeIf(address -> address.getEmail().equals(email));
-        if (i.next().getEmail().equals(email)) {
-          i.remove();
-        }
-      }
     }
 
     @Override