You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gr...@apache.org on 2017/01/17 21:35:45 UTC

[2/6] flink git commit: [hotfix] [gelly] Improve generic type formatting

http://git-wip-us.apache.org/repos/asf/flink/blob/53716a4d/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/TestGraphUtils.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/TestGraphUtils.java b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/TestGraphUtils.java
index 85373d3..7766723 100644
--- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/TestGraphUtils.java
+++ b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/TestGraphUtils.java
@@ -18,11 +18,6 @@
 
 package org.apache.flink.graph.test;
 
-import java.io.PrintStream;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
 import org.apache.flink.api.java.tuple.Tuple2;
@@ -30,6 +25,11 @@ import org.apache.flink.api.java.tuple.Tuple3;
 import org.apache.flink.graph.Edge;
 import org.apache.flink.graph.Vertex;
 
+import java.io.PrintStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
 public class TestGraphUtils {
 
 	public static DataSet<Vertex<Long, Long>> getLongLongVertexData(
@@ -354,20 +354,20 @@ public class TestGraphUtils {
 	 * utils for getting the second graph for the test of method difference();
 	 * @param env - ExecutionEnvironment
 	 */
-	public static DataSet<Edge<Long,Long>> getLongLongEdgeDataDifference(ExecutionEnvironment env) {
+	public static DataSet<Edge<Long, Long>> getLongLongEdgeDataDifference(ExecutionEnvironment env) {
 		return env.fromCollection(getLongLongEdgesForDifference());
 	}
 
-	public static DataSet<Edge<Long,Long>> getLongLongEdgeDataDifference2(ExecutionEnvironment env) {
+	public static DataSet<Edge<Long, Long>> getLongLongEdgeDataDifference2(ExecutionEnvironment env) {
 		return env.fromCollection(getLongLongEdgesForDifference2());
 	}
 
-	public static DataSet<Vertex<Long,Long>> getLongLongVertexDataDifference(ExecutionEnvironment env) {
+	public static DataSet<Vertex<Long, Long>> getLongLongVertexDataDifference(ExecutionEnvironment env) {
 		return env.fromCollection(getVerticesForDifference());
 	}
 
-	public static List<Vertex<Long,Long>> getVerticesForDifference(){
-		List<Vertex<Long,Long>> vertices = new ArrayList<>();
+	public static List<Vertex<Long, Long>> getVerticesForDifference(){
+		List<Vertex<Long, Long>> vertices = new ArrayList<>();
 		vertices.add(new Vertex<>(1L, 1L));
 		vertices.add(new Vertex<>(3L, 3L));
 		vertices.add(new Vertex<>(6L, 6L));

http://git-wip-us.apache.org/repos/asf/flink/blob/53716a4d/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/FromCollectionITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/FromCollectionITCase.java b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/FromCollectionITCase.java
index 5a64dd7..59f416f 100644
--- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/FromCollectionITCase.java
+++ b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/FromCollectionITCase.java
@@ -18,7 +18,6 @@
 
 package org.apache.flink.graph.test.operations;
 
-import java.util.List;
 import org.apache.flink.api.common.functions.MapFunction;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
@@ -32,6 +31,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import java.util.List;
+
 @RunWith(Parameterized.class)
 public class FromCollectionITCase extends MultipleProgramsTestBase {
 
@@ -51,7 +52,7 @@ public class FromCollectionITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> graph = Graph.fromCollection(TestGraphUtils.getLongLongVertices(),
                 TestGraphUtils.getLongLongEdges(), env);
 
-        DataSet<Edge<Long,Long>> data = graph.getEdges();
+        DataSet<Edge<Long, Long>> data = graph.getEdges();
         List<Edge<Long, Long>> result= data.collect();
         
         expectedResult = "1,2,12\n" +
@@ -75,8 +76,8 @@ public class FromCollectionITCase extends MultipleProgramsTestBase {
         		env);
 
         
-        DataSet<Vertex<Long,NullValue>> data = graph.getVertices();
-        List<Vertex<Long,NullValue>> result= data.collect();
+        DataSet<Vertex<Long, NullValue>> data = graph.getVertices();
+        List<Vertex<Long, NullValue>> result= data.collect();
         
         expectedResult = "1,(null)\n" +
 	                "2,(null)\n" +
@@ -97,8 +98,8 @@ public class FromCollectionITCase extends MultipleProgramsTestBase {
 		Graph<Long, Long, Long> graph = Graph.fromCollection(TestGraphUtils.getLongLongEdges(),
                 new InitVerticesMapper(), env);
 
-        DataSet<Vertex<Long,Long>> data = graph.getVertices();
-        List<Vertex<Long,Long>> result= data.collect();
+        DataSet<Vertex<Long, Long>> data = graph.getVertices();
+        List<Vertex<Long, Long>> result= data.collect();
         
         expectedResult = "1,2\n" +
 	                "2,4\n" +

http://git-wip-us.apache.org/repos/asf/flink/blob/53716a4d/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationITCase.java b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationITCase.java
index 9995bad..10db9be 100644
--- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationITCase.java
+++ b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationITCase.java
@@ -18,9 +18,6 @@
 
 package org.apache.flink.graph.test.operations;
 
-import java.util.LinkedList;
-import java.util.List;
-
 import org.apache.flink.api.common.functions.MapFunction;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
@@ -37,6 +34,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import java.util.LinkedList;
+import java.util.List;
+
 @RunWith(Parameterized.class)
 public class GraphCreationITCase extends MultipleProgramsTestBase {
 
@@ -55,8 +55,8 @@ public class GraphCreationITCase extends MultipleProgramsTestBase {
 		final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 		Graph<Long, NullValue, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongEdgeData(env), env);
 
-        DataSet<Vertex<Long,NullValue>> data = graph.getVertices();
-        List<Vertex<Long,NullValue>> result= data.collect();
+        DataSet<Vertex<Long, NullValue>> data = graph.getVertices();
+        List<Vertex<Long, NullValue>> result= data.collect();
         
 		expectedResult = "1,(null)\n" +
 					"2,(null)\n" +
@@ -76,8 +76,8 @@ public class GraphCreationITCase extends MultipleProgramsTestBase {
 		Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongEdgeData(env),
 				new AssignIdAsValueMapper(), env);
 
-        DataSet<Vertex<Long,Long>> data = graph.getVertices();
-        List<Vertex<Long,Long>> result= data.collect();
+        DataSet<Vertex<Long, Long>> data = graph.getVertices();
+        List<Vertex<Long, Long>> result= data.collect();
         
 		expectedResult = "1,1\n" +
 					"2,2\n" +
@@ -97,8 +97,8 @@ public class GraphCreationITCase extends MultipleProgramsTestBase {
 		Graph<Long, DummyCustomParameterizedType<Double>, Long> graph = Graph.fromDataSet(
 				TestGraphUtils.getLongLongEdgeData(env), new AssignCustomVertexValueMapper(), env);
 
-        DataSet<Vertex<Long,DummyCustomParameterizedType<Double>>> data = graph.getVertices();
-        List<Vertex<Long,DummyCustomParameterizedType<Double>>> result= data.collect();
+        DataSet<Vertex<Long, DummyCustomParameterizedType<Double>>> data = graph.getVertices();
+        List<Vertex<Long, DummyCustomParameterizedType<Double>>> result= data.collect();
         
 		expectedResult = "1,(2.0,0)\n" +
 				"2,(4.0,1)\n" +

http://git-wip-us.apache.org/repos/asf/flink/blob/53716a4d/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationWithCsvITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationWithCsvITCase.java b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationWithCsvITCase.java
index 3ccdef0..812f418 100644
--- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationWithCsvITCase.java
+++ b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationWithCsvITCase.java
@@ -52,16 +52,16 @@ public class GraphCreationWithCsvITCase extends MultipleProgramsTestBase {
 		 * Test with two Csv files one with Vertex Data and one with Edges data
 		 */
 		final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
-		final String fileContent =  "1,1\n"+
+		final String fileContent = "1,1\n"+
 				"2,2\n"+
 				"3,3\n";
 		final FileInputSplit split = createTempFile(fileContent);
-		final String fileContent2 =  "1,2,ot\n"+
+		final String fileContent2 = "1,2,ot\n"+
 				"3,2,tt\n"+
 				"3,1,to\n";
 		final FileInputSplit split2 = createTempFile(fileContent2);
 
-		Graph<Long, Long, String> graph = Graph.fromCsvReader(split.getPath().toString(),split2.getPath().toString(),env)
+		Graph<Long, Long, String> graph = Graph.fromCsvReader(split.getPath().toString(), split2.getPath().toString(), env)
 				.types(Long.class, Long.class, String.class);
 
 		List<Triplet<Long, Long, String>> result = graph.getTriplets().collect();
@@ -106,7 +106,7 @@ public class GraphCreationWithCsvITCase extends MultipleProgramsTestBase {
 		*Test fromCsvReader with edge path and a mapper that assigns a Double constant as value
 		 */
 		final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
-		final String fileContent =  "1,2,ot\n"+
+		final String fileContent = "1,2,ot\n"+
 				"3,2,tt\n"+
 				"3,1,to\n";
 		final FileInputSplit split = createTempFile(fileContent);
@@ -126,7 +126,7 @@ public class GraphCreationWithCsvITCase extends MultipleProgramsTestBase {
 		 * Test with one Csv file one with Edges data. Also tests the configuration method ignoreFistLineEdges()
 		 */
 		final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
-		final String fileContent2 =  "header\n1,2,ot\n"+
+		final String fileContent2 = "header\n1,2,ot\n"+
 				"3,2,tt\n"+
 				"3,1,to\n";
 
@@ -153,19 +153,19 @@ public class GraphCreationWithCsvITCase extends MultipleProgramsTestBase {
 		 */
 		final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
 
-		final String fileContent =  "header\n1;1\n"+
+		final String fileContent = "header\n1;1\n"+
 				"2;2\n"+
 				"3;3\n";
 
 		final FileInputSplit split = createTempFile(fileContent);
 
-		final String fileContent2 =  "header|1:2:ot|"+
+		final String fileContent2 = "header|1:2:ot|"+
 				"3:2:tt|"+
 				"3:1:to|";
 
 		final FileInputSplit split2 = createTempFile(fileContent2);
 
-		Graph<Long, Long, String> graph= Graph.fromCsvReader(split.getPath().toString(),split2.getPath().toString(),env).
+		Graph<Long, Long, String> graph= Graph.fromCsvReader(split.getPath().toString(), split2.getPath().toString(), env).
 				ignoreFirstLineEdges().ignoreFirstLineVertices().
 				fieldDelimiterEdges(":").fieldDelimiterVertices(";").
 				lineDelimiterEdges("|").

http://git-wip-us.apache.org/repos/asf/flink/blob/53716a4d/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationWithMapperITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationWithMapperITCase.java b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationWithMapperITCase.java
index c78e6ba..f8eb874 100644
--- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationWithMapperITCase.java
+++ b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphCreationWithMapperITCase.java
@@ -18,8 +18,6 @@
 
 package org.apache.flink.graph.test.operations;
 
-import java.util.List;
-
 import org.apache.flink.api.common.functions.MapFunction;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
@@ -33,6 +31,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import java.util.List;
+
 @RunWith(Parameterized.class)
 public class GraphCreationWithMapperITCase extends MultipleProgramsTestBase {
 
@@ -52,8 +52,8 @@ public class GraphCreationWithMapperITCase extends MultipleProgramsTestBase {
 		Graph<Long, Double, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongEdgeData(env),
 				new AssignDoubleValueMapper(), env);
 
-        DataSet<Vertex<Long,Double>> data = graph.getVertices();
-        List<Vertex<Long,Double>> result= data.collect();
+        DataSet<Vertex<Long, Double>> data = graph.getVertices();
+        List<Vertex<Long, Double>> result= data.collect();
 		
 		expectedResult = "1,0.1\n" +
 				"2,0.1\n" +
@@ -95,8 +95,8 @@ public class GraphCreationWithMapperITCase extends MultipleProgramsTestBase {
 	Graph<String, Double, Long> graph = Graph.fromDataSet(TestGraphUtils.getStringLongEdgeData(env),
 			new AssignDoubleConstantMapper(), env);
 
-    DataSet<Vertex<String,Double>> data = graph.getVertices();
-    List<Vertex<String,Double>> result= data.collect();
+    DataSet<Vertex<String, Double>> data = graph.getVertices();
+    List<Vertex<String, Double>> result= data.collect();
     
 	expectedResult = "1,0.1\n" +
 			"2,0.1\n" +
@@ -116,8 +116,8 @@ public class GraphCreationWithMapperITCase extends MultipleProgramsTestBase {
 		Graph<Long, DummyCustomType, Long> graph = Graph.fromDataSet(
 				TestGraphUtils.getLongLongEdgeData(env), new AssignCustomValueMapper(), env);
 
-	    DataSet<Vertex<Long,DummyCustomType>> data = graph.getVertices();
-	    List<Vertex<Long,DummyCustomType>> result= data.collect();
+	    DataSet<Vertex<Long, DummyCustomType>> data = graph.getVertices();
+	    List<Vertex<Long, DummyCustomType>> result= data.collect();
 	    
 		expectedResult = "1,(F,0)\n" +
 				"2,(F,1)\n" +

http://git-wip-us.apache.org/repos/asf/flink/blob/53716a4d/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphMutationsITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphMutationsITCase.java b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphMutationsITCase.java
index b513ff8..c72750e 100644
--- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphMutationsITCase.java
+++ b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphMutationsITCase.java
@@ -18,9 +18,6 @@
 
 package org.apache.flink.graph.test.operations;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
 import org.apache.flink.graph.Edge;
@@ -32,6 +29,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RunWith(Parameterized.class)
 public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
@@ -54,8 +54,8 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.addVertex(new Vertex<>(6L, 6L));
 
-		DataSet<Vertex<Long,Long>> data = graph.getVertices();
-		List<Vertex<Long,Long>> result = data.collect();
+		DataSet<Vertex<Long, Long>> data = graph.getVertices();
+		List<Vertex<Long, Long>> result = data.collect();
 
 		expectedResult = "1,1\n" +
 				"2,2\n" +
@@ -87,8 +87,8 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.addVertices(vertices);
 
-		DataSet<Vertex<Long,Long>> data = graph.getVertices();
-		List<Vertex<Long,Long>> result= data.collect();
+		DataSet<Vertex<Long, Long>> data = graph.getVertices();
+		List<Vertex<Long, Long>> result= data.collect();
 
 		expectedResult = "1,1\n" +
 				"2,2\n" +
@@ -113,8 +113,8 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.addVertex(new Vertex<>(1L, 1L));
 
-		DataSet<Vertex<Long,Long>> data = graph.getVertices();
-		List<Vertex<Long,Long>> result= data.collect();
+		DataSet<Vertex<Long, Long>> data = graph.getVertices();
+		List<Vertex<Long, Long>> result= data.collect();
 
 		expectedResult = "1,1\n" +
 				"2,2\n" +
@@ -142,8 +142,8 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.addVertices(vertices);
 
-		DataSet<Vertex<Long,Long>> data = graph.getVertices();
-		List<Vertex<Long,Long>> result= data.collect();
+		DataSet<Vertex<Long, Long>> data = graph.getVertices();
+		List<Vertex<Long, Long>> result= data.collect();
 
 		expectedResult = "1,1\n" +
 				"2,2\n" +
@@ -171,8 +171,8 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.addVertices(vertices);
 
-		DataSet<Vertex<Long,Long>> data = graph.getVertices();
-		List<Vertex<Long,Long>> result= data.collect();
+		DataSet<Vertex<Long, Long>> data = graph.getVertices();
+		List<Vertex<Long, Long>> result= data.collect();
 
 		expectedResult = "1,1\n" +
 				"2,2\n" +
@@ -196,7 +196,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 				TestGraphUtils.getLongLongEdgeData(env), env);
 		graph = graph.removeVertex(new Vertex<>(5L, 5L));
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +
@@ -224,7 +224,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.removeVertices(verticesToBeRemoved);
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "3,4,34\n" +
@@ -246,7 +246,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 				TestGraphUtils.getLongLongEdgeData(env), env);
 		graph = graph.removeVertex(new Vertex<>(6L, 6L));
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +
@@ -276,7 +276,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.removeVertices(verticesToBeRemoved);
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "2,3,23\n" +
@@ -303,7 +303,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.removeVertices(verticesToBeRemoved);
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +
@@ -333,7 +333,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.removeVertices(verticesToBeRemoved);
 
-		DataSet<Vertex<Long,Long>> data = graph.getVertices();
+		DataSet<Vertex<Long, Long>> data = graph.getVertices();
 		List<Vertex<Long, Long>> result= data.collect();
 
 		expectedResult = "1,1\n" +
@@ -357,7 +357,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 				TestGraphUtils.getLongLongEdgeData(env), env);
 		graph = graph.addEdge(new Vertex<>(6L, 6L), new Vertex<>(1L, 1L), 61L);
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +
@@ -389,7 +389,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.addEdges(edgesToBeAdded);
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +
@@ -422,7 +422,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.addEdges(edgesToBeAdded);
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +
@@ -449,7 +449,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 		graph = graph.addEdge(new Vertex<>(1L, 1L), new Vertex<>(2L, 2L),
 				12L);
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +
@@ -480,7 +480,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.removeEdge(new Edge<>(5L, 1L, 51L));
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +
@@ -513,7 +513,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.removeEdges(edgesToBeRemoved);
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +
@@ -542,7 +542,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.removeEdges(edgesToBeRemoved);
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +
@@ -567,7 +567,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 				TestGraphUtils.getLongLongEdgeData(env), env);
 		graph = graph.removeEdge(new Edge<>(6L, 1L, 61L));
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +
@@ -597,7 +597,7 @@ public class GraphMutationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.removeEdges(edgesToBeRemoved);
 
-		DataSet<Edge<Long,Long>> data = graph.getEdges();
+		DataSet<Edge<Long, Long>> data = graph.getEdges();
 		List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +

http://git-wip-us.apache.org/repos/asf/flink/blob/53716a4d/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphOperationsITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphOperationsITCase.java b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphOperationsITCase.java
index 3f03267..4d7153d 100644
--- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphOperationsITCase.java
+++ b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/GraphOperationsITCase.java
@@ -56,7 +56,7 @@ public class GraphOperationsITCase extends MultipleProgramsTestBase {
 		Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongVertexData(env),
 				TestGraphUtils.getLongLongEdgeData(env), env);
 
-        DataSet<Edge<Long,Long>> data = graph.getUndirected().getEdges();
+        DataSet<Edge<Long, Long>> data = graph.getUndirected().getEdges();
         List<Edge<Long, Long>> result= data.collect();
         
 		expectedResult = "1,2,12\n" + "2,1,12\n" +
@@ -80,7 +80,7 @@ public class GraphOperationsITCase extends MultipleProgramsTestBase {
 		Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongVertexData(env),
 				TestGraphUtils.getLongLongEdgeData(env), env);
 
-        DataSet<Edge<Long,Long>> data = graph.reverse().getEdges();
+        DataSet<Edge<Long, Long>> data = graph.reverse().getEdges();
         List<Edge<Long, Long>> result= data.collect();
         
 		expectedResult = "2,1,12\n" +
@@ -105,7 +105,7 @@ public class GraphOperationsITCase extends MultipleProgramsTestBase {
 		Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongVertexData(env),
 				TestGraphUtils.getLongLongEdgeData(env), env);
 		
-		DataSet<Edge<Long,Long>> data= graph.subgraph(new FilterFunction<Vertex<Long, Long>>() {
+		DataSet<Edge<Long, Long>> data= graph.subgraph(new FilterFunction<Vertex<Long, Long>>() {
 						   public boolean filter(Vertex<Long, Long> vertex) throws Exception {
 							   return (vertex.getValue() > 2);
 						   }
@@ -135,7 +135,7 @@ public class GraphOperationsITCase extends MultipleProgramsTestBase {
 		Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongVertexData(env),
 				TestGraphUtils.getLongLongEdgeData(env), env);
 		
-		DataSet<Edge<Long,Long>> data = graph.filterOnVertices(new FilterFunction<Vertex<Long, Long>>() {
+		DataSet<Edge<Long, Long>> data = graph.filterOnVertices(new FilterFunction<Vertex<Long, Long>>() {
 			public boolean filter(Vertex<Long, Long> vertex) throws Exception {
 				return (vertex.getValue() > 2);
 			}
@@ -161,7 +161,7 @@ public class GraphOperationsITCase extends MultipleProgramsTestBase {
 		Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongVertexData(env),
 				TestGraphUtils.getLongLongEdgeData(env), env);
 		
-		DataSet<Edge<Long,Long>> data = graph.filterOnEdges(new FilterFunction<Edge<Long, Long>>() {
+		DataSet<Edge<Long, Long>> data = graph.filterOnEdges(new FilterFunction<Edge<Long, Long>>() {
 			public boolean filter(Edge<Long, Long> edge) throws Exception {
 				return (edge.getValue() > 34);
 			}
@@ -240,7 +240,7 @@ public class GraphOperationsITCase extends MultipleProgramsTestBase {
 		Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongVertexData(env),
 				TestGraphUtils.getLongLongEdgeData(env), env);
 		
-		DataSet<Tuple2<Long,Long>> data = graph.getEdgeIds();
+		DataSet<Tuple2<Long, Long>> data = graph.getEdgeIds();
         List<Tuple2<Long, Long>> result= data.collect();
         
 		expectedResult = "1,2\n" + "1,3\n" +
@@ -269,7 +269,7 @@ public class GraphOperationsITCase extends MultipleProgramsTestBase {
 
 		graph = graph.union(Graph.fromCollection(vertices, edges, env));
 
-        DataSet<Edge<Long,Long>> data = graph.getEdges();
+        DataSet<Edge<Long, Long>> data = graph.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,12\n" +
@@ -339,7 +339,7 @@ public class GraphOperationsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Vertex<Long, Long>> vertex = env.fromElements(new Vertex<>(6L, 6L));
 
-		Graph<Long, Long, Long> graph2 = Graph.fromDataSet(vertex,TestGraphUtils.getLongLongEdgeDataDifference2(env),env);
+		Graph<Long, Long, Long> graph2 = Graph.fromDataSet(vertex, TestGraphUtils.getLongLongEdgeDataDifference2(env), env);
 
 		graph = graph.difference(graph2);
 
@@ -446,8 +446,8 @@ public class GraphOperationsITCase extends MultipleProgramsTestBase {
 		Graph<Long, Long, Long> graph = Graph.fromDataSet(TestGraphUtils.getLongLongVertexData(env),
 				TestGraphUtils.getLongLongEdgeData(env), env);
 
-        DataSet<Triplet<Long,Long,Long>> data = graph.getTriplets();
-        List<Triplet<Long,Long,Long>> result= data.collect();
+        DataSet<Triplet<Long, Long, Long>> data = graph.getTriplets();
+        List<Triplet<Long, Long, Long>> result= data.collect();
 
 		expectedResult = "1,2,1,2,12\n" + "1,3,1,3,13\n" +
 				"2,3,2,3,23\n" + "3,4,3,4,34\n" +

http://git-wip-us.apache.org/repos/asf/flink/blob/53716a4d/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithEdgesITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithEdgesITCase.java b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithEdgesITCase.java
index 2fa3b8c..cb83b33 100644
--- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithEdgesITCase.java
+++ b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithEdgesITCase.java
@@ -18,8 +18,6 @@
 
 package org.apache.flink.graph.test.operations;
 
-import java.util.List;
-
 import org.apache.flink.api.common.functions.MapFunction;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
@@ -36,6 +34,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import java.util.List;
+
 @RunWith(Parameterized.class)
 public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
 
@@ -59,7 +59,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdges(graph.getEdges()
                         .map(new EdgeToTuple3Map<Long, Long>()), new AddValuesMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,24\n" +
@@ -87,7 +87,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdges(graph.getEdges().first(3)
                         .map(new EdgeToTuple3Map<Long, Long>()), new AddValuesMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,24\n" +
@@ -115,7 +115,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdges(graph.getEdges().first(3)
                         .map(new BooleanEdgeValueMapper()), new DoubleIfTrueMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,24\n" +
@@ -143,7 +143,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdges(TestGraphUtils.getLongLongLongTuple3Data(env),
                 new DoubleValueMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,24\n" +
@@ -170,7 +170,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdges(TestGraphUtils.getLongLongCustomTuple3Data(env),
                 new CustomValueMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,10\n" +
@@ -198,7 +198,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdgesOnSource(graph.getEdges()
                         .map(new ProjectSourceAndValueMapper()), new AddValuesMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,24\n" +
@@ -226,7 +226,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdgesOnSource(graph.getEdges().first(3)
                         .map(new ProjectSourceAndValueMapper()), new AddValuesMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,24\n" +
@@ -254,7 +254,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdgesOnSource(graph.getEdges().first(3)
                         .map(new ProjectSourceWithTrueMapper()), new DoubleIfTrueMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,24\n" +
@@ -282,7 +282,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdgesOnSource(TestGraphUtils.getLongLongTuple2SourceData(env),
                 new DoubleValueMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,20\n" +
@@ -309,7 +309,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdgesOnSource(TestGraphUtils.getLongCustomTuple2SourceData(env),
                 new CustomValueMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,10\n" +
@@ -337,7 +337,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdgesOnTarget(graph.getEdges()
                         .map(new ProjectTargetAndValueMapper()), new AddValuesMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,24\n" +
@@ -365,7 +365,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdgesOnTarget(graph.getEdges().first(3)
                         .map(new ProjectTargetAndValueMapper()), new AddValuesMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,24\n" +
@@ -393,7 +393,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdgesOnTarget(graph.getEdges().first(3)
                         .map(new ProjectTargetWithTrueMapper()), new DoubleIfTrueMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,24\n" +
@@ -421,7 +421,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdgesOnTarget(TestGraphUtils.getLongLongTuple2TargetData(env),
                 new DoubleValueMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,20\n" +
@@ -448,7 +448,7 @@ public class JoinWithEdgesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithEdgesOnTarget(TestGraphUtils.getLongCustomTuple2TargetData(env),
                 new CustomValueMapper());
 
-        DataSet<Edge<Long,Long>> data = res.getEdges();
+        DataSet<Edge<Long, Long>> data = res.getEdges();
         List<Edge<Long, Long>> result= data.collect();
 
         expectedResult = "1,2,10\n" +

http://git-wip-us.apache.org/repos/asf/flink/blob/53716a4d/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithVerticesITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithVerticesITCase.java b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithVerticesITCase.java
index 5b77101..29badba 100644
--- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithVerticesITCase.java
+++ b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/JoinWithVerticesITCase.java
@@ -18,8 +18,6 @@
 
 package org.apache.flink.graph.test.operations;
 
-import java.util.List;
-
 import org.apache.flink.api.common.functions.MapFunction;
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
@@ -35,6 +33,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import java.util.List;
+
 @RunWith(Parameterized.class)
 public class JoinWithVerticesITCase extends MultipleProgramsTestBase {
 
@@ -58,8 +58,8 @@ public class JoinWithVerticesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithVertices(graph.getVertices()
                         .map(new VertexToTuple2Map<Long, Long>()), new AddValuesMapper());
 
-		DataSet<Vertex<Long,Long>> data = res.getVertices();
-        List<Vertex<Long,Long>> result= data.collect();
+		DataSet<Vertex<Long, Long>> data = res.getVertices();
+        List<Vertex<Long, Long>> result= data.collect();
 
        expectedResult = "1,2\n" +
 	                "2,4\n" +
@@ -84,8 +84,8 @@ public class JoinWithVerticesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithVertices(graph.getVertices().first(3)
                         .map(new VertexToTuple2Map<Long, Long>()), new AddValuesMapper());
 
-		DataSet<Vertex<Long,Long>> data = res.getVertices();
-        List<Vertex<Long,Long>> result= data.collect();
+		DataSet<Vertex<Long, Long>> data = res.getVertices();
+        List<Vertex<Long, Long>> result= data.collect();
 
         expectedResult = "1,2\n" +
 	                "2,4\n" +
@@ -110,8 +110,8 @@ public class JoinWithVerticesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithVertices(graph.getVertices().first(3)
                         .map(new ProjectIdWithTrue()), new DoubleIfTrueMapper());
 
-		DataSet<Vertex<Long,Long>> data = res.getVertices();
-        List<Vertex<Long,Long>> result= data.collect();
+		DataSet<Vertex<Long, Long>> data = res.getVertices();
+        List<Vertex<Long, Long>> result= data.collect();
 
         expectedResult = "1,2\n" +
 	                "2,4\n" +
@@ -136,8 +136,8 @@ public class JoinWithVerticesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithVertices(TestGraphUtils.getLongLongTuple2Data(env),
                 new ProjectSecondMapper());
 
-		DataSet<Vertex<Long,Long>> data = res.getVertices();
-        List<Vertex<Long,Long>> result= data.collect();
+		DataSet<Vertex<Long, Long>> data = res.getVertices();
+        List<Vertex<Long, Long>> result= data.collect();
 
         expectedResult = "1,10\n" +
 	                "2,20\n" +
@@ -161,8 +161,8 @@ public class JoinWithVerticesITCase extends MultipleProgramsTestBase {
         Graph<Long, Long, Long> res = graph.joinWithVertices(TestGraphUtils.getLongCustomTuple2Data(env),
                 new CustomValueMapper());
 
-		DataSet<Vertex<Long,Long>> data = res.getVertices();
-        List<Vertex<Long,Long>> result= data.collect();
+		DataSet<Vertex<Long, Long>> data = res.getVertices();
+        List<Vertex<Long, Long>> result= data.collect();
 
         expectedResult = "1,10\n" +
 	                "2,20\n" +

http://git-wip-us.apache.org/repos/asf/flink/blob/53716a4d/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/ReduceOnEdgesMethodsITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/ReduceOnEdgesMethodsITCase.java b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/ReduceOnEdgesMethodsITCase.java
index 3978d36..84d7722 100644
--- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/ReduceOnEdgesMethodsITCase.java
+++ b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/ReduceOnEdgesMethodsITCase.java
@@ -18,9 +18,6 @@
 
 package org.apache.flink.graph.test.operations;
 
-import java.util.List;
-import java.util.Objects;
-
 import org.apache.flink.api.java.DataSet;
 import org.apache.flink.api.java.ExecutionEnvironment;
 import org.apache.flink.api.java.tuple.Tuple2;
@@ -38,6 +35,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import java.util.List;
+import java.util.Objects;
+
 @RunWith(Parameterized.class)
 public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
@@ -59,7 +59,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithLowestOutNeighbor = 
 				graph.groupReduceOnEdges(new SelectMinWeightNeighbor(), EdgeDirection.OUT);
-		List<Tuple2<Long,Long>> result = verticesWithLowestOutNeighbor.collect();
+		List<Tuple2<Long, Long>> result = verticesWithLowestOutNeighbor.collect();
 
 	
 		expectedResult = "1,2\n" +
@@ -83,7 +83,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithLowestOutNeighbor = 
 				graph.groupReduceOnEdges(new SelectMinWeightInNeighbor(), EdgeDirection.IN);
-		List<Tuple2<Long,Long>> result = verticesWithLowestOutNeighbor.collect();
+		List<Tuple2<Long, Long>> result = verticesWithLowestOutNeighbor.collect();
 
 		expectedResult = "1,5\n" +
 					"2,1\n" + 
@@ -105,7 +105,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithAllOutNeighbors =
 				graph.groupReduceOnEdges(new SelectOutNeighbors(), EdgeDirection.OUT);
-		List<Tuple2<Long,Long>> result = verticesWithAllOutNeighbors.collect();
+		List<Tuple2<Long, Long>> result = verticesWithAllOutNeighbors.collect();
 
 		expectedResult = "1,2\n" +
 				"1,3\n" +
@@ -129,7 +129,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithAllOutNeighbors =
 				graph.groupReduceOnEdges(new SelectOutNeighborsExcludeFive(), EdgeDirection.OUT);
-		List<Tuple2<Long,Long>> result = verticesWithAllOutNeighbors.collect();
+		List<Tuple2<Long, Long>> result = verticesWithAllOutNeighbors.collect();
 
 		expectedResult = "1,2\n" +
 				"1,3\n" +
@@ -152,7 +152,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithAllOutNeighbors =
 				graph.groupReduceOnEdges(new SelectOutNeighborsValueGreaterThanTwo(), EdgeDirection.OUT);
-		List<Tuple2<Long,Long>> result = verticesWithAllOutNeighbors.collect();
+		List<Tuple2<Long, Long>> result = verticesWithAllOutNeighbors.collect();
 
 		expectedResult = "3,4\n" +
 				"3,5\n" +
@@ -173,7 +173,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithAllInNeighbors =
 				graph.groupReduceOnEdges(new SelectInNeighbors(), EdgeDirection.IN);
-		List<Tuple2<Long,Long>> result = verticesWithAllInNeighbors.collect();
+		List<Tuple2<Long, Long>> result = verticesWithAllInNeighbors.collect();
 
 		expectedResult = "1,5\n" +
 				"2,1\n" +
@@ -197,7 +197,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithAllInNeighbors =
 				graph.groupReduceOnEdges(new SelectInNeighborsExceptFive(), EdgeDirection.IN);
-		List<Tuple2<Long,Long>> result = verticesWithAllInNeighbors.collect();
+		List<Tuple2<Long, Long>> result = verticesWithAllInNeighbors.collect();
 
 		expectedResult = "1,5\n" +
 				"2,1\n" +
@@ -219,7 +219,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithAllInNeighbors =
 				graph.groupReduceOnEdges(new SelectInNeighborsValueGreaterThanTwo(), EdgeDirection.IN);
-		List<Tuple2<Long,Long>> result = verticesWithAllInNeighbors.collect();
+		List<Tuple2<Long, Long>> result = verticesWithAllInNeighbors.collect();
 
 		expectedResult = "3,1\n" +
 				"3,2\n" +
@@ -241,7 +241,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithAllNeighbors =
 				graph.groupReduceOnEdges(new SelectNeighbors(), EdgeDirection.ALL);
-		List<Tuple2<Long,Long>> result = verticesWithAllNeighbors.collect();
+		List<Tuple2<Long, Long>> result = verticesWithAllNeighbors.collect();
 
 		expectedResult = "1,2\n" +
 				"1,3\n" +
@@ -272,7 +272,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithAllNeighbors =
 				graph.groupReduceOnEdges(new SelectNeighborsExceptFiveAndTwo(), EdgeDirection.ALL);
-		List<Tuple2<Long,Long>> result = verticesWithAllNeighbors.collect();
+		List<Tuple2<Long, Long>> result = verticesWithAllNeighbors.collect();
 
 		expectedResult = "1,2\n" +
 				"1,3\n" +
@@ -298,7 +298,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithAllNeighbors =
 				graph.groupReduceOnEdges(new SelectNeighborsValueGreaterThanFour(), EdgeDirection.ALL);
-		List<Tuple2<Long,Long>> result = verticesWithAllNeighbors.collect();
+		List<Tuple2<Long, Long>> result = verticesWithAllNeighbors.collect();
 
 		expectedResult = "5,1\n" +
 				"5,3\n" +
@@ -319,7 +319,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithMaxEdgeWeight = 
 				graph.groupReduceOnEdges(new SelectMaxWeightNeighbor(), EdgeDirection.ALL);
-		List<Tuple2<Long,Long>> result = verticesWithMaxEdgeWeight.collect();
+		List<Tuple2<Long, Long>> result = verticesWithMaxEdgeWeight.collect();
 
 		expectedResult = "1,51\n" +
 				"2,23\n" + 
@@ -342,7 +342,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithLowestOutNeighbor = 
 				graph.reduceOnEdges(new SelectMinWeightNeighborNoValue(), EdgeDirection.OUT);
-		List<Tuple2<Long,Long>> result = verticesWithLowestOutNeighbor.collect();
+		List<Tuple2<Long, Long>> result = verticesWithLowestOutNeighbor.collect();
 
 		expectedResult = "1,12\n" +
 				"2,23\n" +
@@ -365,7 +365,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithLowestOutNeighbor = 
 				graph.reduceOnEdges(new SelectMinWeightNeighborNoValue(), EdgeDirection.IN);
-		List<Tuple2<Long,Long>> result = verticesWithLowestOutNeighbor.collect();
+		List<Tuple2<Long, Long>> result = verticesWithLowestOutNeighbor.collect();
 
 		expectedResult = "1,51\n" +
 				"2,12\n" +
@@ -388,7 +388,7 @@ public class ReduceOnEdgesMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithMaxEdgeWeight = 
 				graph.reduceOnEdges(new SelectMaxWeightNeighborNoValue(), EdgeDirection.ALL);
-		List<Tuple2<Long,Long>> result = verticesWithMaxEdgeWeight.collect();
+		List<Tuple2<Long, Long>> result = verticesWithMaxEdgeWeight.collect();
 
 		expectedResult = "1,51\n" +
 				"2,23\n" + 

http://git-wip-us.apache.org/repos/asf/flink/blob/53716a4d/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/ReduceOnNeighborMethodsITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/ReduceOnNeighborMethodsITCase.java b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/ReduceOnNeighborMethodsITCase.java
index cc5d91d..a352bb4 100644
--- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/ReduceOnNeighborMethodsITCase.java
+++ b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/operations/ReduceOnNeighborMethodsITCase.java
@@ -59,7 +59,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSumOfOutNeighborValues = 
 				graph.groupReduceOnNeighbors(new SumOutNeighbors(), EdgeDirection.OUT);
-		List<Tuple2<Long,Long>> result = verticesWithSumOfOutNeighborValues.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSumOfOutNeighborValues.collect();
 		
 		expectedResult = "1,5\n" +
 				"2,3\n" + 
@@ -82,7 +82,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSum = 
 				graph.groupReduceOnNeighbors(new SumInNeighbors(), EdgeDirection.IN);
-		List<Tuple2<Long,Long>> result = verticesWithSum.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSum.collect();
 		
 		expectedResult = "1,255\n" +
 				"2,12\n" + 
@@ -108,7 +108,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSumOfOutNeighborValues = 
 				graph.groupReduceOnNeighbors(new SumAllNeighbors(), EdgeDirection.ALL);
-		List<Tuple2<Long,Long>> result = verticesWithSumOfOutNeighborValues.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSumOfOutNeighborValues.collect();
 
 		expectedResult = "1,11\n" +
 				"2,6\n" + 
@@ -131,7 +131,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSumOfOutNeighborValues =
 				graph.groupReduceOnNeighbors(new SumOutNeighborsIdGreaterThanThree(), EdgeDirection.OUT);
-		List<Tuple2<Long,Long>> result = verticesWithSumOfOutNeighborValues.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSumOfOutNeighborValues.collect();
 		
 		expectedResult = "4,5\n" +
 				"5,1\n";
@@ -151,7 +151,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSum =
 				graph.groupReduceOnNeighbors(new SumInNeighborsIdGreaterThanThree(), EdgeDirection.IN);
-		List<Tuple2<Long,Long>> result = verticesWithSum.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSum.collect();
 		
 		expectedResult = "4,102\n" +
 				"5,285\n";
@@ -172,7 +172,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSumOfOutNeighborValues =
 				graph.groupReduceOnNeighbors(new SumAllNeighborsIdGreaterThanThree(), EdgeDirection.ALL);
-		List<Tuple2<Long,Long>> result = verticesWithSumOfOutNeighborValues.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSumOfOutNeighborValues.collect();
 
 		expectedResult = "4,12\n" +
 				"5,13\n";
@@ -192,7 +192,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSumOfOutNeighborValues = 
 				graph.reduceOnNeighbors(new SumNeighbors(), EdgeDirection.OUT);
-		List<Tuple2<Long,Long>> result = verticesWithSumOfOutNeighborValues.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSumOfOutNeighborValues.collect();
 
 		expectedResult = "1,5\n" +
 				"2,3\n" + 
@@ -215,7 +215,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSum = 
 				graph.groupReduceOnNeighbors(new SumInNeighborsNoValue(), EdgeDirection.IN);
-		List<Tuple2<Long,Long>> result = verticesWithSum.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSum.collect();
 	
 		expectedResult = "1,255\n" +
 				"2,12\n" +
@@ -238,7 +238,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSumOfAllNeighborValues =
 				graph.reduceOnNeighbors(new SumNeighbors(), EdgeDirection.ALL);
-		List<Tuple2<Long,Long>> result = verticesWithSumOfAllNeighborValues.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSumOfAllNeighborValues.collect();
 	
 		expectedResult = "1,10\n" +
 				"2,4\n" + 
@@ -261,7 +261,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSumOfOutNeighborValues =
 				graph.groupReduceOnNeighbors(new SumOutNeighborsNoValueMultipliedByTwoIdGreaterThanTwo(), EdgeDirection.OUT);
-		List<Tuple2<Long,Long>> result = verticesWithSumOfOutNeighborValues.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSumOfOutNeighborValues.collect();
 
 		expectedResult = "3,9\n" +
 				"3,18\n" +
@@ -285,7 +285,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSumOfOutNeighborValues =
 				graph.groupReduceOnNeighbors(new SumInNeighborsNoValueMultipliedByTwoIdGreaterThanTwo(), EdgeDirection.IN);
-		List<Tuple2<Long,Long>> result = verticesWithSumOfOutNeighborValues.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSumOfOutNeighborValues.collect();
 
 		expectedResult = "3,59\n" +
 				"3,118\n" +
@@ -309,7 +309,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSumOfAllNeighborValues =
 				graph.groupReduceOnNeighbors(new SumAllNeighborsNoValueMultipliedByTwoIdGreaterThanTwo(), EdgeDirection.ALL);
-		List<Tuple2<Long,Long>> result = verticesWithSumOfAllNeighborValues.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSumOfAllNeighborValues.collect();
 
 		expectedResult = "3,12\n" +
 				"3,24\n" +
@@ -333,7 +333,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSumOfOutNeighborValues =
 				graph.groupReduceOnNeighbors(new SumOutNeighborsMultipliedByTwo(), EdgeDirection.OUT);
-		List<Tuple2<Long,Long>> result = verticesWithSumOfOutNeighborValues.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSumOfOutNeighborValues.collect();
 		
 		expectedResult = "1,5\n" +
 				"1,10\n" +
@@ -361,7 +361,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSum =
 				graph.groupReduceOnNeighbors(new SumInNeighborsSubtractOne(), EdgeDirection.IN);
-		List<Tuple2<Long,Long>> result = verticesWithSum.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSum.collect();
 		
 		expectedResult = "1,255\n" +
 				"1,254\n" +
@@ -390,7 +390,7 @@ public class ReduceOnNeighborMethodsITCase extends MultipleProgramsTestBase {
 
 		DataSet<Tuple2<Long, Long>> verticesWithSumOfOutNeighborValues =
 				graph.groupReduceOnNeighbors(new SumAllNeighborsAddFive(), EdgeDirection.ALL);
-		List<Tuple2<Long,Long>> result = verticesWithSumOfOutNeighborValues.collect();
+		List<Tuple2<Long, Long>> result = verticesWithSumOfOutNeighborValues.collect();
 
 		expectedResult = "1,11\n" +
 				"1,16\n" +