You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/05/26 19:16:20 UTC
[11/15] flink git commit: [FLINK-6709] [gelly] Activate strict
checkstyle for flink-gellies
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/LabelPropagationData.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/LabelPropagationData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/LabelPropagationData.java
index 8decb24..343ff70 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/LabelPropagationData.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/LabelPropagationData.java
@@ -18,21 +18,21 @@
package org.apache.flink.graph.examples.data;
-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;
import org.apache.flink.graph.Vertex;
import org.apache.flink.types.NullValue;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Provides the default data set used for the Label Propagation test program.
* If no parameters are given to the program, the default edge data set is used.
*/
public class LabelPropagationData {
-
+
public static final String LABELS_AFTER_1_ITERATION = "1,10\n" +
"2,10\n" +
"3,10\n" +
@@ -41,7 +41,7 @@ public class LabelPropagationData {
"6,40\n" +
"7,40\n";
- public static final String LABELS_WITH_TIE ="1,10\n" +
+ public static final String LABELS_WITH_TIE = "1,10\n" +
"2,10\n" +
"3,10\n" +
"4,10\n" +
@@ -56,13 +56,13 @@ public class LabelPropagationData {
public static final DataSet<Vertex<Long, Long>> getDefaultVertexSet(ExecutionEnvironment env) {
List<Vertex<Long, Long>> vertices = new ArrayList<Vertex<Long, Long>>();
- vertices.add(new Vertex<Long, Long>(1l, 10l));
- vertices.add(new Vertex<Long, Long>(2l, 10l));
- vertices.add(new Vertex<Long, Long>(3l, 30l));
- vertices.add(new Vertex<Long, Long>(4l, 40l));
- vertices.add(new Vertex<Long, Long>(5l, 40l));
- vertices.add(new Vertex<Long, Long>(6l, 40l));
- vertices.add(new Vertex<Long, Long>(7l, 40l));
+ vertices.add(new Vertex<Long, Long>(1L, 10L));
+ vertices.add(new Vertex<Long, Long>(2L, 10L));
+ vertices.add(new Vertex<Long, Long>(3L, 30L));
+ vertices.add(new Vertex<Long, Long>(4L, 40L));
+ vertices.add(new Vertex<Long, Long>(5L, 40L));
+ vertices.add(new Vertex<Long, Long>(6L, 40L));
+ vertices.add(new Vertex<Long, Long>(7L, 40L));
return env.fromCollection(vertices);
}
@@ -83,15 +83,15 @@ public class LabelPropagationData {
public static final DataSet<Vertex<Long, Long>> getTieVertexSet(ExecutionEnvironment env) {
List<Vertex<Long, Long>> vertices = new ArrayList<Vertex<Long, Long>>();
- vertices.add(new Vertex<Long, Long>(1l, 10l));
- vertices.add(new Vertex<Long, Long>(2l, 10l));
- vertices.add(new Vertex<Long, Long>(3l, 10l));
- vertices.add(new Vertex<Long, Long>(4l, 10l));
- vertices.add(new Vertex<Long, Long>(5l, 0l));
- vertices.add(new Vertex<Long, Long>(6l, 20l));
- vertices.add(new Vertex<Long, Long>(7l, 20l));
- vertices.add(new Vertex<Long, Long>(8l, 20l));
- vertices.add(new Vertex<Long, Long>(9l, 20l));
+ vertices.add(new Vertex<Long, Long>(1L, 10L));
+ vertices.add(new Vertex<Long, Long>(2L, 10L));
+ vertices.add(new Vertex<Long, Long>(3L, 10L));
+ vertices.add(new Vertex<Long, Long>(4L, 10L));
+ vertices.add(new Vertex<Long, Long>(5L, 0L));
+ vertices.add(new Vertex<Long, Long>(6L, 20L));
+ vertices.add(new Vertex<Long, Long>(7L, 20L));
+ vertices.add(new Vertex<Long, Long>(8L, 20L));
+ vertices.add(new Vertex<Long, Long>(9L, 20L));
return env.fromCollection(vertices);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/MusicProfilesData.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/MusicProfilesData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/MusicProfilesData.java
index e4c98fe..df139f0 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/MusicProfilesData.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/MusicProfilesData.java
@@ -18,13 +18,13 @@
package org.apache.flink.graph.examples.data;
-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.Tuple3;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Provides the default data sets used for the Music Profiles example program.
* If no parameters are given to the program, the default data sets are used.
@@ -33,17 +33,17 @@ public class MusicProfilesData {
public static DataSet<Tuple3<String, String, Integer>> getUserSongTriplets(ExecutionEnvironment env) {
List<Tuple3<String, String, Integer>> triplets = new ArrayList<Tuple3<String, String, Integer>>();
-
+
triplets.add(new Tuple3<String, String, Integer>("user_1", "song_1", 100));
triplets.add(new Tuple3<String, String, Integer>("user_1", "song_2", 10));
triplets.add(new Tuple3<String, String, Integer>("user_1", "song_3", 20));
triplets.add(new Tuple3<String, String, Integer>("user_1", "song_4", 30));
triplets.add(new Tuple3<String, String, Integer>("user_1", "song_5", 1));
-
+
triplets.add(new Tuple3<String, String, Integer>("user_2", "song_6", 40));
triplets.add(new Tuple3<String, String, Integer>("user_2", "song_7", 10));
triplets.add(new Tuple3<String, String, Integer>("user_2", "song_8", 3));
-
+
triplets.add(new Tuple3<String, String, Integer>("user_3", "song_1", 100));
triplets.add(new Tuple3<String, String, Integer>("user_3", "song_2", 10));
triplets.add(new Tuple3<String, String, Integer>("user_3", "song_3", 20));
@@ -54,14 +54,14 @@ public class MusicProfilesData {
triplets.add(new Tuple3<String, String, Integer>("user_3", "song_12", 30));
triplets.add(new Tuple3<String, String, Integer>("user_3", "song_13", 34));
triplets.add(new Tuple3<String, String, Integer>("user_3", "song_14", 17));
-
+
triplets.add(new Tuple3<String, String, Integer>("user_4", "song_1", 100));
triplets.add(new Tuple3<String, String, Integer>("user_4", "song_6", 10));
triplets.add(new Tuple3<String, String, Integer>("user_4", "song_8", 20));
triplets.add(new Tuple3<String, String, Integer>("user_4", "song_12", 30));
triplets.add(new Tuple3<String, String, Integer>("user_4", "song_13", 1));
triplets.add(new Tuple3<String, String, Integer>("user_4", "song_15", 1));
-
+
triplets.add(new Tuple3<String, String, Integer>("user_5", "song_3", 300));
triplets.add(new Tuple3<String, String, Integer>("user_5", "song_4", 4));
triplets.add(new Tuple3<String, String, Integer>("user_5", "song_5", 5));
@@ -76,7 +76,7 @@ public class MusicProfilesData {
return env.fromCollection(triplets);
}
-
+
public static DataSet<String> getMismatches(ExecutionEnvironment env) {
List<String> errors = new ArrayList<String>();
errors.add("ERROR: <song_8 track_8> Sever");
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/PageRankData.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/PageRankData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/PageRankData.java
index a45de88..1c3ebb0 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/PageRankData.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/PageRankData.java
@@ -18,21 +18,21 @@
package org.apache.flink.graph.examples.data;
-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;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Provides the default data set used for the PageRank test program.
* If no parameters are given to the program, the default edge data set is used.
*/
public class PageRankData {
-
+
public static final String EDGES = "2 1\n" +
- "5 2\n" +
+ "5 2\n" +
"5 4\n" +
"4 3\n" +
"4 2\n" +
@@ -41,9 +41,9 @@ public class PageRankData {
"1 3\n" +
"3 5\n";
-
+
public static final String RANKS_AFTER_3_ITERATIONS = "1,0.237\n" +
- "2,0.248\n" +
+ "2,0.248\n" +
"3,0.173\n" +
"4,0.175\n" +
"5,0.165\n";
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SingleSourceShortestPathsData.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SingleSourceShortestPathsData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SingleSourceShortestPathsData.java
index 59d14ad..5824a98 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SingleSourceShortestPathsData.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SingleSourceShortestPathsData.java
@@ -18,13 +18,13 @@
package org.apache.flink.graph.examples.data;
-import java.util.LinkedList;
-import java.util.List;
-
import org.apache.flink.api.java.DataSet;
import org.apache.flink.api.java.ExecutionEnvironment;
import org.apache.flink.graph.Edge;
+import java.util.LinkedList;
+import java.util.List;
+
/**
* Provides the default data set used for the Single Source Shortest Paths example program.
* If no parameters are given to the program, the default edge data set is used.
@@ -46,7 +46,7 @@ public class SingleSourceShortestPathsData {
new Object[]{5L, 1L, 51.0}
};
- public static final String RESULTED_SINGLE_SOURCE_SHORTEST_PATHS = "1,0.0\n" + "2,12.0\n" + "3,13.0\n" +
+ public static final String RESULTED_SINGLE_SOURCE_SHORTEST_PATHS = "1,0.0\n" + "2,12.0\n" + "3,13.0\n" +
"4,47.0\n" + "5,48.0";
public static DataSet<Edge<Long, Double>> getDefaultEdgeDataSet(ExecutionEnvironment env) {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SummarizationData.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SummarizationData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SummarizationData.java
index 703b66e..dafedec 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SummarizationData.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SummarizationData.java
@@ -37,9 +37,9 @@ public class SummarizationData {
/**
* Vertices of the input graph.
*
- * Format:
+ * <p>Format:
*
- * "vertex-id;vertex-value"
+ * <p>"vertex-id;vertex-value"
*/
private static final String[] INPUT_VERTICES = new String[] {
"0;1",
@@ -53,9 +53,9 @@ public class SummarizationData {
/**
* Edges of the input graph.
*
- * Format:
+ * <p>Format:
*
- * "source-id;target-id;edge-value
+ * <p>"source-id;target-id;edge-value
*/
private static final String[] INPUT_EDGES = new String[] {
"0;1;1",
@@ -73,9 +73,9 @@ public class SummarizationData {
/**
* The resulting vertex id can be any id of the vertices summarized by the single vertex.
*
- * Format:
+ * <p>Format:
*
- * "possible-id[,possible-id];group-value,group-count"
+ * <p>"possible-id[,possible-id];group-value,group-count"
*/
public static final String[] EXPECTED_VERTICES = new String[] {
"0,1;1,2",
@@ -84,9 +84,11 @@ public class SummarizationData {
};
/**
- * Format:
+ * The expected output from the input edges.
*
- * "possible-source-id[,possible-source-id];possible-target-id[,possible-target-id];group-value,group-count"
+ * <p>Format:
+ *
+ * <p>"possible-source-id[,possible-source-id];possible-target-id[,possible-target-id];group-value,group-count"
*/
public static final String[] EXPECTED_EDGES_WITH_VALUES = new String[] {
"0,1;0,1;1,2",
@@ -98,9 +100,11 @@ public class SummarizationData {
};
/**
- * Format:
+ * The expected output from the input edges translated to null values.
+ *
+ * <p>Format:
*
- * "possible-source-id[,possible-source-id];possible-target-id[,possible-target-id];group-value,group-count"
+ * <p>"possible-source-id[,possible-source-id];possible-target-id[,possible-target-id];group-value,group-count"
*/
public static final String[] EXPECTED_EDGES_ABSENT_VALUES = new String[] {
"0,1;0,1;(null),2",
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/TriangleCountData.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/TriangleCountData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/TriangleCountData.java
index cf3a715..7f4f926 100644
--- a/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/TriangleCountData.java
+++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/TriangleCountData.java
@@ -33,7 +33,15 @@ import java.util.List;
*/
public class TriangleCountData {
- public static final String EDGES = "1 2\n"+"1 3\n"+"2 3\n"+"2 6\n"+"3 4\n"+"3 5\n"+"3 6\n"+"4 5\n"+"6 7\n";
+ public static final String EDGES = "1 2\n" +
+ "1 3\n" +
+ "2 3\n" +
+ "2 6\n" +
+ "3 4\n" +
+ "3 5\n" +
+ "3 6\n" +
+ "4 5\n" +
+ "6 7\n";
public static DataSet<Edge<Long, NullValue>> getDefaultEdgeDataSet(ExecutionEnvironment env) {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/resources/logback.xml b/flink-libraries/flink-gelly-examples/src/main/resources/logback.xml
index 95f2d04..4b87118 100644
--- a/flink-libraries/flink-gelly-examples/src/main/resources/logback.xml
+++ b/flink-libraries/flink-gelly-examples/src/main/resources/logback.xml
@@ -26,4 +26,4 @@
<root level="INFO">
<appender-ref ref="STDOUT"/>
</root>
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/ConnectedComponents.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/ConnectedComponents.scala b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/ConnectedComponents.scala
index b49a520..d3f2f92 100644
--- a/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/ConnectedComponents.scala
+++ b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/ConnectedComponents.scala
@@ -18,14 +18,15 @@
package org.apache.flink.graph.scala.examples
+import java.lang.Long
+
+import org.apache.flink.api.common.functions.MapFunction
import org.apache.flink.api.scala._
-import org.apache.flink.graph.library.GSAConnectedComponents
-import org.apache.flink.graph.scala._
import org.apache.flink.graph.Edge
import org.apache.flink.graph.examples.data.ConnectedComponentsDefaultData
+import org.apache.flink.graph.library.GSAConnectedComponents
+import org.apache.flink.graph.scala._
import org.apache.flink.types.NullValue
-import org.apache.flink.api.common.functions.MapFunction
-import java.lang.Long
/**
* This example shows how to use Gelly's library methods.
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/GSASingleSourceShortestPaths.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/GSASingleSourceShortestPaths.scala b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/GSASingleSourceShortestPaths.scala
index 0a10ad7..bd5c63b 100644
--- a/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/GSASingleSourceShortestPaths.scala
+++ b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/GSASingleSourceShortestPaths.scala
@@ -21,10 +21,10 @@ package org.apache.flink.graph.scala.examples
import org.apache.flink.api.common.functions.MapFunction
import org.apache.flink.api.scala._
import org.apache.flink.graph.Edge
+import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData
import org.apache.flink.graph.gsa.{ApplyFunction, GatherFunction, Neighbor, SumFunction}
import org.apache.flink.graph.scala._
import org.apache.flink.graph.scala.utils.Tuple3ToEdgeMap
-import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData
/**
* This example shows how to use Gelly's gather-sum-apply iterations.
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/SingleSourceShortestPaths.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/SingleSourceShortestPaths.scala b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/SingleSourceShortestPaths.scala
index 2d623e7..f3b10f7 100644
--- a/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/SingleSourceShortestPaths.scala
+++ b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/SingleSourceShortestPaths.scala
@@ -18,16 +18,15 @@
package org.apache.flink.graph.scala.examples
-import org.apache.flink.api.scala._
-import org.apache.flink.graph.scala._
-import org.apache.flink.graph.Edge
import org.apache.flink.api.common.functions.MapFunction
-import org.apache.flink.graph.spargel.{MessageIterator, ScatterFunction, GatherFunction}
-import org.apache.flink.graph.Vertex
+import org.apache.flink.api.scala._
import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData
+import org.apache.flink.graph.scala._
+import org.apache.flink.graph.scala.utils.Tuple3ToEdgeMap
+import org.apache.flink.graph.spargel.{GatherFunction, MessageIterator, ScatterFunction}
+import org.apache.flink.graph.{Edge, Vertex}
import scala.collection.JavaConversions._
-import org.apache.flink.graph.scala.utils.Tuple3ToEdgeMap
/**
* This example shows how to use Gelly's scatter-gather iterations.
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/RunnerITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/RunnerITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/RunnerITCase.java
index f93dc31..8d17c39 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/RunnerITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/RunnerITCase.java
@@ -20,12 +20,16 @@ package org.apache.flink.graph;
import org.apache.flink.client.program.ProgramParametrizationException;
import org.apache.flink.graph.drivers.DriverBaseITCase;
+
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+/**
+ * Tests for {@link Runner}.
+ */
@RunWith(Parameterized.class)
public class RunnerITCase
extends DriverBaseITCase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/AdamicAdarITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/AdamicAdarITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/AdamicAdarITCase.java
index 2548263..c36dcb5 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/AdamicAdarITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/AdamicAdarITCase.java
@@ -18,13 +18,17 @@
package org.apache.flink.graph.drivers;
-import org.apache.commons.lang3.ArrayUtils;
import org.apache.flink.client.program.ProgramParametrizationException;
+
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+/**
+ * Tests for {@link AdamicAdar}.
+ */
@RunWith(Parameterized.class)
public class AdamicAdarITCase
extends CopyableValueDriverBaseITCase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ClusteringCoefficientITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ClusteringCoefficientITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ClusteringCoefficientITCase.java
index 86eee01..ce8cb3b 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ClusteringCoefficientITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ClusteringCoefficientITCase.java
@@ -20,11 +20,15 @@ package org.apache.flink.graph.drivers;
import org.apache.flink.client.program.ProgramParametrizationException;
import org.apache.flink.graph.asm.dataset.ChecksumHashCode.Checksum;
+
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+/**
+ * Tests for {@link ClusteringCoefficient}.
+ */
@RunWith(Parameterized.class)
public class ClusteringCoefficientITCase
extends CopyableValueDriverBaseITCase {
@@ -83,25 +87,25 @@ extends CopyableValueDriverBaseITCase {
@Test
public void testHashWithSmallUndirectedRMatGraph() throws Exception {
- long directed_checksum;
- long undirected_checksum;
+ long directedChecksum;
+ long undirectedChecksum;
switch (idType) {
case "byte":
case "short":
case "char":
case "integer":
- directed_checksum = 0x0000003875b38c43L;
- undirected_checksum = 0x0000003c20344c75L;
+ directedChecksum = 0x0000003875b38c43L;
+ undirectedChecksum = 0x0000003c20344c75L;
break;
case "long":
- directed_checksum = 0x0000003671970c59L;
- undirected_checksum = 0x0000003939645d8cL;
+ directedChecksum = 0x0000003671970c59L;
+ undirectedChecksum = 0x0000003939645d8cL;
break;
case "string":
- directed_checksum = 0x0000003be109a770L;
- undirected_checksum = 0x0000003b8c98d14aL;
+ directedChecksum = 0x0000003be109a770L;
+ undirectedChecksum = 0x0000003b8c98d14aL;
break;
default:
@@ -113,9 +117,9 @@ extends CopyableValueDriverBaseITCase {
"vertex count: 117, average clustering coefficient: 0.57438679[0-9]+\n";
expectedOutput(parameters(7, "directed", "undirected", "hash"),
- "\n" + new Checksum(117, directed_checksum) + expected);
+ "\n" + new Checksum(117, directedChecksum) + expected);
expectedOutput(parameters(7, "undirected", "undirected", "hash"),
- "\n" + new Checksum(117, undirected_checksum) + expected);
+ "\n" + new Checksum(117, undirectedChecksum) + expected);
}
@Test
@@ -159,8 +163,8 @@ extends CopyableValueDriverBaseITCase {
// computation is too large for collection mode
Assume.assumeFalse(mode == TestExecutionMode.COLLECTION);
- long directed_checksum;
- long undirected_checksum;
+ long directedChecksum;
+ long undirectedChecksum;
switch (idType) {
case "byte":
return;
@@ -168,18 +172,18 @@ extends CopyableValueDriverBaseITCase {
case "short":
case "char":
case "integer":
- directed_checksum = 0x00000681fad1587eL;
- undirected_checksum = 0x0000068713b3b7f1L;
+ directedChecksum = 0x00000681fad1587eL;
+ undirectedChecksum = 0x0000068713b3b7f1L;
break;
case "long":
- directed_checksum = 0x000006928a6301b1L;
- undirected_checksum = 0x000006a399edf0e6L;
+ directedChecksum = 0x000006928a6301b1L;
+ undirectedChecksum = 0x000006a399edf0e6L;
break;
case "string":
- directed_checksum = 0x000006749670a2f7L;
- undirected_checksum = 0x0000067f19c6c4d5L;
+ directedChecksum = 0x000006749670a2f7L;
+ undirectedChecksum = 0x0000067f19c6c4d5L;
break;
default:
@@ -191,8 +195,8 @@ extends CopyableValueDriverBaseITCase {
"vertex count: 3349, average clustering coefficient: 0.33029442[0-9]+\n";
expectedOutput(parameters(12, "directed", "undirected", "hash"),
- "\n" + new Checksum(3349, directed_checksum) + expected);
+ "\n" + new Checksum(3349, directedChecksum) + expected);
expectedOutput(parameters(12, "undirected", "undirected", "hash"),
- "\n" + new Checksum(3349, undirected_checksum) + expected);
+ "\n" + new Checksum(3349, undirectedChecksum) + expected);
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ConnectedComponentsITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ConnectedComponentsITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ConnectedComponentsITCase.java
index 95f0c66..cbb5c9d 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ConnectedComponentsITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/ConnectedComponentsITCase.java
@@ -20,11 +20,15 @@ package org.apache.flink.graph.drivers;
import org.apache.flink.client.program.ProgramParametrizationException;
import org.apache.flink.graph.asm.dataset.ChecksumHashCode.Checksum;
+
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+/**
+ * Tests for {@link ConnectedComponents}.
+ */
@RunWith(Parameterized.class)
public class ConnectedComponentsITCase
extends DriverBaseITCase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/DriverBaseITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/DriverBaseITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/DriverBaseITCase.java
index 5b0e42e..670968c 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/DriverBaseITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/DriverBaseITCase.java
@@ -18,11 +18,12 @@
package org.apache.flink.graph.drivers;
-import org.apache.commons.lang.ArrayUtils;
import org.apache.flink.graph.Runner;
import org.apache.flink.graph.asm.dataset.ChecksumHashCode.Checksum;
import org.apache.flink.test.util.MultipleProgramsTestBase;
import org.apache.flink.util.FlinkRuntimeException;
+
+import org.apache.commons.lang3.ArrayUtils;
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Assert;
@@ -38,7 +39,8 @@ import java.util.List;
import java.util.regex.Pattern;
/**
- *
+ * Base class for driver integration tests providing utility methods for
+ * verifying program output.
*/
public abstract class DriverBaseITCase
extends MultipleProgramsTestBase {
@@ -187,7 +189,7 @@ extends MultipleProgramsTestBase {
switch (mode) {
case CLUSTER:
case COLLECTION:
- args = (String[])ArrayUtils.add(args, "--__disable_object_reuse");
+ args = ArrayUtils.add(args, "--__disable_object_reuse");
break;
case CLUSTER_OBJECT_REUSE:
@@ -214,7 +216,7 @@ extends MultipleProgramsTestBase {
* Implements a Hamcrest regex matcher. Hamcrest 2.0 provides
* Matchers.matchesPattern(String) but Flink depends on Hamcrest 1.3.
*
- * see http://stackoverflow.com/a/25021229
+ * <p>see http://stackoverflow.com/a/25021229
*/
private static class RegexMatcher
extends TypeSafeMatcher<String> {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/EdgeListITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/EdgeListITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/EdgeListITCase.java
index d3ba4fb..15f7293 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/EdgeListITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/EdgeListITCase.java
@@ -18,14 +18,18 @@
package org.apache.flink.graph.drivers;
-import org.apache.commons.lang3.ArrayUtils;
import org.apache.flink.client.program.ProgramParametrizationException;
import org.apache.flink.graph.asm.dataset.ChecksumHashCode.Checksum;
+
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+/**
+ * Tests for {@link EdgeList}.
+ */
@RunWith(Parameterized.class)
public class EdgeListITCase
extends DriverBaseITCase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/GraphMetricsITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/GraphMetricsITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/GraphMetricsITCase.java
index 8c5ed86..1045a38 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/GraphMetricsITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/GraphMetricsITCase.java
@@ -19,11 +19,15 @@
package org.apache.flink.graph.drivers;
import org.apache.flink.client.program.ProgramParametrizationException;
+
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+/**
+ * Tests for {@link GraphMetrics}.
+ */
@RunWith(Parameterized.class)
public class GraphMetricsITCase
extends DriverBaseITCase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/HITSITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/HITSITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/HITSITCase.java
index 282d3d5..51a63eb 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/HITSITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/HITSITCase.java
@@ -19,11 +19,15 @@
package org.apache.flink.graph.drivers;
import org.apache.flink.client.program.ProgramParametrizationException;
+
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+/**
+ * Tests for {@link HITS}.
+ */
@RunWith(Parameterized.class)
public class HITSITCase
extends DriverBaseITCase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/JaccardIndexITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/JaccardIndexITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/JaccardIndexITCase.java
index 0391771..a8b0111 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/JaccardIndexITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/JaccardIndexITCase.java
@@ -18,14 +18,18 @@
package org.apache.flink.graph.drivers;
-import org.apache.commons.lang3.ArrayUtils;
import org.apache.flink.client.program.ProgramParametrizationException;
import org.apache.flink.graph.asm.dataset.ChecksumHashCode.Checksum;
+
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+/**
+ * Tests for {@link JaccardIndex}.
+ */
@RunWith(Parameterized.class)
public class JaccardIndexITCase
extends CopyableValueDriverBaseITCase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/PageRankITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/PageRankITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/PageRankITCase.java
index 4ca0a85..8e86810 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/PageRankITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/PageRankITCase.java
@@ -19,11 +19,15 @@
package org.apache.flink.graph.drivers;
import org.apache.flink.client.program.ProgramParametrizationException;
+
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+/**
+ * Tests for {@link PageRank}.
+ */
@RunWith(Parameterized.class)
public class PageRankITCase
extends DriverBaseITCase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/TriangleListingITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/TriangleListingITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/TriangleListingITCase.java
index fabdae1..1e330dd 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/TriangleListingITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/TriangleListingITCase.java
@@ -18,14 +18,18 @@
package org.apache.flink.graph.drivers;
-import org.apache.commons.lang3.ArrayUtils;
import org.apache.flink.client.program.ProgramParametrizationException;
import org.apache.flink.graph.asm.dataset.ChecksumHashCode.Checksum;
+
+import org.apache.commons.lang3.ArrayUtils;
import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+/**
+ * Tests for {@link TriangleListing}.
+ */
@RunWith(Parameterized.class)
public class TriangleListingITCase
extends CopyableValueDriverBaseITCase {
@@ -227,7 +231,6 @@ extends CopyableValueDriverBaseITCase {
expectedOutput(parameters(12, "undirected", "hash"), expected);
}
-
@Test
public void testPrintWithSmallDirectedRMatGraph() throws Exception {
// skip 'char' since it is not printed as a number
@@ -253,7 +256,6 @@ extends CopyableValueDriverBaseITCase {
expectedOutputChecksum(parameters(7, "directed", "print"), new Checksum(3822, checksum));
}
-
@Test
public void testPrintWithSmallUndirectedRMatGraph() throws Exception {
// skip 'char' since it is not printed as a number
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/input/GeneratedGraphTest.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/input/GeneratedGraphTest.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/input/GeneratedGraphTest.java
index da77b0d..1608f95 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/input/GeneratedGraphTest.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/input/GeneratedGraphTest.java
@@ -21,21 +21,25 @@ package org.apache.flink.graph.drivers.input;
import org.apache.flink.graph.asm.translate.TranslateFunction;
import org.apache.flink.graph.drivers.input.GeneratedGraph.LongValueToChar;
import org.apache.flink.graph.drivers.input.GeneratedGraph.LongValueToCharValue;
+import org.apache.flink.graph.drivers.input.GeneratedGraph.LongValueToLong;
import org.apache.flink.graph.drivers.input.GeneratedGraph.LongValueToString;
import org.apache.flink.graph.drivers.input.GeneratedGraph.LongValueToUnsignedByte;
import org.apache.flink.graph.drivers.input.GeneratedGraph.LongValueToUnsignedByteValue;
import org.apache.flink.graph.drivers.input.GeneratedGraph.LongValueToUnsignedInt;
-import org.apache.flink.graph.drivers.input.GeneratedGraph.LongValueToLong;
import org.apache.flink.graph.drivers.input.GeneratedGraph.LongValueToUnsignedShort;
import org.apache.flink.graph.drivers.input.GeneratedGraph.LongValueToUnsignedShortValue;
import org.apache.flink.types.ByteValue;
import org.apache.flink.types.CharValue;
import org.apache.flink.types.LongValue;
import org.apache.flink.types.ShortValue;
+
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+/**
+ * Tests for {@link GeneratedGraph}.
+ */
public class GeneratedGraphTest {
private TranslateFunction<LongValue, ByteValue> byteValueTranslator = new LongValueToUnsignedByteValue();
@@ -61,12 +65,12 @@ public class GeneratedGraphTest {
assertEquals(new ByteValue((byte) -1), byteValueTranslator.translate(new LongValue((1L << 8) - 1), byteValue));
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testByteValueTranslationUpperOutOfRange() throws Exception {
byteValueTranslator.translate(new LongValue(1L << 8), byteValue);
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testByteValueTranslationLowerOutOfRange() throws Exception {
byteValueTranslator.translate(new LongValue(-1), byteValue);
}
@@ -80,12 +84,12 @@ public class GeneratedGraphTest {
assertEquals(Byte.valueOf((byte) -1), byteTranslator.translate(new LongValue((1L << 8) - 1), null));
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testByteTranslationUpperOutOfRange() throws Exception {
byteTranslator.translate(new LongValue(1L << 8), null);
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testByteTranslationLowerOutOfRange() throws Exception {
byteTranslator.translate(new LongValue(-1), null);
}
@@ -99,12 +103,12 @@ public class GeneratedGraphTest {
assertEquals(new ShortValue((short) -1), shortValueTranslator.translate(new LongValue((1L << 16) - 1), shortValue));
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testShortValueTranslationUpperOutOfRange() throws Exception {
shortValueTranslator.translate(new LongValue(1L << 16), shortValue);
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testShortValueTranslationLowerOutOfRange() throws Exception {
shortValueTranslator.translate(new LongValue(-1), shortValue);
}
@@ -118,12 +122,12 @@ public class GeneratedGraphTest {
assertEquals(Short.valueOf((short) -1), shortTranslator.translate(new LongValue((1L << 16) - 1), null));
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testShortTranslationUpperOutOfRange() throws Exception {
shortTranslator.translate(new LongValue(1L << 16), null);
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testShortTranslationLowerOutOfRange() throws Exception {
shortTranslator.translate(new LongValue(-1), null);
}
@@ -136,12 +140,12 @@ public class GeneratedGraphTest {
assertEquals(new CharValue(Character.MAX_VALUE), charValueTranslator.translate(new LongValue((long) Character.MAX_VALUE), charValue));
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testCharValueTranslationUpperOutOfRange() throws Exception {
charValueTranslator.translate(new LongValue(1L << 16), charValue);
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testCharValueTranslationLowerOutOfRange() throws Exception {
charValueTranslator.translate(new LongValue(-1), charValue);
}
@@ -154,12 +158,12 @@ public class GeneratedGraphTest {
assertEquals(Character.valueOf(Character.MAX_VALUE), charTranslator.translate(new LongValue((long) Character.MAX_VALUE), null));
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testCharacterTranslationUpperOutOfRange() throws Exception {
charTranslator.translate(new LongValue(1L << 16), null);
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testCharacterTranslationLowerOutOfRange() throws Exception {
charTranslator.translate(new LongValue(-1), null);
}
@@ -173,12 +177,12 @@ public class GeneratedGraphTest {
assertEquals(Integer.valueOf(-1), intTranslator.translate(new LongValue((1L << 32) - 1), null));
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testIntegerTranslationUpperOutOfRange() throws Exception {
intTranslator.translate(new LongValue(1L << 32), null);
}
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void testIntegerTranslationLowerOutOfRange() throws Exception {
intTranslator.translate(new LongValue(-1), null);
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/BooleanParameterTest.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/BooleanParameterTest.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/BooleanParameterTest.java
index 43bba88..8c4bdcb 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/BooleanParameterTest.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/BooleanParameterTest.java
@@ -19,10 +19,14 @@
package org.apache.flink.graph.drivers.parameter;
import org.apache.flink.api.java.utils.ParameterTool;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+/**
+ * Tests for {@link BooleanParameter}.
+ */
public class BooleanParameterTest
extends ParameterTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/ChoiceParameterTest.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/ChoiceParameterTest.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/ChoiceParameterTest.java
index 1ed1af3..73800fb 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/ChoiceParameterTest.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/ChoiceParameterTest.java
@@ -20,12 +20,16 @@ package org.apache.flink.graph.drivers.parameter;
import org.apache.flink.api.java.utils.ParameterTool;
import org.apache.flink.client.program.ProgramParametrizationException;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+/**
+ * Tests for {@link ChoiceParameter}.
+ */
public class ChoiceParameterTest
extends ParameterTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/DoubleParameterTest.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/DoubleParameterTest.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/DoubleParameterTest.java
index 7a4d4fa..a4e8125 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/DoubleParameterTest.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/DoubleParameterTest.java
@@ -20,12 +20,16 @@ package org.apache.flink.graph.drivers.parameter;
import org.apache.flink.api.java.utils.ParameterTool;
import org.apache.flink.client.program.ProgramParametrizationException;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+/**
+ * Tests for {@link DoubleParameter}.
+ */
public class DoubleParameterTest
extends ParameterTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/IterationConvergenceTest.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/IterationConvergenceTest.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/IterationConvergenceTest.java
index ae92943..e6240b1 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/IterationConvergenceTest.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/IterationConvergenceTest.java
@@ -19,10 +19,14 @@
package org.apache.flink.graph.drivers.parameter;
import org.apache.flink.api.java.utils.ParameterTool;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+/**
+ * Tests for {@link IterationConvergence}.
+ */
public class IterationConvergenceTest
extends ParameterTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/LongParameterTest.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/LongParameterTest.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/LongParameterTest.java
index 2c26268..4b624a6 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/LongParameterTest.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/LongParameterTest.java
@@ -20,12 +20,16 @@ package org.apache.flink.graph.drivers.parameter;
import org.apache.flink.api.java.utils.ParameterTool;
import org.apache.flink.client.program.ProgramParametrizationException;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+/**
+ * Tests for {@link LongParameter}.
+ */
public class LongParameterTest
extends ParameterTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/ParameterTestBase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/ParameterTestBase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/ParameterTestBase.java
index a5dc0c6..3a1d0e1 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/ParameterTestBase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/ParameterTestBase.java
@@ -20,7 +20,10 @@ package org.apache.flink.graph.drivers.parameter;
import org.junit.Before;
-public class ParameterTestBase {
+/**
+ * Base class for {@link Parameter} tests.
+ */
+public abstract class ParameterTestBase {
protected ParameterizedBase owner;
@@ -29,7 +32,7 @@ public class ParameterTestBase {
owner = new MockParameterized();
}
- protected static class MockParameterized
+ private static class MockParameterized
extends ParameterizedBase {
@Override
public String getName() {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/SimplifyTest.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/SimplifyTest.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/SimplifyTest.java
index 12ae7dc..126a0ac 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/SimplifyTest.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/SimplifyTest.java
@@ -20,10 +20,14 @@ package org.apache.flink.graph.drivers.parameter;
import org.apache.flink.api.java.utils.ParameterTool;
import org.apache.flink.graph.drivers.parameter.Simplify.Ordering;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+/**
+ * Tests for {@link Simplify}.
+ */
public class SimplifyTest
extends ParameterTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/StringParameterTest.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/StringParameterTest.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/StringParameterTest.java
index 496d85c..a551859 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/StringParameterTest.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/drivers/parameter/StringParameterTest.java
@@ -19,12 +19,16 @@
package org.apache.flink.graph.drivers.parameter;
import org.apache.flink.api.java.utils.ParameterTool;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+/**
+ * Tests for {@link StringParameter}.
+ */
public class StringParameterTest
extends ParameterTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/CommunityDetectionITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/CommunityDetectionITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/CommunityDetectionITCase.java
index c37d1ed..8b8c44e 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/CommunityDetectionITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/CommunityDetectionITCase.java
@@ -24,12 +24,16 @@ import org.apache.flink.graph.Graph;
import org.apache.flink.graph.Vertex;
import org.apache.flink.graph.examples.data.CommunityDetectionData;
import org.apache.flink.test.util.MultipleProgramsTestBase;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.util.List;
+/**
+ * Tests for {@link CommunityDetection}.
+ */
@RunWith(Parameterized.class)
public class CommunityDetectionITCase extends MultipleProgramsTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/LabelPropagationITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/LabelPropagationITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/LabelPropagationITCase.java
index e6ba794..d61c71d 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/LabelPropagationITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/LabelPropagationITCase.java
@@ -24,12 +24,16 @@ import org.apache.flink.graph.Vertex;
import org.apache.flink.graph.examples.data.LabelPropagationData;
import org.apache.flink.test.util.MultipleProgramsTestBase;
import org.apache.flink.types.NullValue;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.util.List;
+/**
+ * Tests for {@link LabelPropagation}.
+ */
@RunWith(Parameterized.class)
public class LabelPropagationITCase extends MultipleProgramsTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/SummarizationITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/SummarizationITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/SummarizationITCase.java
index fe4cd24..baad6d0 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/SummarizationITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/SummarizationITCase.java
@@ -31,6 +31,7 @@ import org.apache.flink.graph.examples.data.SummarizationData;
import org.apache.flink.graph.library.Summarization.EdgeValue;
import org.apache.flink.test.util.MultipleProgramsTestBase;
import org.apache.flink.types.NullValue;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -45,6 +46,9 @@ import java.util.regex.Pattern;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+/**
+ * Tests for {@link Summarization}.
+ */
@RunWith(Parameterized.class)
public class SummarizationITCase extends MultipleProgramsTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/TriangleEnumeratorITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/TriangleEnumeratorITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/TriangleEnumeratorITCase.java
index 176a7e1..2e1cc7c 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/TriangleEnumeratorITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/TriangleEnumeratorITCase.java
@@ -24,6 +24,7 @@ import org.apache.flink.graph.Graph;
import org.apache.flink.graph.examples.data.TriangleCountData;
import org.apache.flink.test.util.MultipleProgramsTestBase;
import org.apache.flink.types.NullValue;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,6 +32,9 @@ import org.junit.runners.Parameterized;
import java.util.List;
+/**
+ * Tests for {@link TriangleEnumerator}.
+ */
@RunWith(Parameterized.class)
public class TriangleEnumeratorITCase extends MultipleProgramsTestBase {
@@ -50,8 +54,8 @@ public class TriangleEnumeratorITCase extends MultipleProgramsTestBase {
List<Tuple3<Long, Long, Long>> expectedResult = TriangleCountData.getListOfTriangles();
Assert.assertEquals(expectedResult.size(), actualOutput.size());
- for(Tuple3<Long, Long, Long> resultTriangle:actualOutput) {
- Assert.assertTrue(expectedResult.indexOf(resultTriangle)>=0);
+ for (Tuple3<Long, Long, Long> resultTriangle:actualOutput) {
+ Assert.assertTrue(expectedResult.indexOf(resultTriangle) >= 0);
}
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/GatherSumApplyITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/GatherSumApplyITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/GatherSumApplyITCase.java
index 19cf677..066f2c4 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/GatherSumApplyITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/GatherSumApplyITCase.java
@@ -34,12 +34,16 @@ import org.apache.flink.graph.utils.GraphUtils.IdentityMapper;
import org.apache.flink.test.util.MultipleProgramsTestBase;
import org.apache.flink.types.LongValue;
import org.apache.flink.types.NullValue;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.util.List;
+/**
+ * Tests for gather-sum-apply.
+ */
@RunWith(Parameterized.class)
public class GatherSumApplyITCase extends MultipleProgramsTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/EuclideanGraphWeighingITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/EuclideanGraphWeighingITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/EuclideanGraphWeighingITCase.java
index 922c4b2..deac519 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/EuclideanGraphWeighingITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/EuclideanGraphWeighingITCase.java
@@ -18,12 +18,13 @@
package org.apache.flink.graph.test.examples;
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
import org.apache.flink.graph.examples.EuclideanGraphWeighing;
import org.apache.flink.graph.examples.data.EuclideanGraphData;
import org.apache.flink.test.util.MultipleProgramsTestBase;
import org.apache.flink.test.util.TestBaseUtils;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -34,6 +35,9 @@ import org.junit.runners.Parameterized;
import java.io.File;
+/**
+ * Tests for {@link EuclideanGraphWeighing}.
+ */
@RunWith(Parameterized.class)
public class EuclideanGraphWeighingITCase extends MultipleProgramsTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/IncrementalSSSPITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/IncrementalSSSPITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/IncrementalSSSPITCase.java
index de92666..9147a6d 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/IncrementalSSSPITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/IncrementalSSSPITCase.java
@@ -18,8 +18,6 @@
package org.apache.flink.graph.test.examples;
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
import org.apache.flink.api.java.DataSet;
import org.apache.flink.api.java.ExecutionEnvironment;
import org.apache.flink.graph.Edge;
@@ -31,6 +29,9 @@ import org.apache.flink.graph.examples.data.IncrementalSSSPData;
import org.apache.flink.graph.spargel.ScatterGatherConfiguration;
import org.apache.flink.test.util.MultipleProgramsTestBase;
import org.apache.flink.test.util.TestBaseUtils;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -41,6 +42,9 @@ import org.junit.runners.Parameterized;
import java.io.File;
+/**
+ * Tests for {@link IncrementalSSSP}.
+ */
@RunWith(Parameterized.class)
public class IncrementalSSSPITCase extends MultipleProgramsTestBase {
@@ -104,7 +108,7 @@ public class IncrementalSSSPITCase extends MultipleProgramsTestBase {
// configure the iteration
ScatterGatherConfiguration parameters = new ScatterGatherConfiguration();
- if(IncrementalSSSP.isInSSSP(edgeToBeRemoved, edgesInSSSP)) {
+ if (IncrementalSSSP.isInSSSP(edgeToBeRemoved, edgesInSSSP)) {
parameters.setDirection(EdgeDirection.IN);
parameters.setOptDegrees(true);
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/MusicProfilesITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/MusicProfilesITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/MusicProfilesITCase.java
index d76a3ec..be412cf 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/MusicProfilesITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/MusicProfilesITCase.java
@@ -18,13 +18,13 @@
package org.apache.flink.graph.test.examples;
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-
import org.apache.flink.graph.examples.MusicProfiles;
import org.apache.flink.graph.examples.data.MusicProfilesData;
import org.apache.flink.test.util.MultipleProgramsTestBase;
import org.apache.flink.test.util.TestBaseUtils;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -38,6 +38,9 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
+/**
+ * Tests for {@link MusicProfiles}.
+ */
@RunWith(Parameterized.class)
public class MusicProfilesITCase extends MultipleProgramsTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/PageRankITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/PageRankITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/PageRankITCase.java
index 41f9a0f..62ed39f 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/PageRankITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/PageRankITCase.java
@@ -26,6 +26,7 @@ import org.apache.flink.graph.examples.GSAPageRank;
import org.apache.flink.graph.examples.PageRank;
import org.apache.flink.graph.examples.data.PageRankData;
import org.apache.flink.test.util.MultipleProgramsTestBase;
+
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -34,6 +35,9 @@ import org.junit.runners.Parameterized;
import java.util.Arrays;
import java.util.List;
+/**
+ * Tests for {@link PageRank}.
+ */
@RunWith(Parameterized.class)
public class PageRankITCase extends MultipleProgramsTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/SingleSourceShortestPathsITCase.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/SingleSourceShortestPathsITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/SingleSourceShortestPathsITCase.java
index 2fd8812..60bd161 100644
--- a/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/SingleSourceShortestPathsITCase.java
+++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/SingleSourceShortestPathsITCase.java
@@ -18,15 +18,15 @@
package org.apache.flink.graph.test.examples;
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-
import org.apache.flink.graph.examples.GSASingleSourceShortestPaths;
+import org.apache.flink.graph.examples.PregelSSSP;
import org.apache.flink.graph.examples.SingleSourceShortestPaths;
import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData;
-import org.apache.flink.graph.examples.PregelSSSP;
import org.apache.flink.test.util.MultipleProgramsTestBase;
import org.apache.flink.test.util.TestBaseUtils;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -37,6 +37,9 @@ import org.junit.runners.Parameterized;
import java.io.File;
+/**
+ * Tests for {@link SingleSourceShortestPaths}.
+ */
@RunWith(Parameterized.class)
public class SingleSourceShortestPathsITCase extends MultipleProgramsTestBase {
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/GellyScalaAPICompletenessTest.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/GellyScalaAPICompletenessTest.scala b/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/GellyScalaAPICompletenessTest.scala
index 034bf77..d224f0f 100644
--- a/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/GellyScalaAPICompletenessTest.scala
+++ b/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/GellyScalaAPICompletenessTest.scala
@@ -18,12 +18,14 @@
package org.apache.flink.graph.scala.test
import java.lang.reflect.Method
-import org.apache.flink.graph.scala._
+
import org.apache.flink.api.scala.completeness.ScalaAPICompletenessTestBase
+import org.apache.flink.graph.scala._
import org.apache.flink.graph.{Graph => JavaGraph}
-import scala.language.existentials
import org.junit.Test
+import scala.language.existentials
+
/**
* This checks whether the Gelly Scala API is up to feature parity with the Java API.
* Implements the [[ScalaAPICompletenessTestBase]] for Gelly.
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/GraphMutationsITCase.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/GraphMutationsITCase.scala b/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/GraphMutationsITCase.scala
index 83980a7..17b68db 100644
--- a/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/GraphMutationsITCase.scala
+++ b/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/GraphMutationsITCase.scala
@@ -23,9 +23,9 @@ import org.apache.flink.graph.scala._
import org.apache.flink.graph.scala.test.TestGraphUtils
import org.apache.flink.graph.{Edge, Vertex}
import org.apache.flink.test.util.{MultipleProgramsTestBase, TestBaseUtils}
+import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-import org.junit.Test
import _root_.scala.collection.JavaConverters._
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/GraphOperationsITCase.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/GraphOperationsITCase.scala b/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/GraphOperationsITCase.scala
index 9d77e68..76de25e 100644
--- a/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/GraphOperationsITCase.scala
+++ b/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/GraphOperationsITCase.scala
@@ -23,9 +23,10 @@ import org.apache.flink.graph.scala._
import org.apache.flink.graph.scala.test.TestGraphUtils
import org.apache.flink.graph.{Edge, Vertex}
import org.apache.flink.test.util.{MultipleProgramsTestBase, TestBaseUtils}
+import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.Parameterized
-import org.junit.Test
+
import _root_.scala.collection.JavaConverters._
@RunWith(classOf[Parameterized])
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/JoinWithEdgesITCase.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/JoinWithEdgesITCase.scala b/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/JoinWithEdgesITCase.scala
index 0a7f1b9..aa2c015 100644
--- a/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/JoinWithEdgesITCase.scala
+++ b/flink-libraries/flink-gelly-scala/src/test/scala/org/apache/flink/graph/scala/test/operations/JoinWithEdgesITCase.scala
@@ -20,10 +20,10 @@ package org.apache.flink.graph.scala.test.operations
import org.apache.flink.api.common.functions.MapFunction
import org.apache.flink.api.scala._
-import org.apache.flink.graph.{Edge, EdgeJoinFunction}
import org.apache.flink.graph.scala._
import org.apache.flink.graph.scala.test.TestGraphUtils
import org.apache.flink.graph.scala.utils.EdgeToTuple3Map
+import org.apache.flink.graph.{Edge, EdgeJoinFunction}
import org.apache.flink.test.util.{MultipleProgramsTestBase, TestBaseUtils}
import org.junit.Test
import org.junit.runner.RunWith
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/pom.xml b/flink-libraries/flink-gelly/pom.xml
index d620a66..c059267 100644
--- a/flink-libraries/flink-gelly/pom.xml
+++ b/flink-libraries/flink-gelly/pom.xml
@@ -83,4 +83,44 @@ under the License.
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.puppycrawl.tools</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>6.19</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <configLocation>/tools/maven/strict-checkstyle.xml</configLocation>
+ <suppressionsLocation>/tools/maven/suppressions.xml</suppressionsLocation>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
+ </configuration>
+ <executions>
+ <!--
+ Execute checkstyle after compilation but before tests.
+
+ This ensures that any parsing or type checking errors are from
+ javac, so they look as expected. Beyond that, we want to
+ fail as early as possible.
+ -->
+ <execution>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/AbstractGraphAnalytic.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/AbstractGraphAnalytic.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/AbstractGraphAnalytic.java
deleted file mode 100644
index 4d3d055..0000000
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/AbstractGraphAnalytic.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.graph;
-
-import org.apache.flink.api.java.ExecutionEnvironment;
-import org.apache.flink.util.Preconditions;
-
-/**
- * Base class for {@link GraphAnalytic}.
- *
- * @param <K> key type
- * @param <VV> vertex value type
- * @param <EV> edge value type
- * @param <T> the return type
- */
-public abstract class AbstractGraphAnalytic<K, VV, EV, T>
-implements GraphAnalytic<K, VV, EV, T> {
-
- protected ExecutionEnvironment env;
-
- @Override
- public GraphAnalytic<K, VV, EV, T> run(Graph<K, VV, EV> input)
- throws Exception {
- env = input.getContext();
- return this;
- }
-
- @Override
- public T execute()
- throws Exception {
- env.execute();
- return getResult();
- }
-
- @Override
- public T execute(String jobName)
- throws Exception {
- Preconditions.checkNotNull(jobName);
-
- env.execute(jobName);
- return getResult();
- }
-}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/AnalyticHelper.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/AnalyticHelper.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/AnalyticHelper.java
index dbe3e0c..9bd2336 100644
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/AnalyticHelper.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/AnalyticHelper.java
@@ -34,7 +34,7 @@ import java.io.Serializable;
* Flink accumulators. This computation is cheaply performed in a terminating
* {@link RichOutputFormat}.
*
- * This class simplifies the creation of analytic helpers by providing pass-through
+ * <p>This class simplifies the creation of analytic helpers by providing pass-through
* methods for adding and getting accumulators. Each accumulator name is prefixed
* with a random string since Flink accumulators share a per-job global namespace.
* This class also provides empty implementations of {@link RichOutputFormat#open}
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgeJoinFunction.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgeJoinFunction.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgeJoinFunction.java
index 698b3b6..e689169 100644
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgeJoinFunction.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgeJoinFunction.java
@@ -18,11 +18,11 @@
package org.apache.flink.graph;
-import java.io.Serializable;
-
import org.apache.flink.api.common.functions.Function;
import org.apache.flink.api.java.DataSet;
+import java.io.Serializable;
+
/**
* Interface to be implemented by the transformation function
* applied in {@link Graph#joinWithEdges(DataSet, EdgeJoinFunction)},
@@ -37,7 +37,7 @@ public interface EdgeJoinFunction<EV, T> extends Function, Serializable {
/**
* Applies a transformation on the current edge value
* and the value of the matched tuple of the input DataSet.
- *
+ *
* @param edgeValue the current edge value
* @param inputValue the value of the matched Tuple2 input
* @return the new edge value
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgeOrder.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgeOrder.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgeOrder.java
index 8226b04..9f04a58 100644
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgeOrder.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgeOrder.java
@@ -32,7 +32,7 @@ public enum EdgeOrder {
private final byte bitmask;
EdgeOrder(int bitmask) {
- this.bitmask = (byte)bitmask;
+ this.bitmask = (byte) bitmask;
}
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgesFunction.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgesFunction.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgesFunction.java
index 07e14e9..c59d76e 100644
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgesFunction.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgesFunction.java
@@ -18,12 +18,12 @@
package org.apache.flink.graph;
-import java.io.Serializable;
-
import org.apache.flink.api.common.functions.Function;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.util.Collector;
+import java.io.Serializable;
+
/**
* Interface to be implemented by the function applied to a vertex neighborhood
* in the {@link Graph#groupReduceOnEdges(EdgesFunction, EdgeDirection)} method.
@@ -37,16 +37,16 @@ public interface EdgesFunction<K, EV, O> extends Function, Serializable {
/**
* This method is called per vertex and can iterate over all of its neighboring edges
* with the specified direction.
- * <p>
- * If called with {@link EdgeDirection#OUT} the group will contain
+ *
+ * <p>If called with {@link EdgeDirection#OUT} the group will contain
* the out-edges of the grouping vertex.
* If called with {@link EdgeDirection#IN} the group will contain
* the in-edges of the grouping vertex.
* If called with {@link EdgeDirection#ALL} the group will contain
* all edges of the grouping vertex.
- * <p>
- * The method can emit any number of output elements, including none.
- *
+ *
+ * <p>The method can emit any number of output elements, including none.
+ *
* @param edges the neighboring edges of the grouping vertex.
* The first filed of each Tuple2 is the ID of the grouping vertex.
* The second field is the neighboring edge.
http://git-wip-us.apache.org/repos/asf/flink/blob/d313ac76/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgesFunctionWithVertexValue.java
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgesFunctionWithVertexValue.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgesFunctionWithVertexValue.java
index 645bd7c..e63fe99 100644
--- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgesFunctionWithVertexValue.java
+++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/EdgesFunctionWithVertexValue.java
@@ -18,11 +18,11 @@
package org.apache.flink.graph;
-import java.io.Serializable;
-
import org.apache.flink.api.common.functions.Function;
import org.apache.flink.util.Collector;
+import java.io.Serializable;
+
/**
* Interface to be implemented by the function applied to a vertex neighborhood
* in the {@link Graph#groupReduceOnEdges(EdgesFunctionWithVertexValue, EdgeDirection)}
@@ -38,16 +38,16 @@ public interface EdgesFunctionWithVertexValue<K, VV, EV, O> extends Function, Se
/**
* This method is called per vertex and can iterate over all of its neighboring edges
* with the specified direction.
- * <p>
- * If called with {@link EdgeDirection#OUT} the group will contain
+ *
+ * <p>If called with {@link EdgeDirection#OUT} the group will contain
* the out-edges of the grouping vertex.
* If called with {@link EdgeDirection#IN} the group will contain
* the in-edges of the grouping vertex.
* If called with {@link EdgeDirection#ALL} the group will contain
* all edges of the grouping vertex.
- * <p>
- * The method can emit any number of output elements, including none.
- *
+ *
+ * <p>The method can emit any number of output elements, including none.
+ *
* @param vertex the grouping vertex
* @param edges the neighboring edges of the grouping vertex.
* @param out the collector to emit results to