You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrunit.apache.org by db...@apache.org on 2012/06/09 23:45:50 UTC

svn commit: r1348511 - in /mrunit/trunk/src: main/java/org/apache/hadoop/mrunit/ main/java/org/apache/hadoop/mrunit/internal/counters/ main/java/org/apache/hadoop/mrunit/internal/mapred/ main/java/org/apache/hadoop/mrunit/internal/mapreduce/ main/java/...

Author: dbeech
Date: Sat Jun  9 21:45:49 2012
New Revision: 1348511

URL: http://svn.apache.org/viewvc?rev=1348511&view=rev
Log:
MRUNIT-117 - Fix compiler warnings. 

Modified:
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriver.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/counters/CounterWrapper.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/mapred/MockMapredOutputFormat.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapreduceOutputFormat.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCollector.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCreator.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapDriver.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java
    mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/ReduceDriver.java
    mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java
    mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
    mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
    mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java
    mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
    mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
    mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriver.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapDriver.java Sat Jun  9 21:45:49 2012
@@ -204,7 +204,7 @@ public class MapDriver<K1, V1, K2, V2> e
   }
 
   @Override
-  public MapDriver<K1, V1, K2, V2> withCounter(final Enum e,
+  public MapDriver<K1, V1, K2, V2> withCounter(final Enum<?> e,
       final long expectedValue) {
     super.withCounter(e, expectedValue);
     return this;
@@ -223,6 +223,7 @@ public class MapDriver<K1, V1, K2, V2> e
     return this;
   }
 
+  @SuppressWarnings("rawtypes")
   public MapDriver<K1, V1, K2, V2> withOutputFormat(
       final Class<? extends OutputFormat> outputFormatClass,
       final Class<? extends InputFormat> inputFormatClass) {

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java Sat Jun  9 21:45:49 2012
@@ -48,7 +48,7 @@ import org.apache.hadoop.mrunit.types.Pa
  * If a combiner is specified, then it will be run exactly once after the Mapper
  * and before the Reducer.
  */
-@SuppressWarnings({ "deprecation", "rawtypes" })
+@SuppressWarnings({ "deprecation" })
 public class MapReduceDriver<K1, V1, K2, V2, K3, V3> extends
     MapReduceDriverBase<K1, V1, K2, V2, K3, V3> {
 
@@ -59,7 +59,9 @@ public class MapReduceDriver<K1, V1, K2,
   private Reducer<K2, V2, K2, V2> myCombiner;
   private Counters counters;
 
+  @SuppressWarnings("rawtypes")
   private Class<? extends OutputFormat> outputFormatClass;
+  @SuppressWarnings("rawtypes")
   private Class<? extends InputFormat> inputFormatClass;
 
   public MapReduceDriver(final Mapper<K1, V1, K2, V2> m,
@@ -275,6 +277,7 @@ public class MapReduceDriver<K1, V1, K2,
     return this;
   }
 
+  @SuppressWarnings("rawtypes")
   public MapReduceDriver<K1, V1, K2, V2, K3, V3> withOutputFormat(
       final Class<? extends OutputFormat> outputFormatClass,
       final Class<? extends InputFormat> inputFormatClass) {
@@ -402,7 +405,7 @@ public class MapReduceDriver<K1, V1, K2,
   }
 
   @Override
-  public MapReduceDriver<K1, V1, K2, V2, K3, V3> withCounter(final Enum e,
+  public MapReduceDriver<K1, V1, K2, V2, K3, V3> withCounter(final Enum<?> e,
       final long expectedValue) {
     super.withCounter(e, expectedValue);
     return this;

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java Sat Jun  9 21:45:49 2012
@@ -17,8 +17,6 @@
  */
 package org.apache.hadoop.mrunit;
 
-import static org.apache.hadoop.mrunit.internal.util.ArgumentChecker.returnNonNull;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -45,7 +43,7 @@ import org.apache.hadoop.util.Reflection
  * designed to handle a single (k, v)* -> (k, v)* case from the Mapper/Reducer
  * pair, representing a single unit test.
  */
-@SuppressWarnings("rawtypes")
+
 public abstract class MapReduceDriverBase<K1, V1, K2, V2, K3, V3> extends
     TestDriver<K1, V1, K3, V3> {
 

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java Sat Jun  9 21:45:49 2012
@@ -279,7 +279,7 @@ public class PipelineMapReduceDriver<K1,
   }
 
   @Override
-  public PipelineMapReduceDriver<K1, V1, K2, V2> withCounter(final Enum e,
+  public PipelineMapReduceDriver<K1, V1, K2, V2> withCounter(final Enum<?> e,
       final long expectedValue) {
     super.withCounter(e, expectedValue);
     return this;
@@ -325,7 +325,7 @@ public class PipelineMapReduceDriver<K1,
   }
 
   @Override
-  @SuppressWarnings({ "unchecked" })
+  @SuppressWarnings("unchecked")
   public List<Pair<K2, V2>> run() throws IOException {
     // inputs starts with the user-provided inputs.
     List<Pair<K1, V1>> inputs = inputList;

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java Sat Jun  9 21:45:49 2012
@@ -215,7 +215,7 @@ public class ReduceDriver<K1, V1, K2, V2
   }
 
   @Override
-  public ReduceDriver<K1, V1, K2, V2> withCounter(final Enum e,
+  public ReduceDriver<K1, V1, K2, V2> withCounter(final Enum<?> e,
       final long expectedValue) {
     super.withCounter(e, expectedValue);
     return this;
@@ -234,6 +234,7 @@ public class ReduceDriver<K1, V1, K2, V2
     return this;
   }
 
+  @SuppressWarnings("rawtypes")
   public ReduceDriver<K1, V1, K2, V2> withOutputFormat(
       final Class<? extends OutputFormat> outputFormatClass,
       final Class<? extends InputFormat> inputFormatClass) {

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java Sat Jun  9 21:45:49 2012
@@ -188,7 +188,6 @@ public abstract class ReduceDriverBase<K
     private T value;
     private final Serialization serialization;
 
-    @SuppressWarnings("unchecked")
     public ValueClassInstanceReuseList(final List<T> list,
         final Configuration conf) {
       super(list);

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/TestDriver.java Sat Jun  9 21:45:49 2012
@@ -40,7 +40,7 @@ public abstract class TestDriver<K1, V1,
 
   protected List<Pair<K2, V2>> expectedOutputs;
 
-  protected List<Pair<Enum, Long>> expectedEnumCounters;
+  protected List<Pair<Enum<?>, Long>> expectedEnumCounters;
   protected List<Pair<Pair<String, String>, Long>> expectedStringCounters;
 
   protected Configuration configuration;
@@ -52,7 +52,7 @@ public abstract class TestDriver<K1, V1,
 
   public TestDriver() {
     expectedOutputs = new ArrayList<Pair<K2, V2>>();
-    expectedEnumCounters = new ArrayList<Pair<Enum, Long>>();
+    expectedEnumCounters = new ArrayList<Pair<Enum<?>, Long>>();
     expectedStringCounters = new ArrayList<Pair<Pair<String, String>, Long>>();
     configuration = new Configuration();
     serialization = new Serialization(configuration);
@@ -75,7 +75,7 @@ public abstract class TestDriver<K1, V1,
   /**
    * @return expected counters from this driver
    */
-  public List<Pair<Enum, Long>> getExpectedEnumCounters() {
+  public List<Pair<Enum<?>, Long>> getExpectedEnumCounters() {
     return expectedEnumCounters;
   }
 
@@ -103,9 +103,9 @@ public abstract class TestDriver<K1, V1,
    *          Expected value
    * @return
    */
-  public TestDriver<K1, V1, K2, V2> withCounter(final Enum e,
+  public TestDriver<K1, V1, K2, V2> withCounter(final Enum<?> e,
       final long expectedValue) {
-    expectedEnumCounters.add(new Pair<Enum, Long>(e, expectedValue));
+    expectedEnumCounters.add(new Pair<Enum<?>, Long>(e, expectedValue));
     return this;
   }
 
@@ -403,7 +403,7 @@ public abstract class TestDriver<K1, V1,
     final List<String> errors = new ArrayList<String>();
 
     // Firstly check enumeration based counters
-    for (final Pair<Enum, Long> expected : expectedEnumCounters) {
+    for (final Pair<Enum<?>, Long> expected : expectedEnumCounters) {
       final long actualValue = counterWrapper.findCounterValue(expected
           .getFirst());
 

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/counters/CounterWrapper.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/counters/CounterWrapper.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/counters/CounterWrapper.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/counters/CounterWrapper.java Sat Jun  9 21:45:49 2012
@@ -59,7 +59,7 @@ public class CounterWrapper {
    * @param e
    * @return
    */
-  public long findCounterValue(final Enum e) {
+  public long findCounterValue(final Enum<?> e) {
     if (mapred != null) {
       return mapred.findCounter(e).getValue();
     } else {

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/mapred/MockMapredOutputFormat.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/mapred/MockMapredOutputFormat.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/mapred/MockMapredOutputFormat.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/mapred/MockMapredOutputFormat.java Sat Jun  9 21:45:49 2012
@@ -50,11 +50,15 @@ public class MockMapredOutputFormat<K, V
   private final File outputPath = new File(
       System.getProperty("java.io.tmpdir"), "mrunit-" + Math.random());
   private final File outputFile = new File(outputPath, "part-00000");
+  @SuppressWarnings("rawtypes")
   private RecordWriter recordWriter;
+  @SuppressWarnings("rawtypes")
   private final InputFormat inputFormat;
+  @SuppressWarnings("rawtypes")
   private final OutputFormat outputFormat;
   private final List<Pair<K, V>> outputs = new ArrayList<Pair<K, V>>();
 
+  @SuppressWarnings("rawtypes")
   public MockMapredOutputFormat(JobConf outputFormatConf,
       Class<? extends OutputFormat> outputFormatClass,
       Class<? extends InputFormat> inputFormatClass, JobConf inputFormatConf)

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapreduceOutputFormat.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapreduceOutputFormat.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapreduceOutputFormat.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapreduceOutputFormat.java Sat Jun  9 21:45:49 2012
@@ -58,11 +58,15 @@ public class MockMapreduceOutputFormat<K
   private final File outputPath = new File(
       System.getProperty("java.io.tmpdir"), "mrunit-" + Math.random());
   private TaskAttemptContext taskAttemptContext;
+  @SuppressWarnings("rawtypes")
   private RecordWriter recordWriter;
+  @SuppressWarnings("rawtypes")
   private final InputFormat inputFormat;
+  @SuppressWarnings("rawtypes")
   private final OutputFormat outputFormat;
   private final List<Pair<K, V>> outputs = new ArrayList<Pair<K, V>>();
 
+  @SuppressWarnings("rawtypes")
   public MockMapreduceOutputFormat(Job outputFormatJob,
       Class<? extends OutputFormat> outputFormatClass,
       Class<? extends InputFormat> inputFormatClass, Job inputFormatJob)

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCollector.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCollector.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCollector.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCollector.java Sat Jun  9 21:45:49 2012
@@ -44,7 +44,6 @@ public class MockOutputCollector<K, V> i
    * Accepts another (key, value) pair as an output of this mapper/reducer.
    */
   @Override
-  @SuppressWarnings("unchecked")
   public void collect(final K key, final V value) throws IOException {
     collectedOutputs.add(new Pair<K, V>(serialization.copy(key), serialization
         .copy(value)));

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCreator.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCreator.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCreator.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCreator.java Sat Jun  9 21:45:49 2012
@@ -29,6 +29,7 @@ import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mrunit.internal.mapred.MockMapredOutputFormat;
 import org.apache.hadoop.mrunit.internal.mapreduce.MockMapreduceOutputFormat;
 
+@SuppressWarnings("rawtypes")
 public class MockOutputCreator<K, V> {
 
   private Class<? extends OutputFormat> mapredOutputFormatClass;

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapDriver.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapDriver.java Sat Jun  9 21:45:49 2012
@@ -209,6 +209,7 @@ public class MapDriver<K1, V1, K2, V2> e
     return this;
   }
 
+  @SuppressWarnings("rawtypes")
   public MapDriver<K1, V1, K2, V2> withOutputFormat(
       final Class<? extends OutputFormat> outputFormatClass,
       final Class<? extends InputFormat> inputFormatClass) {
@@ -259,7 +260,7 @@ public class MapDriver<K1, V1, K2, V2> e
   }
 
   @Override
-  public MapDriver<K1, V1, K2, V2> withCounter(final Enum e,
+  public MapDriver<K1, V1, K2, V2> withCounter(final Enum<?> e,
       final long expectedValue) {
     super.withCounter(e, expectedValue);
     return this;

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java Sat Jun  9 21:45:49 2012
@@ -46,7 +46,7 @@ import org.apache.hadoop.mrunit.types.Pa
  * designed to handle a single (k, v)* -> (k, v)* case from the Mapper/Reducer
  * pair, representing a single unit test.
  */
-@SuppressWarnings("rawtypes")
+
 public class MapReduceDriver<K1, V1, K2, V2, K3, V3> extends
     MapReduceDriverBase<K1, V1, K2, V2, K3, V3> {
 
@@ -57,7 +57,9 @@ public class MapReduceDriver<K1, V1, K2,
   private Reducer<K2, V2, K2, V2> myCombiner;
   private Counters counters;
 
+  @SuppressWarnings("rawtypes")
   private Class<? extends OutputFormat> outputFormatClass;
+  @SuppressWarnings("rawtypes")
   private Class<? extends InputFormat> inputFormatClass;
 
   public MapReduceDriver(final Mapper<K1, V1, K2, V2> m,
@@ -273,6 +275,7 @@ public class MapReduceDriver<K1, V1, K2,
     return this;
   }
 
+  @SuppressWarnings("rawtypes")
   public MapReduceDriver<K1, V1, K2, V2, K3, V3> withOutputFormat(
       final Class<? extends OutputFormat> outputFormatClass,
       final Class<? extends InputFormat> inputFormatClass) {
@@ -401,7 +404,7 @@ public class MapReduceDriver<K1, V1, K2,
   }
 
   @Override
-  public MapReduceDriver<K1, V1, K2, V2, K3, V3> withCounter(final Enum e,
+  public MapReduceDriver<K1, V1, K2, V2, K3, V3> withCounter(final Enum<?> e,
       final long expectedValue) {
     super.withCounter(e, expectedValue);
     return this;

Modified: mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/ReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/ReduceDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/ReduceDriver.java (original)
+++ mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/mapreduce/ReduceDriver.java Sat Jun  9 21:45:49 2012
@@ -223,6 +223,7 @@ public class ReduceDriver<K1, V1, K2, V2
     return this;
   }
 
+  @SuppressWarnings("rawtypes")
   public ReduceDriver<K1, V1, K2, V2> withOutputFormat(
       final Class<? extends OutputFormat> outputFormatClass,
       final Class<? extends InputFormat> inputFormatClass) {
@@ -273,7 +274,7 @@ public class ReduceDriver<K1, V1, K2, V2
   }
 
   @Override
-  public ReduceDriver<K1, V1, K2, V2> withCounter(final Enum e,
+  public ReduceDriver<K1, V1, K2, V2> withCounter(final Enum<?> e,
       final long expectedValue) {
     super.withCounter(e, expectedValue);
     return this;

Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java Sat Jun  9 21:45:49 2012
@@ -442,6 +442,7 @@ public class TestMapDriver {
 
   @Test
   public void testOutputFormatWithMismatchInOutputClasses() {
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     final MapDriver<Text, Text, LongWritable, Text> driver = MapDriver
         .newMapDriver(new IdentityMapper());
     driver.withOutputFormat(TextOutputFormat.class, TextInputFormat.class);

Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java Sat Jun  9 21:45:49 2012
@@ -467,6 +467,7 @@ public class TestMapReduceDriver {
     driver.runTest();
   }
 
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   @Test
   public void testOutputFormatWithMismatchInOutputClasses() {
     final MapReduceDriver driver = this.driver;

Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java Sat Jun  9 21:45:49 2012
@@ -34,7 +34,7 @@ import org.apache.hadoop.mrunit.types.Pa
 import org.junit.Rule;
 import org.junit.Test;
 
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"deprecation", "rawtypes"})
 public class TestPipelineMapReduceDriver {
 
   private static final int FOO_IN_A = 42;

Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java Sat Jun  9 21:45:49 2012
@@ -37,7 +37,6 @@ import org.apache.hadoop.mapred.Sequence
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
 import org.apache.hadoop.mapred.TextInputFormat;
 import org.apache.hadoop.mapred.TextOutputFormat;
-import org.apache.hadoop.mapred.lib.IdentityMapper;
 import org.apache.hadoop.mapred.lib.IdentityReducer;
 import org.apache.hadoop.mapred.lib.LongSumReducer;
 import org.apache.hadoop.mrunit.types.Pair;
@@ -377,6 +376,7 @@ public class TestReduceDriver {
     driver.runTest();
   }
 
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   @Test
   public void testOutputFormatWithMismatchInOutputClasses() {
     final ReduceDriver driver = ReduceDriver.newReduceDriver(reducer);

Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java Sat Jun  9 21:45:49 2012
@@ -315,6 +315,7 @@ public class TestMapDriver {
 
   @Test
   public void testOutputFormatWithMismatchInOutputClasses() {
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     final MapDriver<Text, Text, LongWritable, Text> driver = MapDriver
         .newMapDriver(new Mapper());
     driver.withOutputFormat(TextOutputFormat.class, TextInputFormat.class);

Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java Sat Jun  9 21:45:49 2012
@@ -398,6 +398,7 @@ public class TestMapReduceDriver {
     driver.runTest();
   }
 
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   @Test
   public void testOutputFormatWithMismatchInOutputClasses() {
     final MapReduceDriver driver = this.driver;

Modified: mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java
URL: http://svn.apache.org/viewvc/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java?rev=1348511&r1=1348510&r2=1348511&view=diff
==============================================================================
--- mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java (original)
+++ mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java Sat Jun  9 21:45:49 2012
@@ -32,7 +32,6 @@ import org.apache.hadoop.io.IntWritable;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.NullWritable;
 import org.apache.hadoop.io.Text;
-import org.apache.hadoop.mapreduce.Mapper;
 import org.apache.hadoop.mapreduce.Reducer;
 import org.apache.hadoop.mapreduce.lib.input.SequenceFileInputFormat;
 import org.apache.hadoop.mapreduce.lib.input.TextInputFormat;
@@ -359,7 +358,7 @@ public class TestReduceDriver {
         final Context context) throws IOException, InterruptedException {
       context.getCounter(Counters.COUNT).increment(1);
       context.getCounter("category", "count").increment(1);
-      for (final VI vi : values) {
+      for (@SuppressWarnings("unused") final VI vi : values) {
         context.getCounter(Counters.SUM).increment(1);
         context.getCounter("category", "sum").increment(1);
       }
@@ -388,6 +387,7 @@ public class TestReduceDriver {
     driver.runTest();
   }
 
+  @SuppressWarnings({ "unchecked", "rawtypes" })
   @Test
   public void testOutputFormatWithMismatchInOutputClasses() {
     final ReduceDriver driver = ReduceDriver.newReduceDriver(reducer);