You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/09/14 18:47:24 UTC

[commons-pool] branch master updated: Use Java 5 for each loop

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-pool.git


The following commit(s) were added to refs/heads/master by this push:
     new 2b3c92d3 Use Java 5 for each loop
2b3c92d3 is described below

commit 2b3c92d30597e5839ee4098917fb0b8c5b4b22d0
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Sep 14 14:47:20 2022 -0400

    Use Java 5 for each loop
---
 src/test/java/org/apache/commons/pool2/TestPoolUtils.java | 9 ++-------
 src/test/java/org/apache/commons/pool2/WaiterFactory.java | 5 +----
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/test/java/org/apache/commons/pool2/TestPoolUtils.java b/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
index 993a2658..d73abff7 100644
--- a/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
+++ b/src/test/java/org/apache/commons/pool2/TestPoolUtils.java
@@ -30,7 +30,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -184,9 +183,7 @@ public class TestPoolUtils {
             assertEquals(2, kop.getNumIdle());
         }
         int makeObjectCount = 0;
-        final Iterator<String> iter = calledMethods.iterator();
-        while (iter.hasNext()) {
-            final String methodName = iter.next();
+        for (String methodName : calledMethods) {
             if ("makeObject".equals(methodName)) {
                 makeObjectCount++;
             }
@@ -299,9 +296,7 @@ public class TestPoolUtils {
             assertEquals(2, op.getNumIdle());
         }
         int makeObjectCount = 0;
-        final Iterator<String> iter = calledMethods.iterator();
-        while (iter.hasNext()) {
-            final String methodName = iter.next();
+        for (String methodName : calledMethods) {
             if ("makeObject".equals(methodName)) {
                 makeObjectCount++;
             }
diff --git a/src/test/java/org/apache/commons/pool2/WaiterFactory.java b/src/test/java/org/apache/commons/pool2/WaiterFactory.java
index db4be296..a6b12625 100644
--- a/src/test/java/org/apache/commons/pool2/WaiterFactory.java
+++ b/src/test/java/org/apache/commons/pool2/WaiterFactory.java
@@ -18,7 +18,6 @@
 package org.apache.commons.pool2;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
 import org.apache.commons.pool2.impl.DefaultPooledObject;
@@ -194,9 +193,7 @@ public class WaiterFactory<K> implements PooledObjectFactory<Waiter, IllegalStat
         if (activeCounts.isEmpty()) {
             return;
         }
-        final Iterator<K> it = activeCounts.keySet().iterator();
-        while (it.hasNext()) {
-            final K key = it.next();
+        for (K key : activeCounts.keySet()) {
             activeCounts.put(key, Integer.valueOf(0));
         }
     }