Siphalor/tweed5-commons-logging
1
0
Fork 0
Code Activity

Use for-each. Use final. Remove redundant modifiers.

Browse Source
This commit is contained in:
Gary Gregory
2020-11-21 13:39:02 -05:00
parent 66aa7aacbe
commit cd99c4164f
5 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
View File

@@ -1322,8 +1322,8 @@ public class LogFactoryImpl extends LogFactory {
boolean implementsLog = false; boolean implementsLog = false;
final String logInterfaceName = Log.class.getName(); final String logInterfaceName = Log.class.getName();
final Class interfaces[] = badClass.getInterfaces(); final Class interfaces[] = badClass.getInterfaces();
for (int i = 0; i < interfaces.length; i++) { for (final Class element : interfaces) {
if (logInterfaceName.equals(interfaces[i].getName())) { if (logInterfaceName.equals(element.getName())) {
implementsLog = true; implementsLog = true;
break; break;
} }

13
src/main/java/org/apache/commons/logging/impl/WeakHashtable.java
View File

@@ -24,7 +24,6 @@ import java.util.Collection;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashSet; import java.util.HashSet;
import java.util.Hashtable; import java.util.Hashtable;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -160,8 +159,8 @@ public final class WeakHashtable extends Hashtable {
purge(); purge();
final Set referencedEntries = super.entrySet(); final Set referencedEntries = super.entrySet();
final Set unreferencedEntries = new HashSet(); final Set unreferencedEntries = new HashSet();
for (final Iterator it=referencedEntries.iterator(); it.hasNext();) { for (final Object referencedEntry : referencedEntries) {
final Map.Entry entry = (Map.Entry) it.next(); final Map.Entry entry = (Map.Entry) referencedEntry;
final Referenced referencedKey = (Referenced) entry.getKey(); final Referenced referencedKey = (Referenced) entry.getKey();
final Object key = referencedKey.getValue(); final Object key = referencedKey.getValue();
final Object value = entry.getValue(); final Object value = entry.getValue();
@@ -206,8 +205,8 @@ public final class WeakHashtable extends Hashtable {
purge(); purge();
final Set referencedKeys = super.keySet(); final Set referencedKeys = super.keySet();
final Set unreferencedKeys = new HashSet(); final Set unreferencedKeys = new HashSet();
for (final Iterator it=referencedKeys.iterator(); it.hasNext();) { for (final Object referencedKey : referencedKeys) {
final Referenced referenceKey = (Referenced) it.next(); final Referenced referenceKey = (Referenced) referencedKey;
final Object keyValue = referenceKey.getValue(); final Object keyValue = referenceKey.getValue();
if (keyValue != null) { if (keyValue != null) {
unreferencedKeys.add(keyValue); unreferencedKeys.add(keyValue);
@@ -249,8 +248,8 @@ public final class WeakHashtable extends Hashtable {
public void putAll(final Map t) { public void putAll(final Map t) {
if (t != null) { if (t != null) {
final Set entrySet = t.entrySet(); final Set entrySet = t.entrySet();
for (final Iterator it=entrySet.iterator(); it.hasNext();) { for (final Object element : entrySet) {
final Map.Entry entry = (Map.Entry) it.next(); final Map.Entry entry = (Map.Entry) element;
put(entry.getKey(), entry.getValue()); put(entry.getKey(), entry.getValue());
} }
} }

4
src/test/java/org/apache/commons/logging/LoadTestCase.java
View File

@@ -85,8 +85,8 @@ public class LoadTestCase extends TestCase{
//isolates all logging classes, application in the same classloader too. //isolates all logging classes, application in the same classloader too.
//filters exeptions to simlify handling in test //filters exeptions to simlify handling in test
for(int i = 0; i < LOG_PCKG.length; i++ ){ for (final String element : LOG_PCKG) {
if( name.startsWith( LOG_PCKG[i] ) && if( name.startsWith( element ) &&
name.indexOf("Exception") == -1 ){ name.indexOf("Exception") == -1 ){
return def(name); return def(name);
} }

13
src/test/java/org/apache/commons/logging/PathableClassLoader.java
View File

@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.Map; import java.util.Map;
/** /**
@@ -179,8 +178,8 @@ public class PathableClassLoader extends URLClassLoader {
* Specify a collection of logical libraries. See addLogicalLib. * Specify a collection of logical libraries. See addLogicalLib.
*/ */
public void addLogicalLib(final String[] logicalLibs) { public void addLogicalLib(final String[] logicalLibs) {
for(int i=0; i<logicalLibs.length; ++i) { for (final String logicalLib : logicalLibs) {
addLogicalLib(logicalLibs[i]); addLogicalLib(logicalLib);
} }
} }
@@ -260,9 +259,7 @@ public class PathableClassLoader extends URLClassLoader {
final URL[] path = ucl.getURLs(); final URL[] path = ucl.getURLs();
URL shortestMatch = null; URL shortestMatch = null;
int shortestMatchLen = Integer.MAX_VALUE; int shortestMatchLen = Integer.MAX_VALUE;
for(int i=0; i<path.length; ++i) { for (final URL u : path) {
final URL u = path[i];
// extract the filename bit on the end of the url // extract the filename bit on the end of the url
String filename = u.toString(); String filename = u.toString();
if (!filename.endsWith(".jar")) { if (!filename.endsWith(".jar")) {
@@ -302,8 +299,8 @@ public class PathableClassLoader extends URLClassLoader {
} }
if (lookasides != null) { if (lookasides != null) {
for(final Iterator i = lookasides.entrySet().iterator(); i.hasNext(); ) { for (final Object element : lookasides.entrySet()) {
final Map.Entry entry = (Map.Entry) i.next(); final Map.Entry entry = (Map.Entry) element;
final String prefix = (String) entry.getKey(); final String prefix = (String) entry.getKey();
if (name.startsWith(prefix) == true) { if (name.startsWith(prefix) == true) {
final ClassLoader loader = (ClassLoader) entry.getValue(); final ClassLoader loader = (ClassLoader) entry.getValue();

15
src/test/java/org/apache/commons/logging/impl/WeakHashtableTestCase.java
View File

@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -118,8 +117,8 @@ public class WeakHashtableTestCase extends TestCase {
/** Tests public Set entrySet() */ /** Tests public Set entrySet() */
public void testEntrySet() throws Exception { public void testEntrySet() throws Exception {
final Set entrySet = weakHashtable.entrySet(); final Set entrySet = weakHashtable.entrySet();
for (final Iterator it = entrySet.iterator(); it.hasNext();) { for (final Object element : entrySet) {
final Map.Entry entry = (Map.Entry) it.next(); final Map.Entry entry = (Map.Entry) element;
final Object key = entry.getKey(); final Object key = entry.getKey();
if (keyOne.equals(key)) { if (keyOne.equals(key)) {
assertEquals(valueOne, entry.getValue()); assertEquals(valueOne, entry.getValue());
@@ -293,15 +292,15 @@ public class WeakHashtableTestCase extends TestCase {
t[i].setDaemon(true); // Otherwise we cannot exit t[i].setDaemon(true); // Otherwise we cannot exit
t[i].start(); t[i].start();
} }
for (int i = 0; i < t.length; i++) { for (final Thread element : t) {
t[i].join(WAIT_FOR_THREAD_COMPLETION); element.join(WAIT_FOR_THREAD_COMPLETION);
if (t[i].isAlive()) { if (element.isAlive()) {
break; // at least one thread is stuck break; // at least one thread is stuck
} }
} }
int active=0; int active=0;
for (int i = 0; i < t.length; i++) { for (final Thread element : t) {
if (t[i].isAlive()) { if (element.isAlive()) {
active++; active++;
} }
} }