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 58b1369 Normalize array type declarations
58b1369 is described below
commit 58b1369ac17e31d5a8ae16c9acf2dfe289e0368b
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Aug 23 08:48:30 2023 -0400
Normalize array type declarations
---
src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java | 2 +-
.../java/org/apache/commons/logging/impl/LogFactoryImpl.java | 10 +++++-----
src/test/java/org/apache/commons/logging/LoadTestCase.java | 4 ++--
.../org/apache/commons/logging/jdk14/CustomConfigTestCase.java | 4 ++--
.../apache/commons/logging/jdk14/DefaultConfigTestCase.java | 2 +-
.../java/org/apache/commons/logging/log4j/StandardTests.java | 2 +-
.../org/apache/commons/logging/logkit/StandardTestCase.java | 2 +-
.../apache/commons/logging/simple/CustomConfigTestCase.java | 4 ++--
.../apache/commons/logging/simple/DefaultConfigTestCase.java | 2 +-
9 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java
b/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java
index 2eb00ec..034e4fb 100644
--- a/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java
+++ b/src/main/java/org/apache/commons/logging/impl/Jdk14Logger.java
@@ -72,7 +72,7 @@ public class Jdk14Logger implements Log, Serializable {
if (logger.isLoggable(level)) {
// Hack (?) to get the stack trace.
final Throwable dummyException = new Throwable();
- final StackTraceElement locations[] =
dummyException.getStackTrace();
+ final StackTraceElement[] locations =
dummyException.getStackTrace();
// LOGGING-132: use the provided logger name instead of the class
name
final String cname = name;
String method = "unknown";
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 e23f589..cec1e89 100644
--- a/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
+++ b/src/main/java/org/apache/commons/logging/impl/LogFactoryImpl.java
@@ -209,7 +209,7 @@ public class LogFactoryImpl extends LogFactory {
/**
* The signature of the Constructor to be used.
*/
- protected Class logConstructorSignature[] = { java.lang.String.class };
+ protected Class[] logConstructorSignature = { java.lang.String.class };
/**
* The one-argument {@code setLogFactory} method of the selected
@@ -220,7 +220,7 @@ public class LogFactoryImpl extends LogFactory {
/**
* The signature of the {@code setLogFactory} method to be used.
*/
- protected Class logMethodSignature[] = { LogFactory.class };
+ protected Class[] logMethodSignature = { LogFactory.class };
/**
* See getBaseClassLoader and initConfiguration.
@@ -555,12 +555,12 @@ public class LogFactoryImpl extends LogFactory {
instance = discoverLogImplementation(name);
}
else {
- final Object params[] = { name };
+ final Object[] params = { name };
instance = (Log) logConstructor.newInstance(params);
}
if (logMethod != null) {
- final Object params[] = { this };
+ final Object[] params = { this };
logMethod.invoke(instance, params);
}
@@ -1335,7 +1335,7 @@ public class LogFactoryImpl extends LogFactory {
boolean implementsLog = false;
final String logInterfaceName = Log.class.getName();
- final Class interfaces[] = badClass.getInterfaces();
+ final Class[] interfaces = badClass.getInterfaces();
for (final Class element : interfaces) {
if (logInterfaceName.equals(element.getName())) {
implementsLog = true;
diff --git a/src/test/java/org/apache/commons/logging/LoadTestCase.java
b/src/test/java/org/apache/commons/logging/LoadTestCase.java
index 3723185..e0c920a 100644
--- a/src/test/java/org/apache/commons/logging/LoadTestCase.java
+++ b/src/test/java/org/apache/commons/logging/LoadTestCase.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
*/
public class LoadTestCase extends TestCase{
//TODO: need some way to add service provider packages
- static private String LOG_PCKG[] = {"org.apache.commons.logging",
+ static private String[] LOG_PCKG = {"org.apache.commons.logging",
"org.apache.commons.logging.impl"};
/**
@@ -61,7 +61,7 @@ public class LoadTestCase extends TestCase{
out.write(is.read());
}
- final byte data[] = out.toByteArray();
+ final byte[] data = out.toByteArray();
result = super.defineClass(name, data, 0, data.length);
classes.put(name, result);
diff --git
a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
index 6af8646..4995c5e 100644
--- a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
@@ -88,14 +88,14 @@ public class CustomConfigTestCase extends
DefaultConfigTestCase {
/**
* <p>The message levels that should have been logged.</p>
*/
- protected Level testLevels[] =
+ protected Level[] testLevels =
{ Level.FINE, Level.INFO, Level.WARNING, Level.SEVERE, Level.SEVERE };
/**
* <p>The message strings that should have been logged.</p>
*/
- protected String testMessages[] =
+ protected String[] testMessages =
{ "debug", "info", "warn", "error", "fatal" };
diff --git
a/src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
b/src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
index 05f9c4d..b8734f8 100644
--- a/src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
@@ -102,7 +102,7 @@ public class DefaultConfigTestCase extends TestCase {
"org.apache.commons.logging.impl.LogFactoryImpl",
factory.getClass().getName());
- final String names[] = factory.getAttributeNames();
+ final String[] names = factory.getAttributeNames();
assertNotNull("Names exists", names);
assertEquals("Names empty", 0, names.length);
}
diff --git a/src/test/java/org/apache/commons/logging/log4j/StandardTests.java
b/src/test/java/org/apache/commons/logging/log4j/StandardTests.java
index 3546f87..895eaaf 100644
--- a/src/test/java/org/apache/commons/logging/log4j/StandardTests.java
+++ b/src/test/java/org/apache/commons/logging/log4j/StandardTests.java
@@ -86,7 +86,7 @@ public abstract class StandardTests extends TestCase {
"org.apache.commons.logging.impl.LogFactoryImpl",
factory.getClass().getName());
- final String names[] = factory.getAttributeNames();
+ final String[] names = factory.getAttributeNames();
assertNotNull("Names exists", names);
assertEquals("Names empty", 0, names.length);
}
diff --git
a/src/test/java/org/apache/commons/logging/logkit/StandardTestCase.java
b/src/test/java/org/apache/commons/logging/logkit/StandardTestCase.java
index 1754ea3..b999b4c 100644
--- a/src/test/java/org/apache/commons/logging/logkit/StandardTestCase.java
+++ b/src/test/java/org/apache/commons/logging/logkit/StandardTestCase.java
@@ -118,7 +118,7 @@ public class StandardTestCase extends AbstractLogTest {
"org.apache.commons.logging.impl.LogFactoryImpl",
factory.getClass().getName());
- final String names[] = factory.getAttributeNames();
+ final String[] names = factory.getAttributeNames();
assertNotNull("Names exists", names);
assertEquals("Names empty", 0, names.length);
}
diff --git
a/src/test/java/org/apache/commons/logging/simple/CustomConfigTestCase.java
b/src/test/java/org/apache/commons/logging/simple/CustomConfigTestCase.java
index cd7edef..b01f799 100644
--- a/src/test/java/org/apache/commons/logging/simple/CustomConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/simple/CustomConfigTestCase.java
@@ -46,14 +46,14 @@ public class CustomConfigTestCase extends
DefaultConfigTestCase {
* <p>The message levels that should have been logged.</p>
*/
/*
- protected Level testLevels[] =
+ protected Level[] testLevels =
{ Level.FINE, Level.INFO, Level.WARNING, Level.SEVERE, Level.SEVERE };
*/
/**
* <p>The message strings that should have been logged.</p>
*/
- protected String testMessages[] =
+ protected String[] testMessages =
{ "debug", "info", "warn", "error", "fatal" };
/**
diff --git
a/src/test/java/org/apache/commons/logging/simple/DefaultConfigTestCase.java
b/src/test/java/org/apache/commons/logging/simple/DefaultConfigTestCase.java
index 682af46..c96abb5 100644
--- a/src/test/java/org/apache/commons/logging/simple/DefaultConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/simple/DefaultConfigTestCase.java
@@ -124,7 +124,7 @@ public class DefaultConfigTestCase extends TestCase {
"org.apache.commons.logging.impl.LogFactoryImpl",
factory.getClass().getName());
- final String names[] = factory.getAttributeNames();
+ final String[] names = factory.getAttributeNames();
assertNotNull("Names exists", names);
assertEquals("Names empty", 0, names.length);
}
