You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by uc...@apache.org on 2014/11/13 19:32:02 UTC

incubator-flink git commit: [FLINK-1218] Replace new Integer with Integer.valueOf in tests

Repository: incubator-flink
Updated Branches:
  refs/heads/master 9ff2e5b32 -> c339c266f


[FLINK-1218] Replace new Integer with Integer.valueOf in tests

This closes #183.


Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/c339c266
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/c339c266
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/c339c266

Branch: refs/heads/master
Commit: c339c266f3c40987b1251a70b1c4a1d4a62001c1
Parents: 9ff2e5b
Author: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Authored: Wed Nov 5 12:46:11 2014 -0800
Committer: uce <uc...@apache.org>
Committed: Thu Nov 13 19:30:58 2014 +0100

----------------------------------------------------------------------
 .../flink/api/avro/EncoderDecoderTest.java      | 84 ++++++++++----------
 .../streaming/connectors/db/DBStateTest.java    |  6 +-
 .../streaming/api/datastream/DataStream.java    |  2 +-
 .../operator/BatchGroupReduceTest.java          |  2 +-
 .../serialization/TypeSerializationTest.java    |  2 +-
 .../common/operators/util/FieldListTest.java    |  6 +-
 .../api/common/operators/util/FieldSetTest.java |  6 +-
 .../typeutils/base/BooleanSerializerTest.java   |  8 +-
 .../typeutils/base/ByteComparatorTest.java      | 16 ++--
 .../typeutils/base/ByteSerializerTest.java      |  4 +-
 .../typeutils/base/DoubleComparatorTest.java    | 12 +--
 .../typeutils/base/DoubleSerializerTest.java    | 10 +--
 .../typeutils/base/FloatComparatorTest.java     | 12 +--
 .../typeutils/base/FloatSerializerTest.java     | 10 +--
 .../typeutils/base/IntComparatorTest.java       | 16 ++--
 .../typeutils/base/IntSerializerTest.java       |  6 +-
 .../typeutils/base/LongComparatorTest.java      | 16 ++--
 .../typeutils/base/LongSerializerTest.java      |  6 +-
 .../typeutils/base/ShortComparatorTest.java     | 20 ++---
 .../typeutils/base/ShortSerializerTest.java     |  6 +-
 .../java/graph/TransitiveClosureNaive.java      |  4 +-
 .../translation/AggregateTranslationTest.java   |  2 +-
 .../runtime/TupleComparatorILD2Test.java        | 16 ++--
 .../runtime/TupleComparatorILD3Test.java        | 16 ++--
 .../runtime/TupleComparatorILDC3Test.java       | 16 ++--
 .../runtime/TupleComparatorILDX1Test.java       | 16 ++--
 .../runtime/TupleComparatorILDXC2Test.java      | 16 ++--
 .../runtime/jobmanager/web/JsonFactory.java     |  2 +-
 .../runtime/operators/hash/HashTableITCase.java | 24 +++---
 .../hash/ReOpenableHashTableITCase.java         |  8 +-
 .../CombiningUnilateralSortMergerITCase.java    |  2 +-
 .../api/scala/typeutils/NothingSerializer.scala |  2 +-
 .../test/accumulators/AccumulatorITCase.java    |  4 +-
 .../AccumulatorIterativeITCase.java             |  2 +-
 .../clients/examples/LocalExecutorITCase.java   |  2 +-
 .../iterative/ConnectedComponentsITCase.java    |  2 +-
 .../aggregators/AggregatorsITCase.java          |  6 +-
 .../nephele/DanglingPageRankNepheleITCase.java  |  2 +-
 ...nglingPageRankWithCombinerNepheleITCase.java |  2 +-
 .../flink/test/javaApiOperators/MapITCase.java  |  4 +-
 .../recordJobTests/GlobalSortingITCase.java     |  2 +-
 .../GlobalSortingMixedOrderITCase.java          |  2 +-
 .../TPCHQuery3WithUnionITCase.java              |  2 +-
 .../test/recordJobTests/TPCHQuery4ITCase.java   |  2 +-
 .../test/recordJobTests/TPCHQuery9ITCase.java   |  2 +-
 .../recordJobTests/TPCHQueryAsterixITCase.java  |  2 +-
 .../test/recordJobTests/TeraSortITCase.java     |  2 +-
 .../recordJobTests/WebLogAnalysisITCase.java    |  2 +-
 .../test/recordJobTests/WordCountITCase.java    |  2 +-
 49 files changed, 207 insertions(+), 209 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java b/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java
index 74b5397..0724457 100644
--- a/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java
+++ b/flink-addons/flink-avro/src/test/java/org/apache/flink/api/avro/EncoderDecoderTest.java
@@ -89,53 +89,53 @@ public class EncoderDecoderTest {
 		testObjectSerialization(new Boolean(true));
 		testObjectSerialization(new Boolean(false));
 		
-		testObjectSerialization(new Byte((byte) 0));
-		testObjectSerialization(new Byte((byte) 1));
-		testObjectSerialization(new Byte((byte) -1));
-		testObjectSerialization(new Byte(Byte.MIN_VALUE));
-		testObjectSerialization(new Byte(Byte.MAX_VALUE));
+		testObjectSerialization(Byte.valueOf((byte) 0));
+		testObjectSerialization(Byte.valueOf((byte) 1));
+		testObjectSerialization(Byte.valueOf((byte) -1));
+		testObjectSerialization(Byte.valueOf(Byte.MIN_VALUE));
+		testObjectSerialization(Byte.valueOf(Byte.MAX_VALUE));
 		
-		testObjectSerialization(new Short((short) 0));
-		testObjectSerialization(new Short((short) 1));
-		testObjectSerialization(new Short((short) -1));
-		testObjectSerialization(new Short(Short.MIN_VALUE));
-		testObjectSerialization(new Short(Short.MAX_VALUE));
+		testObjectSerialization(Short.valueOf((short) 0));
+		testObjectSerialization(Short.valueOf((short) 1));
+		testObjectSerialization(Short.valueOf((short) -1));
+		testObjectSerialization(Short.valueOf(Short.MIN_VALUE));
+		testObjectSerialization(Short.valueOf(Short.MAX_VALUE));
 		
-		testObjectSerialization(new Integer(0));
-		testObjectSerialization(new Integer(1));
-		testObjectSerialization(new Integer(-1));
-		testObjectSerialization(new Integer(Integer.MIN_VALUE));
-		testObjectSerialization(new Integer(Integer.MAX_VALUE));
+		testObjectSerialization(Integer.valueOf(0));
+		testObjectSerialization(Integer.valueOf(1));
+		testObjectSerialization(Integer.valueOf(-1));
+		testObjectSerialization(Integer.valueOf(Integer.MIN_VALUE));
+		testObjectSerialization(Integer.valueOf(Integer.MAX_VALUE));
 		
-		testObjectSerialization(new Long(0));
-		testObjectSerialization(new Long(1));
-		testObjectSerialization(new Long(-1));
-		testObjectSerialization(new Long(Long.MIN_VALUE));
-		testObjectSerialization(new Long(Long.MAX_VALUE));
+		testObjectSerialization(Long.valueOf(0));
+		testObjectSerialization(Long.valueOf(1));
+		testObjectSerialization(Long.valueOf(-1));
+		testObjectSerialization(Long.valueOf(Long.MIN_VALUE));
+		testObjectSerialization(Long.valueOf(Long.MAX_VALUE));
 		
-		testObjectSerialization(new Float(0));
-		testObjectSerialization(new Float(1));
-		testObjectSerialization(new Float(-1));
-		testObjectSerialization(new Float((float)Math.E));
-		testObjectSerialization(new Float((float)Math.PI));
-		testObjectSerialization(new Float(Float.MIN_VALUE));
-		testObjectSerialization(new Float(Float.MAX_VALUE));
-		testObjectSerialization(new Float(Float.MIN_NORMAL));
-		testObjectSerialization(new Float(Float.NaN));
-		testObjectSerialization(new Float(Float.NEGATIVE_INFINITY));
-		testObjectSerialization(new Float(Float.POSITIVE_INFINITY));
+		testObjectSerialization(Float.valueOf(0));
+		testObjectSerialization(Float.valueOf(1));
+		testObjectSerialization(Float.valueOf(-1));
+		testObjectSerialization(Float.valueOf((float)Math.E));
+		testObjectSerialization(Float.valueOf((float)Math.PI));
+		testObjectSerialization(Float.valueOf(Float.MIN_VALUE));
+		testObjectSerialization(Float.valueOf(Float.MAX_VALUE));
+		testObjectSerialization(Float.valueOf(Float.MIN_NORMAL));
+		testObjectSerialization(Float.valueOf(Float.NaN));
+		testObjectSerialization(Float.valueOf(Float.NEGATIVE_INFINITY));
+		testObjectSerialization(Float.valueOf(Float.POSITIVE_INFINITY));
 		
-		testObjectSerialization(new Double(0));
-		testObjectSerialization(new Double(1));
-		testObjectSerialization(new Double(-1));
-		testObjectSerialization(new Double(Math.E));
-		testObjectSerialization(new Double(Math.PI));
-		testObjectSerialization(new Double(Double.MIN_VALUE));
-		testObjectSerialization(new Double(Double.MAX_VALUE));
-		testObjectSerialization(new Double(Double.MIN_NORMAL));
-		testObjectSerialization(new Double(Double.NaN));
-		testObjectSerialization(new Double(Double.NEGATIVE_INFINITY));
-		testObjectSerialization(new Double(Double.POSITIVE_INFINITY));
+		testObjectSerialization(Double.valueOf(0));
+		testObjectSerialization(Double.valueOf(1));
+		testObjectSerialization(Double.valueOf(-1));
+		testObjectSerialization(Double.valueOf(Math.E));
+		testObjectSerialization(Double.valueOf(Math.PI));
+		testObjectSerialization(Double.valueOf(Double.MIN_VALUE));
+		testObjectSerialization(Double.valueOf(Double.MAX_VALUE));
+		testObjectSerialization(Double.valueOf(Double.MIN_NORMAL));
+		testObjectSerialization(Double.valueOf(Double.NaN));
+		testObjectSerialization(Double.valueOf(Double.NEGATIVE_INFINITY));
+		testObjectSerialization(Double.valueOf(Double.POSITIVE_INFINITY));
 		
 		testObjectSerialization("");
 		testObjectSerialization("abcdefg");

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-addons/flink-streaming/flink-streaming-connectors/src/test/java/org/apache/flink/streaming/connectors/db/DBStateTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/src/test/java/org/apache/flink/streaming/connectors/db/DBStateTest.java b/flink-addons/flink-streaming/flink-streaming-connectors/src/test/java/org/apache/flink/streaming/connectors/db/DBStateTest.java
index 82ac868..fe3783b 100644
--- a/flink-addons/flink-streaming/flink-streaming-connectors/src/test/java/org/apache/flink/streaming/connectors/db/DBStateTest.java
+++ b/flink-addons/flink-streaming/flink-streaming-connectors/src/test/java/org/apache/flink/streaming/connectors/db/DBStateTest.java
@@ -31,12 +31,12 @@ public class DBStateTest {
 	
 	public void stateTest(DBState<String, Integer> state) {
 		state.put("k1", 1);
-		assertEquals(new Integer(1), state.get("k1"));
+		assertEquals(Integer.valueOf(1), state.get("k1"));
 
 		state.put("k2", 2);
 		state.put("k3", 3);
-		assertEquals(new Integer(2), state.get("k2"));
-		assertEquals(new Integer(3), state.get("k3"));
+		assertEquals(Integer.valueOf(2), state.get("k2"));
+		assertEquals(Integer.valueOf(3), state.get("k3"));
 		state.remove("k2");
 		
 		try {

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
index 991b6d7..6981af4 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
@@ -986,7 +986,7 @@ public class DataStream<OUT> {
 	 */
 	public SingleOutputStreamOperator<Long, ?> count() {
 		TypeWrapper<OUT> inTypeWrapper = outTypeWrapper;
-		TypeWrapper<Long> outTypeWrapper = new ObjectTypeWrapper<Long>(new Long(0));
+		TypeWrapper<Long> outTypeWrapper = new ObjectTypeWrapper<Long>(Long.valueOf(0));
 
 		return addFunction("counter", null, inTypeWrapper, outTypeWrapper,
 				new CounterInvokable<OUT>());

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/invokable/operator/BatchGroupReduceTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/invokable/operator/BatchGroupReduceTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/invokable/operator/BatchGroupReduceTest.java
index 4ba913c..f157a08 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/invokable/operator/BatchGroupReduceTest.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/api/invokable/operator/BatchGroupReduceTest.java
@@ -72,7 +72,7 @@ public class BatchGroupReduceTest {
 				count++;
 			}
 			if (count > 0) {
-				out.collect(new Double(sum / count));
+				out.collect(Double.valueOf(sum / count));
 			}
 		}
 	}

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/util/serialization/TypeSerializationTest.java
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/util/serialization/TypeSerializationTest.java b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/util/serialization/TypeSerializationTest.java
index 8795126..1d2fd2e 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/util/serialization/TypeSerializationTest.java
+++ b/flink-addons/flink-streaming/flink-streaming-core/src/test/java/org/apache/flink/streaming/util/serialization/TypeSerializationTest.java
@@ -55,7 +55,7 @@ public class TypeSerializationTest {
 	@SuppressWarnings("unchecked")
 	@Test
 	public void objectTypeSerializationTest() {
-		Integer instance = new Integer(22);
+		Integer instance = Integer.valueOf(22);
 		
 		TypeWrapper<Integer> ser = new ObjectTypeWrapper<Integer>(instance);
 		

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldListTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldListTest.java b/flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldListTest.java
index 8b98670..24783ac 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldListTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldListTest.java
@@ -37,7 +37,7 @@ public class FieldListTest {
 		check(new FieldList());
 		check(FieldList.EMPTY_LIST);
 		check(new FieldList(14), 14);
-		check(new FieldList(new Integer(3)), 3);
+		check(new FieldList(Integer.valueOf(3)), 3);
 		check(new FieldList(7, 4, 1), 7, 4, 1);
 		check(new FieldList(7, 4, 1, 4, 7, 1, 4, 2), 7, 4, 1, 4, 7, 1, 4, 2);
 	}
@@ -55,14 +55,14 @@ public class FieldListTest {
 	public void testImmutability() {
 		FieldList s1 = new FieldList();
 		FieldList s2 = new FieldList(5);
-		FieldList s3 = new FieldList(new Integer(7));
+		FieldList s3 = new FieldList(Integer.valueOf(7));
 		FieldList s4 = new FieldList(5, 4, 7, 6);
 		
 		s1.addFields(s2).addFields(s3);
 		s2.addFields(s4);
 		s4.addFields(s1);
 		
-		s1.addField(new Integer(14));
+		s1.addField(Integer.valueOf(14));
 		s2.addFields(78, 13, 66, 3);
 		
 		assertEquals(0, s1.size());

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldSetTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldSetTest.java b/flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldSetTest.java
index a0db9fd..7549f43 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldSetTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/operators/util/FieldSetTest.java
@@ -37,7 +37,7 @@ public class FieldSetTest {
 		check(new FieldSet());
 		check(FieldSet.EMPTY_SET);
 		check(new FieldSet(14), 14);
-		check(new FieldSet(new Integer(3)), 3);
+		check(new FieldSet(Integer.valueOf(3)), 3);
 		check(new FieldSet(7, 4, 1), 1, 4, 7);
 		check(new FieldSet(7, 4, 1, 4, 7, 1, 4, 2), 1, 4, 2, 7);
 	}
@@ -58,14 +58,14 @@ public class FieldSetTest {
 	public void testImmutability() {
 		FieldSet s1 = new FieldSet();
 		FieldSet s2 = new FieldSet(5);
-		FieldSet s3 = new FieldSet(new Integer(7));
+		FieldSet s3 = new FieldSet(Integer.valueOf(7));
 		FieldSet s4 = new FieldSet(5, 4, 7, 6);
 		
 		s1.addFields(s2).addFields(s3);
 		s2.addFields(s4);
 		s4.addFields(s1);
 		
-		s1.addField(new Integer(14));
+		s1.addField(Integer.valueOf(14));
 		s2.addFields(78, 13, 66, 3);
 		
 		assertEquals(0, s1.size());

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java
index dd31fb0..e34d7b4 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/BooleanSerializerTest.java
@@ -48,9 +48,9 @@ public class BooleanSerializerTest extends SerializerTestBase<Boolean> {
 	protected Boolean[] getTestData() {
 		Random rnd = new Random(874597969123412341L);
 		
-		return new Boolean[] {new Boolean(true), new Boolean(false),
-								new Boolean(rnd.nextBoolean()),
-								new Boolean(rnd.nextBoolean()),
-								new Boolean(rnd.nextBoolean())};
+		return new Boolean[] {Boolean.valueOf(true), Boolean.valueOf(false),
+								Boolean.valueOf(rnd.nextBoolean()),
+								Boolean.valueOf(rnd.nextBoolean()),
+								Boolean.valueOf(rnd.nextBoolean())};
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java
index eceaeb1..e31a4eb 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteComparatorTest.java
@@ -53,13 +53,13 @@ public class ByteComparatorTest extends ComparatorTestBase<Byte> {
 			rndByte += 3;
 		}
 		return new Byte[]{
-			new Byte(Byte.MIN_VALUE),
-			new Byte(new Integer(-rndByte).byteValue()),
-			new Byte(new Integer(-1).byteValue()),
-			new Byte(new Integer(0).byteValue()),
-			new Byte(new Integer(1).byteValue()),
-			new Byte(new Integer(2).byteValue()),
-			new Byte(new Integer(rndByte).byteValue()),
-			new Byte(Byte.MAX_VALUE)};
+			Byte.valueOf(Byte.MIN_VALUE),
+			Byte.valueOf(Integer.valueOf(-rndByte).byteValue()),
+			Byte.valueOf(Integer.valueOf(-1).byteValue()),
+			Byte.valueOf(Integer.valueOf(0).byteValue()),
+			Byte.valueOf(Integer.valueOf(1).byteValue()),
+			Byte.valueOf(Integer.valueOf(2).byteValue()),
+			Byte.valueOf(Integer.valueOf(rndByte).byteValue()),
+			Byte.valueOf(Byte.MAX_VALUE)};
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java
index dea2248..26098b9 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ByteSerializerTest.java
@@ -50,8 +50,8 @@ public class ByteSerializerTest extends SerializerTestBase<Byte> {
 		byte byteArray[] = new byte[1];
 		rnd.nextBytes(byteArray);
 		
-		return new Byte[] {new Byte((byte) 0), new Byte((byte) 1), new Byte((byte) -1), 
+		return new Byte[] {Byte.valueOf((byte) 0), Byte.valueOf((byte) 1), Byte.valueOf((byte) -1), 
 							Byte.MAX_VALUE, Byte.MIN_VALUE,
-							new Byte(byteArray[0]), new Byte((byte) -byteArray[0])};
+							Byte.valueOf(byteArray[0]), Byte.valueOf((byte) -byteArray[0])};
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java
index 78180df..93732ca 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleComparatorTest.java
@@ -52,11 +52,11 @@ public class DoubleComparatorTest extends ComparatorTestBase<Double> {
 			rndDouble += 3;
 		}
 		return new Double[]{
-			new Double(-rndDouble),
-			new Double(-1.0D),
-			new Double(0.0D),
-			new Double(2.0D),
-			new Double(rndDouble),
-			new Double(Double.MAX_VALUE)};
+			Double.valueOf(-rndDouble),
+			Double.valueOf(-1.0D),
+			Double.valueOf(0.0D),
+			Double.valueOf(2.0D),
+			Double.valueOf(rndDouble),
+			Double.valueOf(Double.MAX_VALUE)};
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java
index c2127af..b1f46b7 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/DoubleSerializerTest.java
@@ -48,10 +48,10 @@ public class DoubleSerializerTest extends SerializerTestBase<Double> {
 		Random rnd = new Random(874597969123412341L);
 		Double rndDouble = rnd.nextDouble() * Double.MAX_VALUE;
 		
-		return new Double[] {new Double(0), new Double(1), new Double(-1),
-							new Double(Double.MAX_VALUE), new Double(Double.MIN_VALUE),
-							new Double(rndDouble), new Double(-rndDouble),
-							new Double(Double.NaN),
-							new Double(Double.NEGATIVE_INFINITY), new Double(Double.POSITIVE_INFINITY)};
+		return new Double[] {Double.valueOf(0), Double.valueOf(1), Double.valueOf(-1),
+							Double.valueOf(Double.MAX_VALUE), Double.valueOf(Double.MIN_VALUE),
+							Double.valueOf(rndDouble), Double.valueOf(-rndDouble),
+							Double.valueOf(Double.NaN),
+							Double.valueOf(Double.NEGATIVE_INFINITY), Double.valueOf(Double.POSITIVE_INFINITY)};
 	}
 }	

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java
index fb0e02f..418d62f 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatComparatorTest.java
@@ -52,11 +52,11 @@ public class FloatComparatorTest extends ComparatorTestBase<Float> {
 			rndFloat += 3;
 		}
 		return new Float[]{
-			new Float(-rndFloat),
-			new Float(-1.0F),
-			new Float(0.0F),
-			new Float(2.0F),
-			new Float(rndFloat),
-			new Float(Float.MAX_VALUE)};
+			Float.valueOf(-rndFloat),
+			Float.valueOf(-1.0F),
+			Float.valueOf(0.0F),
+			Float.valueOf(2.0F),
+			Float.valueOf(rndFloat),
+			Float.valueOf(Float.MAX_VALUE)};
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java
index ccfff62..33e8fbe 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/FloatSerializerTest.java
@@ -48,10 +48,10 @@ public class FloatSerializerTest extends SerializerTestBase<Float> {
 		Random rnd = new Random(874597969123412341L);
 		float rndFloat = rnd.nextFloat() * Float.MAX_VALUE;
 		
-		return new Float[] {new Float(0), new Float(1), new Float(-1),
-							new Float(Float.MAX_VALUE), new Float(Float.MIN_VALUE),
-							new Float(rndFloat), new Float(-rndFloat),
-							new Float(Float.NaN),
-							new Float(Float.NEGATIVE_INFINITY), new Float(Float.POSITIVE_INFINITY)};
+		return new Float[] {Float.valueOf(0), Float.valueOf(1), Float.valueOf(-1),
+							Float.valueOf(Float.MAX_VALUE), Float.valueOf(Float.MIN_VALUE),
+							Float.valueOf(rndFloat), Float.valueOf(-rndFloat),
+							Float.valueOf(Float.NaN),
+							Float.valueOf(Float.NEGATIVE_INFINITY), Float.valueOf(Float.POSITIVE_INFINITY)};
 	}
 }	

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java
index 192a4e0..22b70ce 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntComparatorTest.java
@@ -53,13 +53,13 @@ public class IntComparatorTest extends ComparatorTestBase<Integer> {
 			rndInt += 3;
 		}
 		return new Integer[]{
-			new Integer(Integer.MIN_VALUE),
-			new Integer(-rndInt),
-			new Integer(-1),
-			new Integer(0),
-			new Integer(1),
-			new Integer(2),
-			new Integer(rndInt),
-			new Integer(Integer.MAX_VALUE)};
+			Integer.valueOf(Integer.MIN_VALUE),
+			Integer.valueOf(-rndInt),
+			Integer.valueOf(-1),
+			Integer.valueOf(0),
+			Integer.valueOf(1),
+			Integer.valueOf(2),
+			Integer.valueOf(rndInt),
+			Integer.valueOf(Integer.MAX_VALUE)};
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java
index 90cacdb..ce0d249 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/IntSerializerTest.java
@@ -48,8 +48,8 @@ public class IntSerializerTest extends SerializerTestBase<Integer> {
 		Random rnd = new Random(874597969123412341L);
 		int rndInt = rnd.nextInt();
 		
-		return new Integer[] {new Integer(0), new Integer(1), new Integer(-1),
-							new Integer(Integer.MAX_VALUE), new Integer(Integer.MIN_VALUE),
-							new Integer(rndInt), new Integer(-rndInt)};
+		return new Integer[] {Integer.valueOf(0), Integer.valueOf(1), Integer.valueOf(-1),
+							Integer.valueOf(Integer.MAX_VALUE), Integer.valueOf(Integer.MIN_VALUE),
+							Integer.valueOf(rndInt), Integer.valueOf(-rndInt)};
 	}
 }	

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java
index 512375e..ce5bdbc 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongComparatorTest.java
@@ -52,13 +52,13 @@ public class LongComparatorTest extends ComparatorTestBase<Long> {
 			rndLong += 3;
 		}
 		return new Long[]{
-			new Long(Long.MIN_VALUE),
-			new Long(-rndLong),
-			new Long(-1L),
-			new Long(0L),
-			new Long(1L),
-			new Long(2L),
-			new Long(rndLong),
-			new Long(Long.MAX_VALUE)};
+			Long.valueOf(Long.MIN_VALUE),
+			Long.valueOf(-rndLong),
+			Long.valueOf(-1L),
+			Long.valueOf(0L),
+			Long.valueOf(1L),
+			Long.valueOf(2L),
+			Long.valueOf(rndLong),
+			Long.valueOf(Long.MAX_VALUE)};
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java
index 1cbf0b7..1d4a301 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/LongSerializerTest.java
@@ -48,8 +48,8 @@ public class LongSerializerTest extends SerializerTestBase<Long> {
 		Random rnd = new Random(874597969123412341L);
 		long rndLong = rnd.nextLong();
 		
-		return new Long[] {new Long(0L), new Long(1L), new Long(-1L),
-							new Long(Long.MAX_VALUE), new Long(Long.MIN_VALUE),
-							new Long(rndLong), new Long(-rndLong)};
+		return new Long[] {Long.valueOf(0L), Long.valueOf(1L), Long.valueOf(-1L),
+							Long.valueOf(Long.MAX_VALUE), Long.valueOf(Long.MIN_VALUE),
+							Long.valueOf(rndLong), Long.valueOf(-rndLong)};
 	}
 }	

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java
index 9b49d65..a987129 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortComparatorTest.java
@@ -41,9 +41,9 @@ public class ShortComparatorTest extends ComparatorTestBase<Short> {
 	@Override
 	protected Short[] getSortedTestData() {
 		Random rnd = new Random(874597969123412338L);
-		short rndShort = new Integer(rnd.nextInt()).shortValue();
+		short rndShort = Integer.valueOf(rnd.nextInt()).shortValue();
 		if (rndShort < 0) {
-			rndShort = new Integer(-rndShort).shortValue();
+			rndShort = Integer.valueOf(-rndShort).shortValue();
 		}
 		if (rndShort == Short.MAX_VALUE) {
 			rndShort -= 3;
@@ -52,13 +52,13 @@ public class ShortComparatorTest extends ComparatorTestBase<Short> {
 			rndShort += 3;
 		}
 		return new Short[]{
-			new Short(Short.MIN_VALUE),
-			new Short(new Integer(-rndShort).shortValue()),
-			new Short(new Integer(-1).shortValue()),
-			new Short(new Integer(0).shortValue()),
-			new Short(new Integer(1).shortValue()),
-			new Short(new Integer(2).shortValue()),
-			new Short(new Integer(rndShort).shortValue()),
-			new Short(Short.MAX_VALUE)};
+			Short.valueOf(Short.MIN_VALUE),
+			Short.valueOf(Integer.valueOf(-rndShort).shortValue()),
+			Short.valueOf(Integer.valueOf(-1).shortValue()),
+			Short.valueOf(Integer.valueOf(0).shortValue()),
+			Short.valueOf(Integer.valueOf(1).shortValue()),
+			Short.valueOf(Integer.valueOf(2).shortValue()),
+			Short.valueOf(Integer.valueOf(rndShort).shortValue()),
+			Short.valueOf(Short.MAX_VALUE)};
 	}
 }

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java
index af1c8fb..fd3b167 100644
--- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/ShortSerializerTest.java
@@ -50,9 +50,9 @@ public class ShortSerializerTest extends SerializerTestBase<Short> {
 		Random rnd = new Random(874597969123412341L);
 		int rndInt = rnd.nextInt(32767);
 		
-		return new Short[] {new Short((short) 0), new Short((short) 1), new Short((short) -1),
-							new Short((short) rndInt), new Short((short) -rndInt),
-							new Short((short) -32767), new Short((short) 32768)};
+		return new Short[] {Short.valueOf((short) 0), Short.valueOf((short) 1), Short.valueOf((short) -1),
+							Short.valueOf((short) rndInt), Short.valueOf((short) -rndInt),
+							Short.valueOf((short) -32767), Short.valueOf((short) 32768)};
 	}
 }
 	

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/graph/TransitiveClosureNaive.java
----------------------------------------------------------------------
diff --git a/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/graph/TransitiveClosureNaive.java b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/graph/TransitiveClosureNaive.java
index c7f2185..f532a95 100644
--- a/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/graph/TransitiveClosureNaive.java
+++ b/flink-examples/flink-java-examples/src/main/java/org/apache/flink/examples/java/graph/TransitiveClosureNaive.java
@@ -62,9 +62,7 @@ public class TransitiveClosureNaive implements ProgramDescription {
 						out: Path (z,y) - y is reachable by z
 					 */
 					public Tuple2<Long, Long> join(Tuple2<Long, Long> left, Tuple2<Long, Long> right) throws Exception {
-						return new Tuple2<Long, Long>(
-								new Long(left.f0),
-								new Long(right.f1));
+						return new Tuple2<Long, Long>(left.f0, right.f1);
 					}
 				})
 				.union(paths)

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-java/src/test/java/org/apache/flink/api/java/operators/translation/AggregateTranslationTest.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/operators/translation/AggregateTranslationTest.java b/flink-java/src/test/java/org/apache/flink/api/java/operators/translation/AggregateTranslationTest.java
index 1c5daca..08eefff 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/operators/translation/AggregateTranslationTest.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/operators/translation/AggregateTranslationTest.java
@@ -44,7 +44,7 @@ public class AggregateTranslationTest {
 			
 			@SuppressWarnings("unchecked")
 			DataSet<Tuple3<Double, StringValue, Long>> initialData = 
-					env.fromElements(new Tuple3<Double, StringValue, Long>(3.141592, new StringValue("foobar"), new Long(77)));
+					env.fromElements(new Tuple3<Double, StringValue, Long>(3.141592, new StringValue("foobar"), Long.valueOf(77)));
 			
 			initialData.groupBy(0).aggregate(Aggregations.MIN, 1).and(Aggregations.SUM, 2).print();
 			

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java
index 3cc8c4e..6b4bfb1 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD2Test.java
@@ -35,14 +35,14 @@ public class TupleComparatorILD2Test extends TupleComparatorTestBase<Tuple3<Inte
 
 	@SuppressWarnings("unchecked")
 	Tuple3<Integer, Long, Double>[] dataISD = new Tuple3[]{
-		new Tuple3<Integer, Long, Double>(4, new Long(14), 20.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(15), 23.2),
-		new Tuple3<Integer, Long, Double>(5, new Long(15), 20.0),
-		new Tuple3<Integer, Long, Double>(5, new Long(20), 20.0),
-		new Tuple3<Integer, Long, Double>(6, new Long(20), 23.2),
-		new Tuple3<Integer, Long, Double>(6, new Long(29), 20.0),
-		new Tuple3<Integer, Long, Double>(7, new Long(29), 20.0),
-		new Tuple3<Integer, Long, Double>(7, new Long(34), 23.2)
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(14), 20.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(15), 23.2),
+		new Tuple3<Integer, Long, Double>(5, Long.valueOf(15), 20.0),
+		new Tuple3<Integer, Long, Double>(5, Long.valueOf(20), 20.0),
+		new Tuple3<Integer, Long, Double>(6, Long.valueOf(20), 23.2),
+		new Tuple3<Integer, Long, Double>(6, Long.valueOf(29), 20.0),
+		new Tuple3<Integer, Long, Double>(7, Long.valueOf(29), 20.0),
+		new Tuple3<Integer, Long, Double>(7, Long.valueOf(34), 23.2)
 	};
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java
index be91b73..8d13ab7 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILD3Test.java
@@ -36,14 +36,14 @@ public class TupleComparatorILD3Test extends TupleComparatorTestBase<Tuple3<Inte
 
 	@SuppressWarnings("unchecked")
 	Tuple3<Integer, Long, Double>[] dataISD = new Tuple3[]{
-		new Tuple3<Integer, Long, Double>(4, new Long(4), 20.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(4), 23.2),
-		new Tuple3<Integer, Long, Double>(4, new Long(9), 20.0),
-		new Tuple3<Integer, Long, Double>(5, new Long(4), 20.0),
-		new Tuple3<Integer, Long, Double>(5, new Long(4), 23.2),
-		new Tuple3<Integer, Long, Double>(5, new Long(9), 20.0),
-		new Tuple3<Integer, Long, Double>(6, new Long(4), 20.0),
-		new Tuple3<Integer, Long, Double>(6, new Long(4), 23.2)
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(4), 20.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(4), 23.2),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(9), 20.0),
+		new Tuple3<Integer, Long, Double>(5, Long.valueOf(4), 20.0),
+		new Tuple3<Integer, Long, Double>(5, Long.valueOf(4), 23.2),
+		new Tuple3<Integer, Long, Double>(5, Long.valueOf(9), 20.0),
+		new Tuple3<Integer, Long, Double>(6, Long.valueOf(4), 20.0),
+		new Tuple3<Integer, Long, Double>(6, Long.valueOf(4), 23.2)
 	};
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java
index 8452be1..82b8b4e 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDC3Test.java
@@ -36,14 +36,14 @@ public class TupleComparatorILDC3Test extends TupleComparatorTestBase<Tuple3<Int
 
 	@SuppressWarnings("unchecked")
 	Tuple3<Integer, Long, Double>[] dataISD = new Tuple3[]{
-		new Tuple3<Integer, Long, Double>(4, new Long(4), 20.0),
-		new Tuple3<Integer, Long, Double>(5, new Long(1), 20.0),
-		new Tuple3<Integer, Long, Double>(5, new Long(2), 20.0),
-		new Tuple3<Integer, Long, Double>(5, new Long(10), 23.0),
-		new Tuple3<Integer, Long, Double>(5, new Long(19), 24.0),
-		new Tuple3<Integer, Long, Double>(5, new Long(20), 24.0),
-		new Tuple3<Integer, Long, Double>(5, new Long(24), 25.0),
-		new Tuple3<Integer, Long, Double>(5, new Long(25), 25.0)
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(4), 20.0),
+		new Tuple3<Integer, Long, Double>(5, Long.valueOf(1), 20.0),
+		new Tuple3<Integer, Long, Double>(5, Long.valueOf(2), 20.0),
+		new Tuple3<Integer, Long, Double>(5, Long.valueOf(10), 23.0),
+		new Tuple3<Integer, Long, Double>(5, Long.valueOf(19), 24.0),
+		new Tuple3<Integer, Long, Double>(5, Long.valueOf(20), 24.0),
+		new Tuple3<Integer, Long, Double>(5, Long.valueOf(24), 25.0),
+		new Tuple3<Integer, Long, Double>(5, Long.valueOf(25), 25.0)
 	};
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java
index 45ffa88..25de450 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDX1Test.java
@@ -34,14 +34,14 @@ public class TupleComparatorILDX1Test extends TupleComparatorTestBase<Tuple3<Int
 
 	@SuppressWarnings("unchecked")
 	Tuple3<Integer, Long, Double>[] dataISD = new Tuple3[]{
-		new Tuple3<Integer, Long, Double>(4, new Long(4), 20.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(5), 23.2),
-		new Tuple3<Integer, Long, Double>(4, new Long(9), 20.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(10), 24.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(19), 23.2),
-		new Tuple3<Integer, Long, Double>(4, new Long(20), 24.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(24), 20.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(25), 23.2)
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(4), 20.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(5), 23.2),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(9), 20.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(10), 24.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(19), 23.2),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(20), 24.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(24), 20.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(25), 23.2)
 	};
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java
----------------------------------------------------------------------
diff --git a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java
index d306c69..8180b1e 100644
--- a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java
+++ b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/runtime/TupleComparatorILDXC2Test.java
@@ -35,14 +35,14 @@ public class TupleComparatorILDXC2Test extends TupleComparatorTestBase<Tuple3<In
 
 	@SuppressWarnings("unchecked")
 	Tuple3<Integer, Long, Double>[] dataISD = new Tuple3[]{
-		new Tuple3<Integer, Long, Double>(4, new Long(4), 20.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(5), 20.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(3), 23.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(19), 23.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(17), 24.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(18), 24.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(24), 25.0),
-		new Tuple3<Integer, Long, Double>(4, new Long(25), 25.0)
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(4), 20.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(5), 20.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(3), 23.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(19), 23.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(17), 24.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(18), 24.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(24), 25.0),
+		new Tuple3<Integer, Long, Double>(4, Long.valueOf(25), 25.0)
 	};
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JsonFactory.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JsonFactory.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JsonFactory.java
index e4440c2..1469a4c 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JsonFactory.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmanager/web/JsonFactory.java
@@ -61,7 +61,7 @@ public class JsonFactory {
 		
 		// initialize with 0
 		for (ExecutionState state : ExecutionState.values()) {
-			stateCounts.put(state, new Integer(0));
+			stateCounts.put(state, Integer.valueOf(0));
 		}
 		
 		ExecutionVertex[] vertices = jobVertex.getTaskVertices();

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java
index 2cc9892..877c5cc 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java
@@ -301,10 +301,10 @@ public class HashTableITCase {
 			
 			Long contained = map.get(key);
 			if (contained == null) {
-				contained = new Long(numBuildValues);
+				contained = Long.valueOf(numBuildValues);
 			}
 			else {
-				contained = new Long(contained.longValue() + (numBuildValues));
+				contained = Long.valueOf(contained.longValue() + (numBuildValues));
 			}
 			
 			map.put(key, contained);
@@ -408,10 +408,10 @@ public class HashTableITCase {
 			
 			Long contained = map.get(key);
 			if (contained == null) {
-				contained = new Long(numBuildValues);
+				contained = Long.valueOf(numBuildValues);
 			}
 			else {
-				contained = new Long(contained.longValue() + numBuildValues);
+				contained = Long.valueOf(contained.longValue() + numBuildValues);
 			}
 			
 			map.put(key, contained);
@@ -521,10 +521,10 @@ public class HashTableITCase {
 			
 			Long contained = map.get(key);
 			if (contained == null) {
-				contained = new Long(numBuildValues);
+				contained = Long.valueOf(numBuildValues);
 			}
 			else {
-				contained = new Long(contained.longValue() + numBuildValues);
+				contained = Long.valueOf(contained.longValue() + numBuildValues);
 			}
 			
 			map.put(key, contained);
@@ -901,10 +901,10 @@ public class HashTableITCase {
 			
 			Long contained = map.get(key);
 			if (contained == null) {
-				contained = new Long(numBuildValues);
+				contained = Long.valueOf(numBuildValues);
 			}
 			else {
-				contained = new Long(contained.longValue() + (numBuildValues));
+				contained = Long.valueOf(contained.longValue() + (numBuildValues));
 			}
 			
 			map.put(key, contained);
@@ -1011,10 +1011,10 @@ public class HashTableITCase {
 			
 			Long contained = map.get(key);
 			if (contained == null) {
-				contained = new Long(numBuildValues);
+				contained = Long.valueOf(numBuildValues);
 			}
 			else {
-				contained = new Long(contained.longValue() + numBuildValues);
+				contained = Long.valueOf(contained.longValue() + numBuildValues);
 			}
 			
 			map.put(key, contained);
@@ -1123,10 +1123,10 @@ public class HashTableITCase {
 			
 			Long contained = map.get(key);
 			if (contained == null) {
-				contained = new Long(numBuildValues);
+				contained = Long.valueOf(numBuildValues);
 			}
 			else {
-				contained = new Long(contained.longValue() + numBuildValues);
+				contained = Long.valueOf(contained.longValue() + numBuildValues);
 			}
 			
 			map.put(key, contained);

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java
index 04d1a38..71f1979 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/ReOpenableHashTableITCase.java
@@ -373,10 +373,10 @@ public class ReOpenableHashTableITCase {
 				
 				Long contained = map.get(key);
 				if (contained == null) {
-					contained = new Long(numBuildValues);
+					contained = Long.valueOf(numBuildValues);
 				}
 				else {
-					contained = new Long(contained.longValue() + numBuildValues);
+					contained = Long.valueOf(contained.longValue() + numBuildValues);
 				}
 				
 				map.put(key, contained);
@@ -487,10 +487,10 @@ public class ReOpenableHashTableITCase {
 				
 				Long contained = map.get(key);
 				if (contained == null) {
-					contained = new Long(numBuildValues);
+					contained = Long.valueOf(numBuildValues);
 				}
 				else {
-					contained = new Long(contained.longValue() + numBuildValues);
+					contained = Long.valueOf(contained.longValue() + numBuildValues);
 				}
 				
 				map.put(key, contained);

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
index 852a8f3..a9d17c5 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/sort/CombiningUnilateralSortMergerITCase.java
@@ -190,7 +190,7 @@ public class CombiningUnilateralSortMergerITCase {
 	{
 		final Hashtable<TestData.Key, Integer> countTable = new Hashtable<TestData.Key, Integer>(KEY_MAX);
 		for (int i = 1; i <= KEY_MAX; i++) {
-			countTable.put(new TestData.Key(i), new Integer(0));
+			countTable.put(new TestData.Key(i), Integer.valueOf(0));
 		}
 
 		// comparator

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/NothingSerializer.scala
----------------------------------------------------------------------
diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/NothingSerializer.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/NothingSerializer.scala
index f213f45..f25dd6c 100644
--- a/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/NothingSerializer.scala
+++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/typeutils/NothingSerializer.scala
@@ -30,7 +30,7 @@ class NothingSerializer extends TypeSerializer[Any] {
   override def isStateful: Boolean = false
 
   override def createInstance: Any = {
-    new Integer(-1)
+    Integer.valueOf(-1)
   }
 
   override def isImmutableType: Boolean = true

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java
index e5c2108..fc97caa 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorITCase.java
@@ -79,9 +79,9 @@ public class AccumulatorITCase extends JavaProgramTestBase {
 		JobExecutionResult res = this.result;
 		System.out.println(AccumulatorHelper.getResultsFormated(res.getAllAccumulatorResults()));
 		
-		Assert.assertEquals(new Integer(3), (Integer) res.getAccumulatorResult("num-lines"));
+		Assert.assertEquals(Integer.valueOf(3), (Integer) res.getAccumulatorResult("num-lines"));
 
-		Assert.assertEquals(new Double(getDegreeOfParallelism()), (Double)res.getAccumulatorResult("open-close-counter"));
+		Assert.assertEquals(Double.valueOf(getDegreeOfParallelism()), (Double)res.getAccumulatorResult("open-close-counter"));
 		
 		// Test histogram (words per line distribution)
 		Map<Integer, Integer> dist = Maps.newHashMap();

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorIterativeITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorIterativeITCase.java b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorIterativeITCase.java
index 51cbd87..78bbe68 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorIterativeITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/accumulators/AccumulatorIterativeITCase.java
@@ -73,7 +73,7 @@ public class AccumulatorIterativeITCase extends RecordAPITestBase {
 		compareResultsByLinesInMemory(EXPECTED, resultPath);
 		
 		Integer res = (Integer) getJobExecutionResult().getAccumulatorResult("test");
-		Assert.assertEquals(new Integer(NUM_ITERATIONS * 6), res);
+		Assert.assertEquals(Integer.valueOf(NUM_ITERATIONS * 6), res);
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java b/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java
index 67fb659..c68a3ea 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/clients/examples/LocalExecutorITCase.java
@@ -53,7 +53,7 @@ public class LocalExecutorITCase {
 			executor.setTaskManagerNumSlots(DOP);
 			executor.start();
 			
-			executor.executePlan(wc.getPlan(new Integer(DOP).toString(), inFile.toURI().toString(),
+			executor.executePlan(wc.getPlan(Integer.valueOf(DOP).toString(), inFile.toURI().toString(),
 					outFile.toURI().toString()));
 			executor.stop();
 		} catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsITCase.java
index bd2d02a..f6ada63 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/ConnectedComponentsITCase.java
@@ -55,7 +55,7 @@ public class ConnectedComponentsITCase extends RecordAPITestBase {
 	@Override
 	protected Plan getTestJob() {
 		WorksetConnectedComponents cc = new WorksetConnectedComponents();
-		return cc.getPlan(new Integer(DOP).toString(),  verticesPath, edgesPath, resultPath, "100");
+		return cc.getPlan(Integer.valueOf(DOP).toString(),  verticesPath, edgesPath, resultPath, "100");
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java
index d289844..674ca49 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java
@@ -299,7 +299,7 @@ public class AggregatorsITCase extends JavaProgramTestBase {
 
 		@Override
 		public Integer map(Integer value) {
-			Integer newValue = new Integer(value.intValue() - 1);
+			Integer newValue = Integer.valueOf(value.intValue() - 1);
 			// count negative numbers
 			if (newValue.intValue() < 0) {
 				aggr.aggregate(1l);
@@ -321,7 +321,7 @@ public class AggregatorsITCase extends JavaProgramTestBase {
 
 		@Override
 		public Integer map(Integer value) {
-			Integer newValue = new Integer(value.intValue() - 1);
+			Integer newValue = Integer.valueOf(value.intValue() - 1);
 			// count numbers less then the aggregator parameter
 			if ( newValue.intValue() < aggr.getValue() ) {
 				aggr.aggregate(1l);
@@ -350,7 +350,7 @@ public class AggregatorsITCase extends JavaProgramTestBase {
 		@Override
 		public Tuple2<Integer, Integer> map(Integer value) throws Exception {
 			Random ran = new Random();
-			Integer nodeId = new Integer(ran.nextInt(100000));
+			Integer nodeId = Integer.valueOf(ran.nextInt(100000));
 			return new Tuple2<Integer, Integer>(nodeId, value);
 		}
 

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankNepheleITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankNepheleITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankNepheleITCase.java
index 3696225..f22bc84 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankNepheleITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankNepheleITCase.java
@@ -54,7 +54,7 @@ public class DanglingPageRankNepheleITCase extends RecordAPITestBase {
 	@Override
 	protected JobGraph getJobGraph() throws Exception {
 		String[] parameters = new String[] {
-			new Integer(DOP).toString(),
+			Integer.valueOf(DOP).toString(),
 			pagesWithRankPath,
 			edgesPath,
 			resultPath,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankWithCombinerNepheleITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankWithCombinerNepheleITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankWithCombinerNepheleITCase.java
index 76438aa..c4ffd02 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankWithCombinerNepheleITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/nephele/DanglingPageRankWithCombinerNepheleITCase.java
@@ -42,7 +42,7 @@ public class DanglingPageRankWithCombinerNepheleITCase extends RecordAPITestBase
 	@Override
 	protected JobGraph getJobGraph() throws Exception {
 		String[] parameters = new String[] {
-			new Integer(DOP).toString(),
+			Integer.valueOf(DOP).toString(),
 			pagesWithRankPath,
 			edgesPath,
 			resultPath,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java
index b5f5819..f26a1e7 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/MapITCase.java
@@ -259,7 +259,7 @@ public class MapITCase extends JavaProgramTestBase {
 							@Override
 							public Tuple3<Integer, String, Long> map(Tuple3<Integer, Long, String> value) 
 									throws Exception {
-								Integer incr = new Integer(value.f0.intValue() + 1);
+								Integer incr = Integer.valueOf(value.f0.intValue() + 1);
 								out.setFields(incr, value.f2, value.f1);
 								return out;
 							}
@@ -354,7 +354,7 @@ public class MapITCase extends JavaProgramTestBase {
 							@Override
 							public Tuple3<Integer, Long, String> map(Tuple3<Integer, Long, String> value) 
 									throws Exception {
-								Integer incr = new Integer(value.f0.intValue() + 1);
+								Integer incr = Integer.valueOf(value.f0.intValue() + 1);
 								value.setField(incr, 0);
 								return value;
 							}

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingITCase.java
index 9ca34a8..73aceed 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingITCase.java
@@ -86,7 +86,7 @@ public class GlobalSortingITCase extends RecordAPITestBase {
 	@Override
 	protected Plan getTestJob() {
 		GlobalSort globalSort = new GlobalSort();
-		return globalSort.getPlan(new Integer(DOP).toString(), recordsPath, resultPath);
+		return globalSort.getPlan(Integer.valueOf(DOP).toString(), recordsPath, resultPath);
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingMixedOrderITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingMixedOrderITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingMixedOrderITCase.java
index 6136a5e..dfed309 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingMixedOrderITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/GlobalSortingMixedOrderITCase.java
@@ -91,7 +91,7 @@ public class GlobalSortingMixedOrderITCase extends RecordAPITestBase {
 	@Override
 	protected Plan getTestJob() {
 		GlobalSort globalSort = new GlobalSort();
-		return globalSort.getPlan(new Integer(DOP).toString(), recordsPath, resultPath);
+		return globalSort.getPlan(Integer.valueOf(DOP).toString(), recordsPath, resultPath);
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3WithUnionITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3WithUnionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3WithUnionITCase.java
index aad4c52..84a3930 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3WithUnionITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery3WithUnionITCase.java
@@ -146,7 +146,7 @@ public class TPCHQuery3WithUnionITCase extends RecordAPITestBase {
 	protected Plan getTestJob() {
 		TPCHQuery3Unioned tpch3 = new TPCHQuery3Unioned();
 		return tpch3.getPlan(
-				new Integer(DOP).toString(),
+				Integer.valueOf(DOP).toString(),
 				orders1Path,
 				orders2Path,
 				partJoin1Path,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery4ITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery4ITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery4ITCase.java
index de0cf6b..8ddfa30 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery4ITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery4ITCase.java
@@ -132,7 +132,7 @@ public class TPCHQuery4ITCase extends RecordAPITestBase {
 	@Override
 	protected Plan getTestJob() {
 		TPCHQuery4 tpch4 = new TPCHQuery4();
-		return tpch4.getPlan(new Integer(DOP).toString(), ordersPath, lineitemsPath, resultPath);
+		return tpch4.getPlan(Integer.valueOf(DOP).toString(), ordersPath, lineitemsPath, resultPath);
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery9ITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery9ITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery9ITCase.java
index 8cc234c..c329ce3 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery9ITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQuery9ITCase.java
@@ -362,7 +362,7 @@ public class TPCHQuery9ITCase extends RecordAPITestBase {
 	protected Plan getTestJob() {
 		TPCHQuery9 tpch9 = new TPCHQuery9();
 		return tpch9.getPlan(
-				new Integer(DOP).toString(),
+				Integer.valueOf(DOP).toString(),
 				partInputPath,
 				partSuppInputPath,
 				ordersInputPath,

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQueryAsterixITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQueryAsterixITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQueryAsterixITCase.java
index 4d8d9b5..769120b 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQueryAsterixITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TPCHQueryAsterixITCase.java
@@ -83,7 +83,7 @@ public class TPCHQueryAsterixITCase extends RecordAPITestBase {
 	@Override
 	protected Plan getTestJob() {
 		TPCHQueryAsterix tpchBench = new TPCHQueryAsterix();
-		return tpchBench.getPlan(new Integer(DOP).toString(), ordersPath, custPath, resultPath);
+		return tpchBench.getPlan(Integer.valueOf(DOP).toString(), ordersPath, custPath, resultPath);
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TeraSortITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TeraSortITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TeraSortITCase.java
index 7fc6c1d..2cb0f8f 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TeraSortITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/TeraSortITCase.java
@@ -49,7 +49,7 @@ public class TeraSortITCase extends RecordAPITestBase {
 		String testDataPath = getClass().getResource(INPUT_DATA_FILE).toString();
 		
 		TeraSort ts = new TeraSort();
-		return ts.getPlan(new Integer(DOP).toString(), testDataPath, resultPath);
+		return ts.getPlan(Integer.valueOf(DOP).toString(), testDataPath, resultPath);
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WebLogAnalysisITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WebLogAnalysisITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WebLogAnalysisITCase.java
index ee4dd1e..109e62d 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WebLogAnalysisITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WebLogAnalysisITCase.java
@@ -169,7 +169,7 @@ public class WebLogAnalysisITCase extends RecordAPITestBase {
 	@Override
 	protected Plan getTestJob() {
 		WebLogAnalysis relOLAP = new WebLogAnalysis();
-		return relOLAP.getPlan(new Integer(DOP).toString(), docsPath, ranksPath, visitsPath, resultPath);
+		return relOLAP.getPlan(Integer.valueOf(DOP).toString(), docsPath, ranksPath, visitsPath, resultPath);
 	}
 
 	@Override

http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/c339c266/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountITCase.java
index 17dacbb..165c2d3 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recordJobTests/WordCountITCase.java
@@ -43,7 +43,7 @@ public class WordCountITCase extends RecordAPITestBase {
 	@Override
 	protected Plan getTestJob() {
 		WordCount wc = new WordCount();
-		return wc.getPlan(new Integer(DOP).toString(), textPath, resultPath);
+		return wc.getPlan(Integer.valueOf(DOP).toString(), textPath, resultPath);
 	}
 
 	@Override