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-logging.git
The following commit(s) were added to refs/heads/master by this push:
new cd99c41 Use for-each. Use final. Remove redundant modifiers.
cd99c41 is described below
commit cd99c4164f484b2ccbf46b133aa717431f8e60d5
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Nov 21 13:39:02 2020 -0500
Use for-each. Use final. Remove redundant modifiers.
---
.../org/apache/commons/logging/impl/LogFactoryImpl.java | 4 ++--
.../org/apache/commons/logging/impl/WeakHashtable.java | 13 ++++++-------
.../java/org/apache/commons/logging/LoadTestCase.java | 4 ++--
.../org/apache/commons/logging/PathableClassLoader.java | 13 +++++--------
.../commons/logging/impl/WeakHashtableTestCase.java | 15 +++++++--------
5 files changed, 22 insertions(+), 27 deletions(-)
diff --git a/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
b/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
index 3582d03..8c2d12d 100644
--- a/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
+++ b/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
@@ -1322,8 +1322,8 @@ public class LogFactoryImpl extends LogFactory {
boolean implementsLog = false;
final String logInterfaceName = Log.class.getName();
final Class interfaces[] = badClass.getInterfaces();
- for (int i = 0; i < interfaces.length; i++) {
- if (logInterfaceName.equals(interfaces[i].getName())) {
+ for (final Class element : interfaces) {
+ if (logInterfaceName.equals(element.getName())) {
implementsLog = true;
break;
}
diff --git a/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java
b/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java
index e5ba364..f0ab3c1 100644
--- a/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java
+++ b/src/main/java/org/apache/commons/logging/impl/WeakHashtable.java
@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Hashtable;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -160,8 +159,8 @@ public final class WeakHashtable extends Hashtable {
purge();
final Set referencedEntries = super.entrySet();
final Set unreferencedEntries = new HashSet();
- for (final Iterator it=referencedEntries.iterator(); it.hasNext();) {
- final Map.Entry entry = (Map.Entry) it.next();
+ for (final Object referencedEntry : referencedEntries) {
+ final Map.Entry entry = (Map.Entry) referencedEntry;
final Referenced referencedKey = (Referenced) entry.getKey();
final Object key = referencedKey.getValue();
final Object value = entry.getValue();
@@ -206,8 +205,8 @@ public final class WeakHashtable extends Hashtable {
purge();
final Set referencedKeys = super.keySet();
final Set unreferencedKeys = new HashSet();
- for (final Iterator it=referencedKeys.iterator(); it.hasNext();) {
- final Referenced referenceKey = (Referenced) it.next();
+ for (final Object referencedKey : referencedKeys) {
+ final Referenced referenceKey = (Referenced) referencedKey;
final Object keyValue = referenceKey.getValue();
if (keyValue != null) {
unreferencedKeys.add(keyValue);
@@ -249,8 +248,8 @@ public final class WeakHashtable extends Hashtable {
public void putAll(final Map t) {
if (t != null) {
final Set entrySet = t.entrySet();
- for (final Iterator it=entrySet.iterator(); it.hasNext();) {
- final Map.Entry entry = (Map.Entry) it.next();
+ for (final Object element : entrySet) {
+ final Map.Entry entry = (Map.Entry) element;
put(entry.getKey(), entry.getValue());
}
}
diff --git a/src/test/java/org/apache/commons/logging/LoadTestCase.java
b/src/test/java/org/apache/commons/logging/LoadTestCase.java
index 13ac5aa..6e32285 100644
--- a/src/test/java/org/apache/commons/logging/LoadTestCase.java
+++ b/src/test/java/org/apache/commons/logging/LoadTestCase.java
@@ -85,8 +85,8 @@ public class LoadTestCase extends TestCase{
//isolates all logging classes, application in the same
classloader too.
//filters exeptions to simlify handling in test
- for(int i = 0; i < LOG_PCKG.length; i++ ){
- if( name.startsWith( LOG_PCKG[i] ) &&
+ for (final String element : LOG_PCKG) {
+ if( name.startsWith( element ) &&
name.indexOf("Exception") == -1 ){
return def(name);
}
diff --git a/src/test/java/org/apache/commons/logging/PathableClassLoader.java
b/src/test/java/org/apache/commons/logging/PathableClassLoader.java
index cbb04dd..55d385b 100644
--- a/src/test/java/org/apache/commons/logging/PathableClassLoader.java
+++ b/src/test/java/org/apache/commons/logging/PathableClassLoader.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
/**
@@ -179,8 +178,8 @@ public class PathableClassLoader extends URLClassLoader {
* Specify a collection of logical libraries. See addLogicalLib.
*/
public void addLogicalLib(final String[] logicalLibs) {
- for(int i=0; i<logicalLibs.length; ++i) {
- addLogicalLib(logicalLibs[i]);
+ for (final String logicalLib : logicalLibs) {
+ addLogicalLib(logicalLib);
}
}
@@ -260,9 +259,7 @@ public class PathableClassLoader extends URLClassLoader {
final URL[] path = ucl.getURLs();
URL shortestMatch = null;
int shortestMatchLen = Integer.MAX_VALUE;
- for(int i=0; i<path.length; ++i) {
- final URL u = path[i];
-
+ for (final URL u : path) {
// extract the filename bit on the end of the url
String filename = u.toString();
if (!filename.endsWith(".jar")) {
@@ -302,8 +299,8 @@ public class PathableClassLoader extends URLClassLoader {
}
if (lookasides != null) {
- for(final Iterator i = lookasides.entrySet().iterator();
i.hasNext(); ) {
- final Map.Entry entry = (Map.Entry) i.next();
+ for (final Object element : lookasides.entrySet()) {
+ final Map.Entry entry = (Map.Entry) element;
final String prefix = (String) entry.getKey();
if (name.startsWith(prefix) == true) {
final ClassLoader loader = (ClassLoader) entry.getValue();
diff --git
a/src/test/java/org/apache/commons/logging/impl/WeakHashtableTestCase.java
b/src/test/java/org/apache/commons/logging/impl/WeakHashtableTestCase.java
index d0ae4e6..d0e9079 100644
--- a/src/test/java/org/apache/commons/logging/impl/WeakHashtableTestCase.java
+++ b/src/test/java/org/apache/commons/logging/impl/WeakHashtableTestCase.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Set;
@@ -118,8 +117,8 @@ public class WeakHashtableTestCase extends TestCase {
/** Tests public Set entrySet() */
public void testEntrySet() throws Exception {
final Set entrySet = weakHashtable.entrySet();
- for (final Iterator it = entrySet.iterator(); it.hasNext();) {
- final Map.Entry entry = (Map.Entry) it.next();
+ for (final Object element : entrySet) {
+ final Map.Entry entry = (Map.Entry) element;
final Object key = entry.getKey();
if (keyOne.equals(key)) {
assertEquals(valueOne, entry.getValue());
@@ -293,15 +292,15 @@ public class WeakHashtableTestCase extends TestCase {
t[i].setDaemon(true); // Otherwise we cannot exit
t[i].start();
}
- for (int i = 0; i < t.length; i++) {
- t[i].join(WAIT_FOR_THREAD_COMPLETION);
- if (t[i].isAlive()) {
+ for (final Thread element : t) {
+ element.join(WAIT_FOR_THREAD_COMPLETION);
+ if (element.isAlive()) {
break; // at least one thread is stuck
}
}
int active=0;
- for (int i = 0; i < t.length; i++) {
- if (t[i].isAlive()) {
+ for (final Thread element : t) {
+ if (element.isAlive()) {
active++;
}
}
