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 1e987dc Fix generics warnings in tests
1e987dc is described below
commit 1e987dcacebd4f37bef2f63ff3e0e1a18c9a7b62
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Wed Aug 14 08:30:16 2024 -0400
Fix generics warnings in tests
Javadoc in test
---
.../org/apache/commons/logging/AltHashtableTestCase.java | 4 ++--
.../java/org/apache/commons/logging/LoadTestCase.java | 8 ++++----
.../org/apache/commons/logging/PathableClassLoader.java | 5 ++---
.../org/apache/commons/logging/PathableTestSuite.java | 2 +-
.../logging/config/FirstPriorityConfigTestCase.java | 4 ++--
.../commons/logging/config/PriorityConfigTestCase.java | 4 ++--
.../commons/logging/jdk14/CustomConfigAPITestCase.java | 2 +-
.../commons/logging/jdk14/CustomConfigFullTestCase.java | 2 +-
.../commons/logging/jdk14/CustomConfigTestCase.java | 4 ++--
.../commons/logging/jdk14/DefaultConfigTestCase.java | 2 +-
.../log4j/log4j12/ApiClasspathStandardTestCase.java | 2 +-
.../log4j/log4j12/AppClasspathStandardTestCase.java | 2 +-
.../log4j/log4j12/ChildClasspathStandardTestCase.java | 2 +-
.../log4j/log4j12/ParentClasspathStandardTestCase.java | 2 +-
.../apache/commons/logging/logkit/StandardTestCase.java | 4 ++--
.../commons/logging/pathable/ChildFirstTestCase.java | 16 ++++++++--------
.../apache/commons/logging/pathable/GeneralTestCase.java | 4 ++--
.../logging/security/SecurityAllowedTestCase.java | 4 ++--
.../logging/security/SecurityForbiddenTestCase.java | 6 +++---
.../logging/serviceloader/internal/DummyLogFactory.java | 2 +-
.../commons/logging/servlet/BasicServletTestCase.java | 2 +-
.../commons/logging/simple/CustomConfigTestCase.java | 4 ++--
.../logging/simple/DateTimeCustomConfigTestCase.java | 4 ++--
.../commons/logging/simple/DefaultConfigTestCase.java | 4 ++--
.../logging/tccl/logfactory/TcclDisabledTestCase.java | 8 ++++----
.../logging/tccl/logfactory/TcclEnabledTestCase.java | 8 ++++----
26 files changed, 55 insertions(+), 56 deletions(-)
diff --git a/src/test/java/org/apache/commons/logging/AltHashtableTestCase.java
b/src/test/java/org/apache/commons/logging/AltHashtableTestCase.java
index 726a7f3..c232e9a 100644
--- a/src/test/java/org/apache/commons/logging/AltHashtableTestCase.java
+++ b/src/test/java/org/apache/commons/logging/AltHashtableTestCase.java
@@ -28,7 +28,7 @@ import junit.framework.TestCase;
public class AltHashtableTestCase extends TestCase {
public static Test suite() throws Exception {
- final Class thisClass = AltHashtableTestCase.class;
+ final Class<AltHashtableTestCase> thisClass =
AltHashtableTestCase.class;
final ClassLoader thisClassLoader = thisClass.getClassLoader();
final PathableClassLoader loader = new PathableClassLoader(null);
@@ -36,7 +36,7 @@ public class AltHashtableTestCase extends TestCase {
loader.addLogicalLib("testclasses");
loader.addLogicalLib("commons-logging");
- final Class testClass = loader.loadClass(thisClass.getName());
+ final Class<?> testClass = loader.loadClass(thisClass.getName());
return new PathableTestSuite(testClass, loader);
}
diff --git a/src/test/java/org/apache/commons/logging/LoadTestCase.java
b/src/test/java/org/apache/commons/logging/LoadTestCase.java
index a2eda91..b882f39 100644
--- a/src/test/java/org/apache/commons/logging/LoadTestCase.java
+++ b/src/test/java/org/apache/commons/logging/LoadTestCase.java
@@ -77,7 +77,7 @@ public class LoadTestCase extends TestCase {
// not very trivial to emulate we must implement "findClass",
// but it will delegate to JUnit class loader first
@Override
- public Class loadClass(final String name) throws
ClassNotFoundException {
+ public Class<?> loadClass(final String name) throws
ClassNotFoundException {
// isolates all logging classes, application in the same class
loader too.
// filters exceptions to simplify handling in test
for (final String element : LOG_PCKG) {
@@ -96,7 +96,7 @@ public class LoadTestCase extends TestCase {
private ClassLoader origContextClassLoader;
- private void execute(final Class cls) throws Exception {
+ private void execute(final Class<?> cls) throws Exception {
cls.getConstructor().newInstance();
}
@@ -104,8 +104,8 @@ public class LoadTestCase extends TestCase {
* Load class UserClass via a temporary class loader which is a child of
* the class loader used to load this test class.
*/
- private Class reload() throws Exception {
- Class testObjCls = null;
+ private Class<?> reload() throws Exception {
+ Class<?> testObjCls = null;
final AppClassLoader appLoader = new
AppClassLoader(this.getClass().getClassLoader());
try {
diff --git a/src/test/java/org/apache/commons/logging/PathableClassLoader.java
b/src/test/java/org/apache/commons/logging/PathableClassLoader.java
index 57916f0..2247451 100644
--- a/src/test/java/org/apache/commons/logging/PathableClassLoader.java
+++ b/src/test/java/org/apache/commons/logging/PathableClassLoader.java
@@ -304,7 +304,7 @@ public class PathableClassLoader extends URLClassLoader {
* that entries' class loader.
*/
@Override
- protected Class loadClass(final String name, final boolean resolve)
+ protected Class<?> loadClass(final String name, final boolean resolve)
throws ClassNotFoundException {
// just for performance, check java and javax
if (name.startsWith("java.") || name.startsWith("javax.")) {
@@ -326,7 +326,7 @@ public class PathableClassLoader extends URLClassLoader {
return super.loadClass(name, resolve);
}
try {
- Class clazz = findLoadedClass(name);
+ Class<?> clazz = findLoadedClass(name);
if (clazz == null) {
clazz = super.findClass(name);
}
@@ -360,7 +360,6 @@ public class PathableClassLoader extends URLClassLoader {
}
/**
- *
* Clean implementation of list function of
* {@link java.util.Collection} added in JDK 1.4
* @param en {@code Enumeration}, possibly null
diff --git a/src/test/java/org/apache/commons/logging/PathableTestSuite.java
b/src/test/java/org/apache/commons/logging/PathableTestSuite.java
index d2a2287..9c681dd 100644
--- a/src/test/java/org/apache/commons/logging/PathableTestSuite.java
+++ b/src/test/java/org/apache/commons/logging/PathableTestSuite.java
@@ -120,7 +120,7 @@ public class PathableTestSuite extends TestSuite {
* calls to Thread.currentThread.getContextClassLoader from test methods
* (or any method called by test methods).
*/
- public PathableTestSuite(final Class testClass, final ClassLoader
contextClassLoader) {
+ public PathableTestSuite(final Class<?> testClass, final ClassLoader
contextClassLoader) {
super(testClass);
contextLoader = contextClassLoader;
}
diff --git
a/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
b/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
index aeb2ccd..bbc2f7f 100644
---
a/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
+++
b/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
@@ -43,7 +43,7 @@ public class FirstPriorityConfigTestCase extends TestCase {
* Return the tests included in this test suite.
*/
public static Test suite() throws Exception {
- final Class thisClass = FirstPriorityConfigTestCase.class;
+ final Class<FirstPriorityConfigTestCase> thisClass =
FirstPriorityConfigTestCase.class;
// Determine the URL to this .class file, so that we can then
// append the priority dirs to it. For tidiness, load this
@@ -75,7 +75,7 @@ public class FirstPriorityConfigTestCase extends TestCase {
// load the test class via webapp loader, and use the webapp loader
// as the tccl loader too.
- final Class testClass = webappLoader.loadClass(thisClass.getName());
+ final Class<?> testClass = webappLoader.loadClass(thisClass.getName());
return new PathableTestSuite(testClass, webappLoader);
}
diff --git
a/src/test/java/org/apache/commons/logging/config/PriorityConfigTestCase.java
b/src/test/java/org/apache/commons/logging/config/PriorityConfigTestCase.java
index f7d2e6e..824654d 100644
---
a/src/test/java/org/apache/commons/logging/config/PriorityConfigTestCase.java
+++
b/src/test/java/org/apache/commons/logging/config/PriorityConfigTestCase.java
@@ -50,7 +50,7 @@ public class PriorityConfigTestCase extends TestCase {
* Return the tests included in this test suite.
*/
public static Test suite() throws Exception {
- final Class thisClass = PriorityConfigTestCase.class;
+ final Class<PriorityConfigTestCase> thisClass =
PriorityConfigTestCase.class;
// Determine the URL to this .class file, so that we can then
// append the priority dirs to it. For tidiness, load this
@@ -93,7 +93,7 @@ public class PriorityConfigTestCase extends TestCase {
// load the test class via webapp loader, and use the webapp loader
// as the tccl loader too.
- final Class testClass = webappLoader.loadClass(thisClass.getName());
+ final Class<?> testClass = webappLoader.loadClass(thisClass.getName());
return new PathableTestSuite(testClass, webappLoader);
}
diff --git
a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java
b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java
index 2af4eb7..b374e64 100644
---
a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java
+++
b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigAPITestCase.java
@@ -50,7 +50,7 @@ public class CustomConfigAPITestCase extends
CustomConfigTestCase {
child.addLogicalLib("testclasses");
child.addLogicalLib("commons-logging");
- final Class testClass =
child.loadClass(CustomConfigAPITestCase.class.getName());
+ final Class<?> testClass =
child.loadClass(CustomConfigAPITestCase.class.getName());
return new PathableTestSuite(testClass, child);
}
diff --git
a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
index f1f4dff..33f1337 100644
---
a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
+++
b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigFullTestCase.java
@@ -49,7 +49,7 @@ public class CustomConfigFullTestCase extends
CustomConfigTestCase {
final PathableClassLoader child = new PathableClassLoader(parent);
child.addLogicalLib("testclasses");
- final Class testClass =
child.loadClass(CustomConfigFullTestCase.class.getName());
+ final Class<?> testClass =
child.loadClass(CustomConfigFullTestCase.class.getName());
return new PathableTestSuite(testClass, child);
}
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 1d08137..b6374c7 100644
--- a/src/test/java/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/jdk14/CustomConfigTestCase.java
@@ -62,7 +62,7 @@ public class CustomConfigTestCase extends
DefaultConfigTestCase {
final ClassLoader srcCL =
CustomConfigAPITestCase.class.getClassLoader();
final byte[] classData = readClass(className, srcCL);
- final Class[] params = { String.class, classData.getClass(),
Integer.TYPE, Integer.TYPE };
+ final Class<?>[] params = { String.class, classData.getClass(),
Integer.TYPE, Integer.TYPE };
final Method m =
ClassLoader.class.getDeclaredMethod("defineClass", params);
final Object[] args = new Object[4];
@@ -118,7 +118,7 @@ public class CustomConfigTestCase extends
DefaultConfigTestCase {
cl.addLogicalLib("commons-logging");
cl.addLogicalLib("testclasses");
- final Class testClass =
cl.loadClass(CustomConfigTestCase.class.getName());
+ final Class<?> testClass =
cl.loadClass(CustomConfigTestCase.class.getName());
return new PathableTestSuite(testClass, cl);
}
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 680d9c7..509517e 100644
--- a/src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/jdk14/DefaultConfigTestCase.java
@@ -46,7 +46,7 @@ public class DefaultConfigTestCase extends TestCase {
loader.addLogicalLib("testclasses");
loader.addLogicalLib("commons-logging");
- final Class testClass =
loader.loadClass(DefaultConfigTestCase.class.getName());
+ final Class<?> testClass =
loader.loadClass(DefaultConfigTestCase.class.getName());
return new PathableTestSuite(testClass, loader);
}
diff --git
a/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java
b/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java
index 33e02d7..10f290b 100644
---
a/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java
+++
b/src/test/java/org/apache/commons/logging/log4j/log4j12/ApiClasspathStandardTestCase.java
@@ -50,7 +50,7 @@ public class ApiClasspathStandardTestCase extends TestCase {
child.addLogicalLib("commons-logging");
child.addLogicalLib("testclasses");
- final Class testClass = child.loadClass(
+ final Class<?> testClass = child.loadClass(
"org.apache.commons.logging.log4j.log4j12.Log4j12StandardTests");
return new PathableTestSuite(testClass, child);
}
diff --git
a/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java
b/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java
index a8230bd..1d79b79 100644
---
a/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java
+++
b/src/test/java/org/apache/commons/logging/log4j/log4j12/AppClasspathStandardTestCase.java
@@ -46,7 +46,7 @@ public class AppClasspathStandardTestCase extends TestCase {
loader.addLogicalLib("log4j2-core");
loader.addLogicalLib("commons-logging");
- final Class testClass = loader.loadClass(
+ final Class<?> testClass = loader.loadClass(
"org.apache.commons.logging.log4j.log4j12.Log4j12StandardTests");
return new PathableTestSuite(testClass, loader);
}
diff --git
a/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java
b/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java
index 6c66cf7..0024e9d 100644
---
a/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java
+++
b/src/test/java/org/apache/commons/logging/log4j/log4j12/ChildClasspathStandardTestCase.java
@@ -48,7 +48,7 @@ public class ChildClasspathStandardTestCase extends TestCase {
child.addLogicalLib("log4j2-core");
child.addLogicalLib("commons-logging");
- final Class testClass = child.loadClass(
+ final Class<?> testClass = child.loadClass(
"org.apache.commons.logging.log4j.log4j12.Log4j12StandardTests");
return new PathableTestSuite(testClass, child);
}
diff --git
a/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java
b/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java
index 76c1b31..c9918ad 100644
---
a/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java
+++
b/src/test/java/org/apache/commons/logging/log4j/log4j12/ParentClasspathStandardTestCase.java
@@ -48,7 +48,7 @@ public class ParentClasspathStandardTestCase extends TestCase
{
final PathableClassLoader child = new PathableClassLoader(parent);
child.addLogicalLib("testclasses");
- final Class testClass = child.loadClass(
+ final Class<?> testClass = child.loadClass(
"org.apache.commons.logging.log4j.log4j12.Log4j12StandardTests");
return new PathableTestSuite(testClass, child);
}
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 12dbb1c..597cbfd 100644
--- a/src/test/java/org/apache/commons/logging/logkit/StandardTestCase.java
+++ b/src/test/java/org/apache/commons/logging/logkit/StandardTestCase.java
@@ -41,7 +41,7 @@ public class StandardTestCase extends AbstractLogTest {
* Return the tests included in this test suite.
*/
public static Test suite() throws Exception {
- final Class thisClass = StandardTestCase.class;
+ final Class<StandardTestCase> thisClass = StandardTestCase.class;
final PathableClassLoader loader = new PathableClassLoader(null);
loader.useExplicitLoader("junit.", Test.class.getClassLoader());
@@ -49,7 +49,7 @@ public class StandardTestCase extends AbstractLogTest {
loader.addLogicalLib("commons-logging");
loader.addLogicalLib("logkit");
- final Class testClass = loader.loadClass(thisClass.getName());
+ final Class<?> testClass = loader.loadClass(thisClass.getName());
return new PathableTestSuite(testClass, loader);
}
diff --git
a/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
b/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
index 4f2e6f8..35f0c12 100644
--- a/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
+++ b/src/test/java/org/apache/commons/logging/pathable/ChildFirstTestCase.java
@@ -53,7 +53,7 @@ public class ChildFirstTestCase extends TestCase {
* </ul>
*/
public static Test suite() throws Exception {
- final Class thisClass = ChildFirstTestCase.class;
+ final Class<ChildFirstTestCase> thisClass = ChildFirstTestCase.class;
final ClassLoader thisClassLoader = thisClass.getClassLoader();
// Make the parent a direct child of the bootloader to hide all
@@ -86,7 +86,7 @@ public class ChildFirstTestCase extends TestCase {
context.setParentFirst(false);
// reload this class via the child class loader
- final Class testClass = child.loadClass(thisClass.getName());
+ final Class<?> testClass = child.loadClass(thisClass.getName());
// and return our custom TestSuite class
return new PathableTestSuite(testClass, context);
@@ -167,30 +167,30 @@ public class ChildFirstTestCase extends TestCase {
// junit classes should be visible; their class loader is not
// in the hierarchy of parent class loaders for this class,
// though it is accessible due to trickery in the PathableClassLoader.
- final Class junitTest =
contextLoader.loadClass("junit.framework.Test");
+ final Class<?> junitTest =
contextLoader.loadClass("junit.framework.Test");
final Set<ClassLoader> ancestorCLs = getAncestorCLs();
assertFalse("Junit not loaded by ancestor class loader",
ancestorCLs.contains(junitTest.getClassLoader()));
// jcl api classes should be visible only via the parent
- final Class logClass =
contextLoader.loadClass("org.apache.commons.logging.Log");
+ final Class<?> logClass =
contextLoader.loadClass("org.apache.commons.logging.Log");
assertSame("Log class not loaded via parent",
logClass.getClassLoader(), parentLoader);
// jcl adapter classes should be visible via both parent and child.
However
// as the class loaders are child-first we should see the child one.
- final Class log4jClass =
contextLoader.loadClass("org.apache.commons.logging.impl.Log4JLogger");
+ final Class<?> log4jClass =
contextLoader.loadClass("org.apache.commons.logging.impl.Log4JLogger");
assertSame("Log4JLogger not loaded via child",
log4jClass.getClassLoader(), thisLoader);
// test classes should be visible via the child only
- final Class testClass =
contextLoader.loadClass("org.apache.commons.logging.PathableTestSuite");
+ final Class<?> testClass =
contextLoader.loadClass("org.apache.commons.logging.PathableTestSuite");
assertSame("PathableTestSuite not loaded via child",
testClass.getClassLoader(), thisLoader);
// test loading of class that is not available
try {
- final Class noSuchClass = contextLoader.loadClass("no.such.class");
+ final Class<?> noSuchClass =
contextLoader.loadClass("no.such.class");
fail("Class no.such.class is unexpectedly available");
assertNotNull(noSuchClass); // silence warning about unused var
} catch (final ClassNotFoundException ex) {
@@ -198,7 +198,7 @@ public class ChildFirstTestCase extends TestCase {
}
// String class class loader is null
- final Class stringClass = contextLoader.loadClass("java.lang.String");
+ final Class<?> stringClass =
contextLoader.loadClass("java.lang.String");
assertNull("String class class loader is not null!",
stringClass.getClassLoader());
}
diff --git
a/src/test/java/org/apache/commons/logging/pathable/GeneralTestCase.java
b/src/test/java/org/apache/commons/logging/pathable/GeneralTestCase.java
index 1d99932..734edaa 100644
--- a/src/test/java/org/apache/commons/logging/pathable/GeneralTestCase.java
+++ b/src/test/java/org/apache/commons/logging/pathable/GeneralTestCase.java
@@ -60,7 +60,7 @@ public class GeneralTestCase extends TestCase {
* Sets up a custom class loader hierarchy for this test case.
*/
public static Test suite() throws Exception {
- final Class thisClass = GeneralTestCase.class;
+ final Class<GeneralTestCase> thisClass = GeneralTestCase.class;
final ClassLoader thisClassLoader = thisClass.getClassLoader();
final PathableClassLoader loader = new PathableClassLoader(null);
@@ -68,7 +68,7 @@ public class GeneralTestCase extends TestCase {
loader.addLogicalLib("testclasses");
// reload this class via the child class loader
- final Class testClass = loader.loadClass(thisClass.getName());
+ final Class<?> testClass = loader.loadClass(thisClass.getName());
// and return our custom TestSuite class
return new PathableTestSuite(testClass, loader);
diff --git
a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
index 28c0ba4..247bd8d 100644
---
a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
+++
b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
@@ -62,7 +62,7 @@ public class SecurityAllowedTestCase extends TestCase {
parent.addLogicalLib("commons-logging");
parent.addLogicalLib("testclasses");
- final Class testClass = parent.loadClass(
+ final Class<?> testClass = parent.loadClass(
"org.apache.commons.logging.security.SecurityAllowedTestCase");
return new PathableTestSuite(testClass, parent);
}
@@ -101,7 +101,7 @@ public class SecurityAllowedTestCase extends TestCase {
try {
// Use reflection so that we can control exactly when the static
// initializer for the LogFactory class is executed.
- final Class c = this.getClass().getClassLoader().loadClass(
+ final Class<?> c = this.getClass().getClassLoader().loadClass(
"org.apache.commons.logging.LogFactory");
final Method m = c.getMethod("getLog", Class.class);
final Log log = (Log) m.invoke(null, this.getClass());
diff --git
a/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
index a940ec0..9176f2b 100644
---
a/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
+++
b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
@@ -71,7 +71,7 @@ public class SecurityForbiddenTestCase extends TestCase {
parent.addLogicalLib("commons-logging");
parent.addLogicalLib("testclasses");
- final Class testClass = parent.loadClass(
+ final Class<?> testClass = parent.loadClass(
"org.apache.commons.logging.security.SecurityForbiddenTestCase");
return new PathableTestSuite(testClass, parent);
}
@@ -85,7 +85,7 @@ public class SecurityForbiddenTestCase extends TestCase {
*/
private Object loadClass(final String name, final ClassLoader classLoader)
{
try {
- final Class clazz = classLoader.loadClass(name);
+ final Class<?> clazz = classLoader.loadClass(name);
return clazz.getConstructor().newInstance();
} catch (final Exception e) {
final StringWriter sw = new StringWriter();
@@ -135,7 +135,7 @@ public class SecurityForbiddenTestCase extends TestCase {
try {
// Use reflection so that we can control exactly when the static
// initializer for the LogFactory class is executed.
- final Class c = this.getClass().getClassLoader().loadClass(
+ final Class<?> c = this.getClass().getClassLoader().loadClass(
"org.apache.commons.logging.LogFactory");
final Method m = c.getMethod("getLog", Class.class);
final Log log = (Log) m.invoke(null, this.getClass());
diff --git
a/src/test/java/org/apache/commons/logging/serviceloader/internal/DummyLogFactory.java
b/src/test/java/org/apache/commons/logging/serviceloader/internal/DummyLogFactory.java
index 409e63b..2c169a8 100644
---
a/src/test/java/org/apache/commons/logging/serviceloader/internal/DummyLogFactory.java
+++
b/src/test/java/org/apache/commons/logging/serviceloader/internal/DummyLogFactory.java
@@ -32,7 +32,7 @@ public class DummyLogFactory extends LogFactory {
}
@Override
- public Log getInstance(final Class clazz) throws LogConfigurationException
{
+ public Log getInstance(final Class<?> clazz) throws
LogConfigurationException {
return null;
}
diff --git
a/src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
b/src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
index 4157946..18dbbfd 100644
--- a/src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
+++ b/src/test/java/org/apache/commons/logging/servlet/BasicServletTestCase.java
@@ -56,7 +56,7 @@ public class BasicServletTestCase extends TestCase {
tccl.setParentFirst(false);
tccl.addLogicalLib("commons-logging");
- final Class testClass =
child.loadClass(BasicServletTestCase.class.getName());
+ final Class<?> testClass =
child.loadClass(BasicServletTestCase.class.getName());
return new PathableTestSuite(testClass, tccl);
}
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 1d159a3..5e1a1ba 100644
--- a/src/test/java/org/apache/commons/logging/simple/CustomConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/simple/CustomConfigTestCase.java
@@ -48,14 +48,14 @@ public class CustomConfigTestCase extends
DefaultConfigTestCase {
* Or we could fix SimpleLog to be sane...
*/
public static Test suite() throws Exception {
- final Class thisClass = CustomConfigTestCase.class;
+ final Class<CustomConfigTestCase> thisClass =
CustomConfigTestCase.class;
final PathableClassLoader loader = new PathableClassLoader(null);
loader.useExplicitLoader("junit.", Test.class.getClassLoader());
loader.addLogicalLib("testclasses");
loader.addLogicalLib("commons-logging");
- final Class testClass = loader.loadClass(thisClass.getName());
+ final Class<?> testClass = loader.loadClass(thisClass.getName());
return new PathableTestSuite(testClass, loader);
}
diff --git
a/src/test/java/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java
b/src/test/java/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java
index f29abef..fca58fb 100644
---
a/src/test/java/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java
+++
b/src/test/java/org/apache/commons/logging/simple/DateTimeCustomConfigTestCase.java
@@ -44,14 +44,14 @@ public class DateTimeCustomConfigTestCase extends
CustomConfigTestCase {
* Or we could fix SimpleLog to be sane...
*/
public static Test suite() throws Exception {
- final Class thisClass = DateTimeCustomConfigTestCase.class;
+ final Class<DateTimeCustomConfigTestCase> thisClass =
DateTimeCustomConfigTestCase.class;
final PathableClassLoader loader = new PathableClassLoader(null);
loader.useExplicitLoader("junit.", Test.class.getClassLoader());
loader.addLogicalLib("testclasses");
loader.addLogicalLib("commons-logging");
- final Class testClass = loader.loadClass(thisClass.getName());
+ final Class<?> testClass = loader.loadClass(thisClass.getName());
return new PathableTestSuite(testClass, loader);
}
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 60562dc..74b2042 100644
--- a/src/test/java/org/apache/commons/logging/simple/DefaultConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/simple/DefaultConfigTestCase.java
@@ -51,14 +51,14 @@ public class DefaultConfigTestCase extends TestCase {
* Or we could fix SimpleLog to be sane...
*/
public static Test suite() throws Exception {
- final Class thisClass = DefaultConfigTestCase.class;
+ final Class<DefaultConfigTestCase> thisClass =
DefaultConfigTestCase.class;
final PathableClassLoader loader = new PathableClassLoader(null);
loader.useExplicitLoader("junit.", Test.class.getClassLoader());
loader.addLogicalLib("testclasses");
loader.addLogicalLib("commons-logging");
- final Class testClass = loader.loadClass(thisClass.getName());
+ final Class<?> testClass = loader.loadClass(thisClass.getName());
return new PathableTestSuite(testClass, loader);
}
diff --git
a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
index bc3c795..299cb6d 100644
---
a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
+++
b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
@@ -42,7 +42,7 @@ public class TcclDisabledTestCase extends TestCase {
* Returns the tests included in this test suite.
*/
public static Test suite() throws Exception {
- final Class thisClass = TcclDisabledTestCase.class;
+ final Class<TcclDisabledTestCase> thisClass =
TcclDisabledTestCase.class;
// Determine the URL to this .class file, so that we can then
// append the priority dirs to it. For tidiness, load this
@@ -80,7 +80,7 @@ public class TcclDisabledTestCase extends TestCase {
final PathableClassLoader tcclLoader = new
PathableClassLoader(parentLoader);
tcclLoader.addLogicalLib("testclasses");
- final Class testClass = parentLoader.loadClass(thisClass.getName());
+ final Class<?> testClass = parentLoader.loadClass(thisClass.getName());
return new PathableTestSuite(testClass, tcclLoader);
}
@@ -113,7 +113,7 @@ public class TcclDisabledTestCase extends TestCase {
// MyLogFactoryImpl should not be loadable via parent loader
try {
- final Class clazz = thisClassLoader.loadClass(MY_LOG_FACTORY_IMPL);
+ final Class<?> clazz =
thisClassLoader.loadClass(MY_LOG_FACTORY_IMPL);
fail("Unexpectedly able to load MyLogFactoryImpl via test class
class loader");
assertNotNull(clazz); // silence warning about unused var
} catch (final ClassNotFoundException ex) {
@@ -122,7 +122,7 @@ public class TcclDisabledTestCase extends TestCase {
// MyLogFactoryImpl should be loadable via TCCL loader
try {
- final Class clazz = tcclLoader.loadClass(MY_LOG_FACTORY_IMPL);
+ final Class<?> clazz = tcclLoader.loadClass(MY_LOG_FACTORY_IMPL);
assertNotNull(clazz);
} catch (final ClassNotFoundException ex) {
fail("Unexpectedly unable to load MyLogFactoryImpl via TCCL class
loader");
diff --git
a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
index a0c5b7c..14a5878 100644
---
a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
+++
b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
@@ -36,7 +36,7 @@ public class TcclEnabledTestCase extends TestCase {
* Return the tests included in this test suite.
*/
public static Test suite() throws Exception {
- final Class thisClass = TcclEnabledTestCase.class;
+ final Class<TcclEnabledTestCase> thisClass = TcclEnabledTestCase.class;
// Determine the URL to this .class file, so that we can then
// append the priority dirs to it. For tidiness, load this
@@ -74,7 +74,7 @@ public class TcclEnabledTestCase extends TestCase {
final PathableClassLoader tcclLoader = new
PathableClassLoader(parentLoader);
tcclLoader.addLogicalLib("testclasses");
- final Class testClass = parentLoader.loadClass(thisClass.getName());
+ final Class<?> testClass = parentLoader.loadClass(thisClass.getName());
return new PathableTestSuite(testClass, tcclLoader);
}
@@ -107,7 +107,7 @@ public class TcclEnabledTestCase extends TestCase {
// MyLogFactoryImpl should not be loadable via parent loader
try {
- final Class clazz = thisClassLoader.loadClass(
+ final Class<?> clazz = thisClassLoader.loadClass(
"org.apache.commons.logging.tccl.custom.MyLogFactoryImpl");
fail("Unexpectedly able to load MyLogFactoryImpl via test class
class loader");
assertNotNull(clazz); // silence warning about unused var
@@ -117,7 +117,7 @@ public class TcclEnabledTestCase extends TestCase {
// MyLogFactoryImpl should be loadable via TCCL loader
try {
- final Class clazz = tcclLoader.loadClass(
+ final Class<?> clazz = tcclLoader.loadClass(
"org.apache.commons.logging.tccl.custom.MyLogFactoryImpl");
assertNotNull(clazz);
} catch (final ClassNotFoundException ex) {
