Browse Source

HADOOP-1294. Fix unchecked warnings in main Hadoop code under Java 6.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@533013 13f79535-47bb-0310-9956-ffa450edef68
Thomas White 18 years ago
parent
commit
2e22a63562

+ 3 - 0
CHANGES.txt

@@ -282,6 +282,9 @@ Trunk (unreleased changes)
     shuffle, sort and reduce.  Use this to implement reduce=NONE
     shuffle, sort and reduce.  Use this to implement reduce=NONE
     option in contrib/streaming.  (Runping Qi via cutting)
     option in contrib/streaming.  (Runping Qi via cutting)
 
 
+84. HADOOP-1294.  Fix unchecked warnings in main Hadoop code under 
+    Java 6.  (tomwhite)
+
 
 
 Release 0.12.3 - 2007-04-06
 Release 0.12.3 - 2007-04-06
 
 

+ 1 - 1
src/java/org/apache/hadoop/ipc/RPC.java

@@ -296,7 +296,7 @@ public class RPC {
   /** An RPC Server. */
   /** An RPC Server. */
   public static class Server extends org.apache.hadoop.ipc.Server {
   public static class Server extends org.apache.hadoop.ipc.Server {
     private Object instance;
     private Object instance;
-    private Class implementation;
+    private Class<?> implementation;
     private boolean verbose;
     private boolean verbose;
 
 
     /** Construct an RPC server.
     /** Construct an RPC server.

+ 2 - 2
src/java/org/apache/hadoop/util/ProgramDriver.java

@@ -42,7 +42,7 @@ public class ProgramDriver {
      
      
   static private class ProgramDescription {
   static private class ProgramDescription {
 	
 	
-    static final Class[] paramTypes = new Class[] {String[].class};
+    static final Class<?>[] paramTypes = new Class<?>[] {String[].class};
 	
 	
     /**
     /**
      * Create a description of an example program.
      * Create a description of an example program.
@@ -51,7 +51,7 @@ public class ProgramDriver {
      * @throws SecurityException if we can't use reflection
      * @throws SecurityException if we can't use reflection
      * @throws NoSuchMethodException if the class doesn't have a main method
      * @throws NoSuchMethodException if the class doesn't have a main method
      */
      */
-    public ProgramDescription(Class mainClass, 
+    public ProgramDescription(Class<?> mainClass, 
                               String description)
                               String description)
       throws SecurityException, NoSuchMethodException {
       throws SecurityException, NoSuchMethodException {
       this.main = mainClass.getMethod("main", paramTypes);
       this.main = mainClass.getMethod("main", paramTypes);

+ 1 - 1
src/java/org/apache/hadoop/util/ReflectionUtils.java

@@ -66,7 +66,7 @@ public class ReflectionUtils {
    * @param conf Configuration
    * @param conf Configuration
    * @return a new object
    * @return a new object
    */
    */
-  public static Object newInstance(Class theClass, Configuration conf) {
+  public static Object newInstance(Class<?> theClass, Configuration conf) {
     Object result;
     Object result;
     try {
     try {
       Constructor meth = CONSTRUCTOR_CACHE.get(theClass);
       Constructor meth = CONSTRUCTOR_CACHE.get(theClass);

+ 1 - 1
src/java/org/apache/hadoop/util/RunJar.java

@@ -145,7 +145,7 @@ public class RunJar {
       new URLClassLoader(classPath.toArray(new URL[0]));
       new URLClassLoader(classPath.toArray(new URL[0]));
 
 
     Thread.currentThread().setContextClassLoader(loader);
     Thread.currentThread().setContextClassLoader(loader);
-    Class mainClass = Class.forName(mainClassName, true, loader);
+    Class<?> mainClass = Class.forName(mainClassName, true, loader);
     Method main = mainClass.getMethod("main", new Class[] {
     Method main = mainClass.getMethod("main", new Class[] {
       Array.newInstance(String.class, 0).getClass()
       Array.newInstance(String.class, 0).getClass()
     });
     });

+ 2 - 2
src/test/org/apache/hadoop/dfs/ClusterTestDFS.java

@@ -435,8 +435,8 @@ public class ClusterTestDFS extends TestCase implements FSConstants {
         // lazy init
         // lazy init
         String rndDataGenClassname =
         String rndDataGenClassname =
           conf.get("hadoop.random.class", "java.util.Random");
           conf.get("hadoop.random.class", "java.util.Random");
-        Class clazz = Class.forName(rndDataGenClassname);
-        randomDataGeneratorCtor = clazz.getConstructor(new Class[]{Long.TYPE});
+        Class<?> clazz = Class.forName(rndDataGenClassname);
+        randomDataGeneratorCtor = clazz.getConstructor(Long.TYPE);
       }
       }
 
 
       if (randomDataGeneratorCtor != null) {
       if (randomDataGeneratorCtor != null) {