svn commit: r1535835 - in /commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters: ClassReloader.java ClassReloaderTestCase.java

[oheger]

Author: oheger
Date: Fri Oct 25 19:37:17 2013
New Revision: 1535835

URL: http://svn.apache.org/r1535835
Log:
Fixed generics warnings in some test classes.

Modified:
    
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java
    
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java

Modified: 
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java?rev=1535835&r1=1535834&r2=1535835&view=diff
==============================================================================
--- 
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java
 (original)
+++ 
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/ClassReloader.java
 Fri Oct 25 19:37:17 2013
@@ -17,10 +17,10 @@
 
 package org.apache.commons.beanutils.converters;
 
-import java.io.InputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * A special classloader useful for testing j2ee-like scenarios.
@@ -55,7 +55,7 @@ public class ClassReloader extends Class
      * Given a class already in the classpath of a parent classloader,
      * reload that class via this classloader.
      */
-    public Class reload(Class clazz) throws FileNotFoundException, IOException 
{
+    public Class<?> reload(Class<?> clazz) throws FileNotFoundException, 
IOException {
         String className = clazz.getName();
         String classFile = className.replace('.', '/') + ".class";
         InputStream classStream = getParent().getResourceAsStream(classFile);
@@ -77,7 +77,7 @@ public class ClassReloader extends Class
         byte[] classData = baos.toByteArray();
 
         // now we have the raw class data, let's turn it into a class
-        Class newClass = defineClass(className, classData, 0, 
classData.length);
+        Class<?> newClass = defineClass(className, classData, 0, 
classData.length);
         resolveClass(newClass);
         return newClass;
     }

Modified: 
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java
URL: 
http://svn.apache.org/viewvc/commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java?rev=1535835&r1=1535834&r2=1535835&view=diff
==============================================================================
--- 
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java
 (original)
+++ 
commons/proper/beanutils/branches/java5/src/test/java/org/apache/commons/beanutils/converters/ClassReloaderTestCase.java
 Fri Oct 25 19:37:17 2013
@@ -51,8 +51,8 @@ public class ClassReloaderTestCase exten
         ClassLoader sharedLoader = this.getClass().getClassLoader();
         ClassReloader componentLoader = new ClassReloader(sharedLoader);
 
-        Class sharedClass = DummyClass.class;
-        Class componentClass = componentLoader.reload(sharedClass);
+        Class<?> sharedClass = DummyClass.class;
+        Class<?> componentClass = componentLoader.reload(sharedClass);
 
         // the two Class objects contain the same bytecode, but are not equal
         assertTrue(sharedClass != componentClass);