MRUNIT-117 - Fix compiler warnings.
git-svn-id: https://svn.apache.org/repos/asf/mrunit/trunk@1348511 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/hadoop/mrunit/MapDriver.java b/src/main/java/org/apache/hadoop/mrunit/MapDriver.java
index aa8ecde..3c0f8db 100644
--- a/src/main/java/org/apache/hadoop/mrunit/MapDriver.java
+++ b/src/main/java/org/apache/hadoop/mrunit/MapDriver.java
@@ -204,7 +204,7 @@
}
@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 @@
return this;
}
+ @SuppressWarnings("rawtypes")
public MapDriver<K1, V1, K2, V2> withOutputFormat(
final Class<? extends OutputFormat> outputFormatClass,
final Class<? extends InputFormat> inputFormatClass) {
diff --git a/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java b/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java
index a93c661..5f18496 100644
--- a/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java
+++ b/src/main/java/org/apache/hadoop/mrunit/MapReduceDriver.java
@@ -48,7 +48,7 @@
* 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 @@
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 @@
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 @@
}
@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;
diff --git a/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java b/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java
index a0e72fc..113a76f 100644
--- a/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java
+++ b/src/main/java/org/apache/hadoop/mrunit/MapReduceDriverBase.java
@@ -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 @@
* 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> {
diff --git a/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java b/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java
index 23f9106..d9b5d28 100644
--- a/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java
+++ b/src/main/java/org/apache/hadoop/mrunit/PipelineMapReduceDriver.java
@@ -279,7 +279,7 @@
}
@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 @@
}
@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;
diff --git a/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java b/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java
index 1426934..cdf2504 100644
--- a/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java
+++ b/src/main/java/org/apache/hadoop/mrunit/ReduceDriver.java
@@ -215,7 +215,7 @@
}
@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 @@
return this;
}
+ @SuppressWarnings("rawtypes")
public ReduceDriver<K1, V1, K2, V2> withOutputFormat(
final Class<? extends OutputFormat> outputFormatClass,
final Class<? extends InputFormat> inputFormatClass) {
diff --git a/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java b/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java
index 02a1c1d..7e73447 100644
--- a/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java
+++ b/src/main/java/org/apache/hadoop/mrunit/ReduceDriverBase.java
@@ -188,7 +188,6 @@
private T value;
private final Serialization serialization;
- @SuppressWarnings("unchecked")
public ValueClassInstanceReuseList(final List<T> list,
final Configuration conf) {
super(list);
diff --git a/src/main/java/org/apache/hadoop/mrunit/TestDriver.java b/src/main/java/org/apache/hadoop/mrunit/TestDriver.java
index bbd8519..62d85cc 100644
--- a/src/main/java/org/apache/hadoop/mrunit/TestDriver.java
+++ b/src/main/java/org/apache/hadoop/mrunit/TestDriver.java
@@ -40,7 +40,7 @@
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 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 @@
/**
* @return expected counters from this driver
*/
- public List<Pair<Enum, Long>> getExpectedEnumCounters() {
+ public List<Pair<Enum<?>, Long>> getExpectedEnumCounters() {
return expectedEnumCounters;
}
@@ -103,9 +103,9 @@
* 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 @@
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());
diff --git a/src/main/java/org/apache/hadoop/mrunit/internal/counters/CounterWrapper.java b/src/main/java/org/apache/hadoop/mrunit/internal/counters/CounterWrapper.java
index e1a86b8..b72b342 100644
--- a/src/main/java/org/apache/hadoop/mrunit/internal/counters/CounterWrapper.java
+++ b/src/main/java/org/apache/hadoop/mrunit/internal/counters/CounterWrapper.java
@@ -59,7 +59,7 @@
* @param e
* @return
*/
- public long findCounterValue(final Enum e) {
+ public long findCounterValue(final Enum<?> e) {
if (mapred != null) {
return mapred.findCounter(e).getValue();
} else {
diff --git a/src/main/java/org/apache/hadoop/mrunit/internal/mapred/MockMapredOutputFormat.java b/src/main/java/org/apache/hadoop/mrunit/internal/mapred/MockMapredOutputFormat.java
index 1a29274..6683376 100644
--- a/src/main/java/org/apache/hadoop/mrunit/internal/mapred/MockMapredOutputFormat.java
+++ b/src/main/java/org/apache/hadoop/mrunit/internal/mapred/MockMapredOutputFormat.java
@@ -50,11 +50,15 @@
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)
diff --git a/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapreduceOutputFormat.java b/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapreduceOutputFormat.java
index e71dd49..831253a 100644
--- a/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapreduceOutputFormat.java
+++ b/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapreduceOutputFormat.java
@@ -58,11 +58,15 @@
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)
diff --git a/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCollector.java b/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCollector.java
index de84935..03804fc 100644
--- a/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCollector.java
+++ b/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCollector.java
@@ -44,7 +44,6 @@
* 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)));
diff --git a/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCreator.java b/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCreator.java
index 396b715..e9fb98a 100644
--- a/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCreator.java
+++ b/src/main/java/org/apache/hadoop/mrunit/internal/output/MockOutputCreator.java
@@ -29,6 +29,7 @@
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;
diff --git a/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapDriver.java b/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapDriver.java
index 13276f0..00b7b89 100644
--- a/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapDriver.java
+++ b/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapDriver.java
@@ -209,6 +209,7 @@
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 @@
}
@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;
diff --git a/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java b/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java
index 559f64f..0d22851 100644
--- a/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java
+++ b/src/main/java/org/apache/hadoop/mrunit/mapreduce/MapReduceDriver.java
@@ -46,7 +46,7 @@
* 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 @@
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 @@
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 @@
}
@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;
diff --git a/src/main/java/org/apache/hadoop/mrunit/mapreduce/ReduceDriver.java b/src/main/java/org/apache/hadoop/mrunit/mapreduce/ReduceDriver.java
index 0bd672b..c29173e 100644
--- a/src/main/java/org/apache/hadoop/mrunit/mapreduce/ReduceDriver.java
+++ b/src/main/java/org/apache/hadoop/mrunit/mapreduce/ReduceDriver.java
@@ -223,6 +223,7 @@
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 @@
}
@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;
diff --git a/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java b/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java
index c061f58..3325df5 100644
--- a/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java
+++ b/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java
@@ -442,6 +442,7 @@
@Test
public void testOutputFormatWithMismatchInOutputClasses() {
+ @SuppressWarnings({ "rawtypes", "unchecked" })
final MapDriver<Text, Text, LongWritable, Text> driver = MapDriver
.newMapDriver(new IdentityMapper());
driver.withOutputFormat(TextOutputFormat.class, TextInputFormat.class);
diff --git a/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java b/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
index ef7b971..b2cf3ef 100644
--- a/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
+++ b/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
@@ -467,6 +467,7 @@
driver.runTest();
}
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testOutputFormatWithMismatchInOutputClasses() {
final MapReduceDriver driver = this.driver;
diff --git a/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java b/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
index 41f04a7..0f7e93e 100644
--- a/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
+++ b/src/test/java/org/apache/hadoop/mrunit/TestPipelineMapReduceDriver.java
@@ -34,7 +34,7 @@
import org.junit.Rule;
import org.junit.Test;
-@SuppressWarnings("deprecation")
+@SuppressWarnings({"deprecation", "rawtypes"})
public class TestPipelineMapReduceDriver {
private static final int FOO_IN_A = 42;
diff --git a/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java b/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java
index fba4770..003b525 100644
--- a/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java
+++ b/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java
@@ -37,7 +37,6 @@
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 @@
driver.runTest();
}
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testOutputFormatWithMismatchInOutputClasses() {
final ReduceDriver driver = ReduceDriver.newReduceDriver(reducer);
diff --git a/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java b/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
index 10213b2..f3c2dc8 100644
--- a/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
+++ b/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
@@ -315,6 +315,7 @@
@Test
public void testOutputFormatWithMismatchInOutputClasses() {
+ @SuppressWarnings({ "rawtypes", "unchecked" })
final MapDriver<Text, Text, LongWritable, Text> driver = MapDriver
.newMapDriver(new Mapper());
driver.withOutputFormat(TextOutputFormat.class, TextInputFormat.class);
diff --git a/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java b/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
index b0146f8..89a6717 100644
--- a/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
+++ b/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
@@ -398,6 +398,7 @@
driver.runTest();
}
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testOutputFormatWithMismatchInOutputClasses() {
final MapReduceDriver driver = this.driver;
diff --git a/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java b/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java
index cbb0e78..c860a4e 100644
--- a/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java
+++ b/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java
@@ -32,7 +32,6 @@
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 @@
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 @@
driver.runTest();
}
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testOutputFormatWithMismatchInOutputClasses() {
final ReduceDriver driver = ReduceDriver.newReduceDriver(reducer);
