From f36ad6010da4619d381f4bdc7a3ea45f9551b577 Mon Sep 17 00:00:00 2001 From: Till Rohrmann Date: Fri, 26 Feb 2016 14:08:02 +0100 Subject: [PATCH 1/6] [FLINK-3511] [gelly] Introduce flink-gelly-examples module The new flink-gelly-examples module contains all Java and Scala Gelly examples. The module contains compile scope dependencies on flink-java, flink-scala and flink-clients so that the examples can be conveniently run from within the IDE. --- flink-libraries/flink-gelly-examples/pom.xml | 206 ++++++++++++++++++ .../graph/examples}/ConnectedComponents.java | 10 +- .../examples}/EuclideanGraphWeighing.java | 6 +- .../GSASingleSourceShortestPaths.java | 8 +- .../flink/graph/examples}/GraphMetrics.java | 6 +- .../graph/examples}/IncrementalSSSP.java | 6 +- .../examples}/JaccardSimilarityMeasure.java | 6 +- .../flink/graph/examples}/MusicProfiles.java | 4 +- .../examples}/SingleSourceShortestPaths.java | 8 +- .../data}/CommunityDetectionData.java | 2 +- .../data}/ConnectedComponentsDefaultData.java | 2 +- .../examples/data}/EuclideanGraphData.java | 4 +- .../examples/data}/IncrementalSSSPData.java | 2 +- .../data}/JaccardSimilarityMeasureData.java | 2 +- .../examples/data}/LabelPropagationData.java | 2 +- .../examples/data}/MusicProfilesData.java | 4 +- .../graph/examples/data}/PageRankData.java | 2 +- .../data}/SingleSourceShortestPathsData.java | 2 +- .../examples/data}/SummarizationData.java | 2 +- .../examples/data}/TriangleCountData.java | 2 +- .../graph/examples}/utils/ExampleUtils.java | 2 +- .../scala/examples}/ConnectedComponents.scala | 10 +- .../GSASingleSourceShortestPaths.scala | 6 +- .../graph/scala/examples}/GraphMetrics.scala | 3 +- .../examples}/SingleSourceShortestPaths.scala | 6 +- .../library/CommunityDetectionITCase.java | 5 +- .../library/LabelPropagationITCase.java | 5 +- .../flink/graph}/library/PageRankITCase.java | 6 +- .../graph}/library/SummarizationITCase.java | 5 +- .../graph}/library/TriangleCountITCase.java | 5 +- .../library/TriangleEnumeratorITCase.java | 5 +- .../graph/test/GatherSumApplyITCase.java | 6 +- .../examples}/ConnectedComponentsITCase.java | 9 +- .../EuclideanGraphWeighingITCase.java | 9 +- .../test/examples}/IncrementalSSSPITCase.java | 9 +- .../JaccardSimilarityMeasureITCase.java | 9 +- .../test/examples}/MusicProfilesITCase.java | 13 +- .../SingleSourceShortestPathsITCase.java | 13 +- .../graph/library/ConnectedComponents.java | 2 +- .../graph/library/GSAConnectedComponents.java | 2 +- .../library/SingleSourceShortestPaths.java | 2 +- .../graph/library/TriangleEnumerator.java | 4 +- ...edComponentsWithRandomisedEdgesITCase.java | 3 +- flink-libraries/pom.xml | 1 + 44 files changed, 316 insertions(+), 110 deletions(-) create mode 100644 flink-libraries/flink-gelly-examples/pom.xml rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples}/ConnectedComponents.java (94%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples}/EuclideanGraphWeighing.java (97%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples}/GSASingleSourceShortestPaths.java (97%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples}/GraphMetrics.java (98%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples}/IncrementalSSSP.java (98%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples}/JaccardSimilarityMeasure.java (97%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples}/MusicProfiles.java (99%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples}/SingleSourceShortestPaths.java (97%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example/utils => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data}/CommunityDetectionData.java (98%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example/utils => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data}/ConnectedComponentsDefaultData.java (97%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example/utils => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data}/EuclideanGraphData.java (97%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example/utils => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data}/IncrementalSSSPData.java (98%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example/utils => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data}/JaccardSimilarityMeasureData.java (98%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example/utils => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data}/LabelPropagationData.java (98%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example/utils => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data}/MusicProfilesData.java (99%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example/utils => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data}/PageRankData.java (98%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example/utils => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data}/SingleSourceShortestPathsData.java (97%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example/utils => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data}/SummarizationData.java (98%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example/utils => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data}/TriangleCountData.java (98%) rename flink-libraries/{flink-gelly/src/main/java/org/apache/flink/graph/example => flink-gelly-examples/src/main/java/org/apache/flink/graph/examples}/utils/ExampleUtils.java (99%) rename flink-libraries/{flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example => flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples}/ConnectedComponents.scala (94%) rename flink-libraries/{flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example => flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples}/GSASingleSourceShortestPaths.scala (96%) rename flink-libraries/{flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example => flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples}/GraphMetrics.scala (99%) rename flink-libraries/{flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example => flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples}/SingleSourceShortestPaths.scala (97%) rename flink-libraries/{flink-gelly/src/test/java/org/apache/flink/graph/test => flink-gelly-examples/src/test/java/org/apache/flink/graph}/library/CommunityDetectionITCase.java (94%) rename flink-libraries/{flink-gelly/src/test/java/org/apache/flink/graph/test => flink-gelly-examples/src/test/java/org/apache/flink/graph}/library/LabelPropagationITCase.java (94%) rename flink-libraries/{flink-gelly/src/test/java/org/apache/flink/graph/test => flink-gelly-examples/src/test/java/org/apache/flink/graph}/library/PageRankITCase.java (95%) rename flink-libraries/{flink-gelly/src/test/java/org/apache/flink/graph/test => flink-gelly-examples/src/test/java/org/apache/flink/graph}/library/SummarizationITCase.java (97%) rename flink-libraries/{flink-gelly/src/test/java/org/apache/flink/graph/test => flink-gelly-examples/src/test/java/org/apache/flink/graph}/library/TriangleCountITCase.java (91%) rename flink-libraries/{flink-gelly/src/test/java/org/apache/flink/graph/test => flink-gelly-examples/src/test/java/org/apache/flink/graph}/library/TriangleEnumeratorITCase.java (92%) rename flink-libraries/{flink-gelly => flink-gelly-examples}/src/test/java/org/apache/flink/graph/test/GatherSumApplyITCase.java (96%) rename flink-libraries/{flink-gelly/src/test/java/org/apache/flink/graph/test/example => flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples}/ConnectedComponentsITCase.java (87%) rename flink-libraries/{flink-gelly/src/test/java/org/apache/flink/graph/test/example => flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples}/EuclideanGraphWeighingITCase.java (88%) rename flink-libraries/{flink-gelly/src/test/java/org/apache/flink/graph/test/example => flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples}/IncrementalSSSPITCase.java (94%) rename flink-libraries/{flink-gelly/src/test/java/org/apache/flink/graph/test/example => flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples}/JaccardSimilarityMeasureITCase.java (87%) rename flink-libraries/{flink-gelly/src/test/java/org/apache/flink/graph/test/example => flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples}/MusicProfilesITCase.java (89%) rename flink-libraries/{flink-gelly/src/test/java/org/apache/flink/graph/test/example => flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples}/SingleSourceShortestPathsITCase.java (87%) rename flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/{test => }/library/ConnectedComponentsWithRandomisedEdgesITCase.java (96%) diff --git a/flink-libraries/flink-gelly-examples/pom.xml b/flink-libraries/flink-gelly-examples/pom.xml new file mode 100644 index 0000000000000..2b84cc18380fa --- /dev/null +++ b/flink-libraries/flink-gelly-examples/pom.xml @@ -0,0 +1,206 @@ + + + + + 4.0.0 + + + org.apache.flink + flink-libraries + 1.0-SNAPSHOT + .. + + + flink-gelly_examples_2.10 + flink-gelly-examples + jar + + + + org.apache.flink + flink-java + ${project.version} + + + org.apache.flink + flink-clients_2.10 + ${project.version} + + + org.apache.flink + flink-scala_2.10 + ${project.version} + + + org.apache.flink + flink-gelly_2.10 + ${project.version} + + + org.apache.flink + flink-gelly-scala_2.10 + ${project.version} + + + org.apache.flink + flink-test-utils_2.10 + ${project.version} + test + + + com.google.guava + guava + ${guava.version} + + + + + + + + net.alchim31.maven + scala-maven-plugin + 3.1.4 + + + + scala-compile-first + process-resources + + compile + + + + + + scala-test-compile + process-test-resources + + testCompile + + + + + + -Xms128m + -Xmx512m + + + + org.scalamacros + paradise_${scala.version} + ${scala.macros.version} + + + + + + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.8 + + true + + org.scala-ide.sdt.core.scalanature + org.eclipse.jdt.core.javanature + + + org.scala-ide.sdt.core.scalabuilder + + + org.scala-ide.sdt.launching.SCALA_CONTAINER + org.eclipse.jdt.launching.JRE_CONTAINER + + + org.scala-lang:scala-library + org.scala-lang:scala-compiler + + + **/*.scala + **/*.java + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + + add-source + generate-sources + + add-source + + + + src/main/scala + + + + + + add-test-source + generate-test-sources + + add-test-source + + + + src/test/scala + + + + + + + + org.scalastyle + scalastyle-maven-plugin + 0.5.0 + + + + check + + + + + false + true + true + false + ${basedir}/src/main/scala + ${basedir}/src/test/scala + ${project.basedir}/../../tools/maven/scalastyle-config.xml + ${project.basedir}/scalastyle-output.xml + UTF-8 + + + + + + diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/ConnectedComponents.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/ConnectedComponents.java similarity index 94% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/ConnectedComponents.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/ConnectedComponents.java index cd52e0424bc21..93c801ff91423 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/ConnectedComponents.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/ConnectedComponents.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.flink.graph.example; +package org.apache.flink.graph.examples; +import org.apache.flink.graph.examples.data.ConnectedComponentsDefaultData; import org.apache.flink.api.common.ProgramDescription; import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.api.java.DataSet; @@ -26,7 +27,6 @@ import org.apache.flink.graph.Edge; import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.example.utils.ConnectedComponentsDefaultData; import org.apache.flink.graph.library.GSAConnectedComponents; import org.apache.flink.types.NullValue; @@ -34,7 +34,7 @@ * This example shows how to use Gelly's library methods. * You can find all available library methods in {@link org.apache.flink.graph.library}. * - * In particular, this example uses the {@link org.apache.flink.graph.library.GSAConnectedComponents} + * In particular, this example uses the {@link GSAConnectedComponents} * library method to compute the connected components of the input graph. * * The input file is a plain text file and must be formatted as follows: @@ -46,7 +46,7 @@ * Usage ConnectedComponents <edge path> <result path> * <number of iterations>
* If no parameters are provided, the program is run with default data from - * {@link org.apache.flink.graph.example.utils.ConnectedComponentsDefaultData} + * {@link ConnectedComponentsDefaultData} */ public class ConnectedComponents implements ProgramDescription { @@ -138,4 +138,4 @@ public Edge map(Tuple2 value) throws Exception { return ConnectedComponentsDefaultData.getDefaultEdgeDataSet(env); } } -} \ No newline at end of file +} diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/EuclideanGraphWeighing.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/EuclideanGraphWeighing.java similarity index 97% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/EuclideanGraphWeighing.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/EuclideanGraphWeighing.java index 712be3e9ac7ad..bd6111dba5972 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/EuclideanGraphWeighing.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/EuclideanGraphWeighing.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.flink.graph.example; +package org.apache.flink.graph.examples; +import org.apache.flink.graph.examples.data.EuclideanGraphData; import org.apache.flink.api.common.ProgramDescription; import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.api.java.DataSet; @@ -29,7 +30,6 @@ import org.apache.flink.graph.Graph; import org.apache.flink.graph.Triplet; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.example.utils.EuclideanGraphData; import java.io.Serializable; @@ -54,7 +54,7 @@ * * Usage EuclideanGraphWeighing <vertex path> <edge path> <result path>
* If no parameters are provided, the program is run with default data from - * {@link org.apache.flink.graph.example.utils.EuclideanGraphData} + * {@link EuclideanGraphData} */ @SuppressWarnings("serial") public class EuclideanGraphWeighing implements ProgramDescription { diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/GSASingleSourceShortestPaths.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSASingleSourceShortestPaths.java similarity index 97% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/GSASingleSourceShortestPaths.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSASingleSourceShortestPaths.java index 635a099ee6c00..1732016efb37e 100755 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/GSASingleSourceShortestPaths.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GSASingleSourceShortestPaths.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.flink.graph.example; +package org.apache.flink.graph.examples; +import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData; import org.apache.flink.api.common.ProgramDescription; import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.api.java.DataSet; @@ -25,7 +26,6 @@ import org.apache.flink.graph.Edge; import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.example.utils.SingleSourceShortestPathsData; import org.apache.flink.graph.gsa.ApplyFunction; import org.apache.flink.graph.gsa.GatherFunction; import org.apache.flink.graph.gsa.SumFunction; @@ -45,7 +45,7 @@ * edge 1-2 with distance 0.1, and edge 1-3 with distance 1.4. * * If no parameters are provided, the program is run with default data from - * {@link org.apache.flink.graph.example.utils.SingleSourceShortestPathsData} + * {@link SingleSourceShortestPathsData} */ public class GSASingleSourceShortestPaths implements ProgramDescription { @@ -188,4 +188,4 @@ private static DataSet> getEdgeDataSet(ExecutionEnvironment e public String getDescription() { return "GSA Single Source Shortest Paths"; } -} \ No newline at end of file +} diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/GraphMetrics.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GraphMetrics.java similarity index 98% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/GraphMetrics.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GraphMetrics.java index 117f7d19e4739..905853854f6cb 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/GraphMetrics.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/GraphMetrics.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.flink.graph.example; +package org.apache.flink.graph.examples; +import org.apache.flink.graph.examples.utils.ExampleUtils; import org.apache.flink.api.common.ProgramDescription; import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.api.java.DataSet; @@ -26,7 +27,6 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.graph.Edge; import org.apache.flink.graph.Graph; -import org.apache.flink.graph.example.utils.ExampleUtils; import org.apache.flink.types.NullValue; /** @@ -167,4 +167,4 @@ public Edge map(Tuple2 value) { return ExampleUtils.getRandomEdges(env, NUM_VERTICES); } } -} \ No newline at end of file +} diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/IncrementalSSSP.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/IncrementalSSSP.java similarity index 98% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/IncrementalSSSP.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/IncrementalSSSP.java index 9e0076042e071..26e419f7369ae 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/IncrementalSSSP.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/IncrementalSSSP.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example; +package org.apache.flink.graph.examples; import org.apache.flink.api.common.ProgramDescription; import org.apache.flink.api.common.functions.FilterFunction; @@ -26,7 +26,7 @@ import org.apache.flink.graph.EdgeDirection; import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.example.utils.IncrementalSSSPData; +import org.apache.flink.graph.examples.data.IncrementalSSSPData; import org.apache.flink.graph.spargel.MessageIterator; import org.apache.flink.graph.spargel.MessagingFunction; import org.apache.flink.graph.spargel.ScatterGatherConfiguration; @@ -65,7 +65,7 @@ * <src id edge to be removed> <trg id edge to be removed> <val edge to be removed> * <result path> <number of iterations>
* If no parameters are provided, the program is run with default data from - * {@link org.apache.flink.graph.example.utils.IncrementalSSSPData} + * {@link IncrementalSSSPData} */ @SuppressWarnings("serial") public class IncrementalSSSP implements ProgramDescription { diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/JaccardSimilarityMeasure.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/JaccardSimilarityMeasure.java similarity index 97% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/JaccardSimilarityMeasure.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/JaccardSimilarityMeasure.java index 5fb75e2abd19f..fbd735baa060d 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/JaccardSimilarityMeasure.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/JaccardSimilarityMeasure.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example; +package org.apache.flink.graph.examples; import org.apache.flink.api.common.ProgramDescription; import org.apache.flink.api.common.functions.MapFunction; @@ -30,7 +30,7 @@ import org.apache.flink.graph.Vertex; import org.apache.flink.graph.Triplet; import org.apache.flink.graph.VertexJoinFunction; -import org.apache.flink.graph.example.utils.JaccardSimilarityMeasureData; +import org.apache.flink.graph.examples.data.JaccardSimilarityMeasureData; import java.util.HashSet; @@ -56,7 +56,7 @@ * * Usage JaccardSimilarityMeasure <edge path> <result path>
* If no parameters are provided, the program is run with default data from - * {@link org.apache.flink.graph.example.utils.JaccardSimilarityMeasureData} + * {@link JaccardSimilarityMeasureData} */ @SuppressWarnings("serial") public class JaccardSimilarityMeasure implements ProgramDescription { diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/MusicProfiles.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/MusicProfiles.java similarity index 99% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/MusicProfiles.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/MusicProfiles.java index b2857d0814206..b7b590dfc1c2e 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/MusicProfiles.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/MusicProfiles.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example; +package org.apache.flink.graph.examples; import java.util.ArrayList; import java.util.List; @@ -38,7 +38,7 @@ import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; import org.apache.flink.graph.VertexJoinFunction; -import org.apache.flink.graph.example.utils.MusicProfilesData; +import org.apache.flink.graph.examples.data.MusicProfilesData; import org.apache.flink.graph.library.LabelPropagation; import org.apache.flink.types.NullValue; import org.apache.flink.util.Collector; diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/SingleSourceShortestPaths.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/SingleSourceShortestPaths.java similarity index 97% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/SingleSourceShortestPaths.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/SingleSourceShortestPaths.java index ba84e8097615d..c9abf02fdd1b2 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/SingleSourceShortestPaths.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/SingleSourceShortestPaths.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.flink.graph.example; +package org.apache.flink.graph.examples; +import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData; import org.apache.flink.api.common.ProgramDescription; import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.api.java.DataSet; @@ -25,7 +26,6 @@ import org.apache.flink.graph.Edge; import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.example.utils.SingleSourceShortestPathsData; import org.apache.flink.graph.spargel.MessageIterator; import org.apache.flink.graph.spargel.MessagingFunction; import org.apache.flink.graph.spargel.VertexUpdateFunction; @@ -44,7 +44,7 @@ * edge 1-2 with distance 0.1, and edge 1-3 with distance 1.4. * * If no parameters are provided, the program is run with default data from - * {@link org.apache.flink.graph.example.utils.SingleSourceShortestPathsData} + * {@link SingleSourceShortestPathsData} */ public class SingleSourceShortestPaths implements ProgramDescription { @@ -198,4 +198,4 @@ private static DataSet> getEdgesDataSet(ExecutionEnvironment public String getDescription() { return "Scatter-gather Single Source Shortest Paths"; } -} \ No newline at end of file +} diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/CommunityDetectionData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/CommunityDetectionData.java similarity index 98% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/CommunityDetectionData.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/CommunityDetectionData.java index c37b2b503d508..d3ddfd8bf2b94 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/CommunityDetectionData.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/CommunityDetectionData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example.utils; +package org.apache.flink.graph.examples.data; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/ConnectedComponentsDefaultData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/ConnectedComponentsDefaultData.java similarity index 97% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/ConnectedComponentsDefaultData.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/ConnectedComponentsDefaultData.java index 67864ebc432c8..c53f5ba686dd2 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/ConnectedComponentsDefaultData.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/ConnectedComponentsDefaultData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example.utils; +package org.apache.flink.graph.examples.data; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/EuclideanGraphData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/EuclideanGraphData.java similarity index 97% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/EuclideanGraphData.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/EuclideanGraphData.java index 80765bfcda129..2b4277d08f613 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/EuclideanGraphData.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/EuclideanGraphData.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.flink.graph.example.utils; +package org.apache.flink.graph.examples.data; 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.graph.example.EuclideanGraphWeighing; +import org.apache.flink.graph.examples.EuclideanGraphWeighing; import java.util.ArrayList; import java.util.List; diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/IncrementalSSSPData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/IncrementalSSSPData.java similarity index 98% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/IncrementalSSSPData.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/IncrementalSSSPData.java index 7b69ec0b6f594..99e363a1a19f2 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/IncrementalSSSPData.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/IncrementalSSSPData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example.utils; +package org.apache.flink.graph.examples.data; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/JaccardSimilarityMeasureData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/JaccardSimilarityMeasureData.java similarity index 98% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/JaccardSimilarityMeasureData.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/JaccardSimilarityMeasureData.java index 7564b956d05c3..054f041a59039 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/JaccardSimilarityMeasureData.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/JaccardSimilarityMeasureData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example.utils; +package org.apache.flink.graph.examples.data; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/LabelPropagationData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/LabelPropagationData.java similarity index 98% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/LabelPropagationData.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/LabelPropagationData.java index 0a92097294579..8decb247da02d 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/LabelPropagationData.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/LabelPropagationData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example.utils; +package org.apache.flink.graph.examples.data; import java.util.ArrayList; import java.util.List; diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/MusicProfilesData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/MusicProfilesData.java similarity index 99% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/MusicProfilesData.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/MusicProfilesData.java index 3a97d1ff2b50d..e4c98fe69acd6 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/MusicProfilesData.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/MusicProfilesData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example.utils; +package org.apache.flink.graph.examples.data; import java.util.ArrayList; import java.util.List; @@ -105,4 +105,4 @@ public static DataSet getMismatches(ExecutionEnvironment env) { "user_3 3\n" + "user_4 3\n" + "user_5 4"; -} \ No newline at end of file +} diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/PageRankData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/PageRankData.java similarity index 98% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/PageRankData.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/PageRankData.java index 58d4f8bd0ab0f..a45de8880bfd2 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/PageRankData.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/PageRankData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example.utils; +package org.apache.flink.graph.examples.data; import java.util.ArrayList; import java.util.List; diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/SingleSourceShortestPathsData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SingleSourceShortestPathsData.java similarity index 97% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/SingleSourceShortestPathsData.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SingleSourceShortestPathsData.java index 6b985c5c78989..75b4484df3db8 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/SingleSourceShortestPathsData.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SingleSourceShortestPathsData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example.utils; +package org.apache.flink.graph.examples.data; import java.util.LinkedList; import java.util.List; diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/SummarizationData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SummarizationData.java similarity index 98% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/SummarizationData.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SummarizationData.java index 88f76cc3d2e0b..c14d5ded5dc53 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/SummarizationData.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/SummarizationData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example.utils; +package org.apache.flink.graph.examples.data; import com.google.common.collect.Lists; diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/TriangleCountData.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/TriangleCountData.java similarity index 98% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/TriangleCountData.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/TriangleCountData.java index c8cea1224f54f..71b874c061f59 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/TriangleCountData.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/data/TriangleCountData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example.utils; +package org.apache.flink.graph.examples.data; import org.apache.flink.api.java.DataSet; import org.apache.flink.api.java.ExecutionEnvironment; diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/ExampleUtils.java b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/utils/ExampleUtils.java similarity index 99% rename from flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/ExampleUtils.java rename to flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/utils/ExampleUtils.java index 7fbee46bc6bc0..b1bc8312e9ca1 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/example/utils/ExampleUtils.java +++ b/flink-libraries/flink-gelly-examples/src/main/java/org/apache/flink/graph/examples/utils/ExampleUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.example.utils; +package org.apache.flink.graph.examples.utils; import java.io.PrintStream; import java.util.ArrayList; diff --git a/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example/ConnectedComponents.scala b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/ConnectedComponents.scala similarity index 94% rename from flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example/ConnectedComponents.scala rename to flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/ConnectedComponents.scala index 75b793eaad061..704d4765e955d 100644 --- a/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example/ConnectedComponents.scala +++ b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/ConnectedComponents.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.graph.scala.example +package org.apache.flink.graph.scala.examples 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.types.NullValue -import org.apache.flink.graph.example.utils.ConnectedComponentsDefaultData import org.apache.flink.api.common.functions.MapFunction -import org.apache.flink.graph.library.GSAConnectedComponents import java.lang.Long /** @@ -32,7 +32,7 @@ import java.lang.Long * You can find all available library methods in [[org.apache.flink.graph.library]]. * * In particular, this example uses the - * [[org.apache.flink.graph.library.GSAConnectedComponents]] + * [[GSAConnectedComponents]] * library method to compute the connected components of the input graph. * * The input file is a plain text file and must be formatted as follows: @@ -45,7 +45,7 @@ import java.lang.Long * ConnectedComponents * }} * If no parameters are provided, the program is run with default data from - * [[org.apache.flink.graph.example.utils.ConnectedComponentsDefaultData]] + * [[ConnectedComponentsDefaultData]] */ object ConnectedComponents { def main(args: Array[String]) { diff --git a/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example/GSASingleSourceShortestPaths.scala b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/GSASingleSourceShortestPaths.scala similarity index 96% rename from flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example/GSASingleSourceShortestPaths.scala rename to flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/GSASingleSourceShortestPaths.scala index 68435bad95dd8..0a10ad7a123b1 100644 --- a/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example/GSASingleSourceShortestPaths.scala +++ b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/GSASingleSourceShortestPaths.scala @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.flink.graph.scala.example +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.example.utils.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. @@ -38,7 +38,7 @@ import org.apache.flink.graph.scala.utils.Tuple3ToEdgeMap * edge 1-2 with distance 0.1, and edge 1-3 with distance 1.4. * * If no parameters are provided, the program is run with default data from - * [[org.apache.flink.graph.example.utils.SingleSourceShortestPathsData]] + * [[SingleSourceShortestPathsData]] */ object GSASingleSourceShortestPaths { def main(args: Array[String]) { diff --git a/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example/GraphMetrics.scala b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/GraphMetrics.scala similarity index 99% rename from flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example/GraphMetrics.scala rename to flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/GraphMetrics.scala index 1c3fcdd6d9662..f9fa82d773c89 100644 --- a/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example/GraphMetrics.scala +++ b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/GraphMetrics.scala @@ -15,7 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.flink.graph.scala.example + +package org.apache.flink.graph.scala.examples import org.apache.flink.api.scala._ import org.apache.flink.graph.scala._ diff --git a/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example/SingleSourceShortestPaths.scala b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/SingleSourceShortestPaths.scala similarity index 97% rename from flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example/SingleSourceShortestPaths.scala rename to flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/SingleSourceShortestPaths.scala index 827f1a30b375f..4f84bb0421422 100644 --- a/flink-libraries/flink-gelly-scala/src/main/scala/org/apache/flink/graph/scala/example/SingleSourceShortestPaths.scala +++ b/flink-libraries/flink-gelly-examples/src/main/scala/org/apache/flink/graph/scala/examples/SingleSourceShortestPaths.scala @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.scala.example +package org.apache.flink.graph.scala.examples import org.apache.flink.api.scala._ import org.apache.flink.graph.scala._ @@ -26,9 +26,9 @@ import org.apache.flink.graph.spargel.VertexUpdateFunction import org.apache.flink.graph.spargel.MessageIterator import org.apache.flink.graph.Vertex import org.apache.flink.graph.spargel.MessagingFunction +import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData import scala.collection.JavaConversions._ import org.apache.flink.graph.scala.utils.Tuple3ToEdgeMap -import org.apache.flink.graph.example.utils.SingleSourceShortestPathsData /** * This example shows how to use Gelly's scatter-gather iterations. @@ -42,7 +42,7 @@ import org.apache.flink.graph.example.utils.SingleSourceShortestPathsData * edge 1-2 with distance 0.1, and edge 1-3 with distance 1.4. * * If no parameters are provided, the program is run with default data from - * [[org.apache.flink.graph.example.utils.SingleSourceShortestPathsData]] + * [[SingleSourceShortestPathsData]] */ object SingleSourceShortestPaths { def main(args: Array[String]) { diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/CommunityDetectionITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/CommunityDetectionITCase.java similarity index 94% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/CommunityDetectionITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/CommunityDetectionITCase.java index 421eaa935f057..cd8af9bf657d1 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/CommunityDetectionITCase.java +++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/CommunityDetectionITCase.java @@ -16,14 +16,13 @@ * limitations under the License. */ -package org.apache.flink.graph.test.library; +package org.apache.flink.graph.library; import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.example.utils.CommunityDetectionData; -import org.apache.flink.graph.library.CommunityDetection; +import org.apache.flink.graph.examples.data.CommunityDetectionData; import org.apache.flink.test.util.MultipleProgramsTestBase; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/LabelPropagationITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/LabelPropagationITCase.java similarity index 94% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/LabelPropagationITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/LabelPropagationITCase.java index 520269b3a7a78..8b9234b4f6e0c 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/LabelPropagationITCase.java +++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/LabelPropagationITCase.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.flink.graph.test.library; +package org.apache.flink.graph.library; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.example.utils.LabelPropagationData; -import org.apache.flink.graph.library.LabelPropagation; +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; diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/PageRankITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/PageRankITCase.java similarity index 95% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/PageRankITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/PageRankITCase.java index 431ab7028198f..034bcd56d8982 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/PageRankITCase.java +++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/PageRankITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.test.library; +package org.apache.flink.graph.library; import java.util.Arrays; import java.util.List; @@ -25,9 +25,7 @@ import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.example.utils.PageRankData; -import org.apache.flink.graph.library.GSAPageRank; -import org.apache.flink.graph.library.PageRank; +import org.apache.flink.graph.examples.data.PageRankData; import org.apache.flink.test.util.MultipleProgramsTestBase; import org.junit.Assert; import org.junit.Test; diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/SummarizationITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/SummarizationITCase.java similarity index 97% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/SummarizationITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/SummarizationITCase.java index abb4511eadbf4..17ddcfa85db8e 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/SummarizationITCase.java +++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/SummarizationITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.test.library; +package org.apache.flink.graph.library; import com.google.common.collect.Lists; import org.apache.flink.api.java.ExecutionEnvironment; @@ -24,8 +24,7 @@ import org.apache.flink.graph.Edge; import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.example.utils.SummarizationData; -import org.apache.flink.graph.library.Summarization; +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; diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/TriangleCountITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/TriangleCountITCase.java similarity index 91% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/TriangleCountITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/TriangleCountITCase.java index 15f59fe568ae3..aaada8f975bc0 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/TriangleCountITCase.java +++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/TriangleCountITCase.java @@ -16,12 +16,11 @@ * limitations under the License. */ -package org.apache.flink.graph.test.library; +package org.apache.flink.graph.library; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.graph.Graph; -import org.apache.flink.graph.example.utils.TriangleCountData; -import org.apache.flink.graph.library.GSATriangleCount; +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; diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/TriangleEnumeratorITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/TriangleEnumeratorITCase.java similarity index 92% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/TriangleEnumeratorITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/TriangleEnumeratorITCase.java index d06ba30e8ce10..56b3289cd48bc 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/TriangleEnumeratorITCase.java +++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/library/TriangleEnumeratorITCase.java @@ -16,13 +16,12 @@ * limitations under the License. */ -package org.apache.flink.graph.test.library; +package org.apache.flink.graph.library; import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.api.java.tuple.Tuple3; import org.apache.flink.graph.Graph; -import org.apache.flink.graph.example.utils.TriangleCountData; -import org.apache.flink.graph.library.TriangleEnumerator; +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; diff --git a/flink-libraries/flink-gelly/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 similarity index 96% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/GatherSumApplyITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/GatherSumApplyITCase.java index 039a05cf53043..7a3d550df7f97 100755 --- a/flink-libraries/flink-gelly/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 @@ -22,8 +22,8 @@ import org.apache.flink.api.java.ExecutionEnvironment; import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.example.utils.ConnectedComponentsDefaultData; -import org.apache.flink.graph.example.utils.SingleSourceShortestPathsData; +import org.apache.flink.graph.examples.data.ConnectedComponentsDefaultData; +import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData; import org.apache.flink.graph.library.GSAConnectedComponents; import org.apache.flink.graph.library.GSASingleSourceShortestPaths; import org.apache.flink.test.util.MultipleProgramsTestBase; @@ -103,4 +103,4 @@ public Double map(Long value) { return 0.0; } } -} \ No newline at end of file +} diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/ConnectedComponentsITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/ConnectedComponentsITCase.java similarity index 87% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/ConnectedComponentsITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/ConnectedComponentsITCase.java index b0bacc4846c7a..d0de8dc9ed98a 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/ConnectedComponentsITCase.java +++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/ConnectedComponentsITCase.java @@ -16,13 +16,14 @@ * limitations under the License. */ -package org.apache.flink.graph.test.example; +package org.apache.flink.graph.test.examples; import com.google.common.base.Charsets; import com.google.common.io.Files; -import org.apache.flink.graph.example.ConnectedComponents; -import org.apache.flink.graph.example.utils.ConnectedComponentsDefaultData; +import org.apache.flink.graph.examples.ConnectedComponents; +import org.apache.flink.graph.examples.data.ConnectedComponentsDefaultData; import org.apache.flink.test.util.MultipleProgramsTestBase; +import org.apache.flink.test.util.TestBaseUtils; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -66,6 +67,6 @@ public void testConnectedComponentsExample() throws Exception { @After public void after() throws Exception { - compareResultsByLinesInMemory(expected, resultPath); + TestBaseUtils.compareResultsByLinesInMemory(expected, resultPath); } } diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/EuclideanGraphWeighingITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/EuclideanGraphWeighingITCase.java similarity index 88% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/EuclideanGraphWeighingITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/EuclideanGraphWeighingITCase.java index 183c429af7640..922c4b2390662 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/EuclideanGraphWeighingITCase.java +++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/EuclideanGraphWeighingITCase.java @@ -16,13 +16,14 @@ * limitations under the License. */ -package org.apache.flink.graph.test.example; +package org.apache.flink.graph.test.examples; import com.google.common.base.Charsets; import com.google.common.io.Files; -import org.apache.flink.graph.example.EuclideanGraphWeighing; -import org.apache.flink.graph.example.utils.EuclideanGraphData; +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 org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -72,6 +73,6 @@ public void testGraphWeightingWeighing() throws Exception { @After public void after() throws Exception { - compareResultsByLinesInMemory(expected, resultPath); + TestBaseUtils.compareResultsByLinesInMemory(expected, resultPath); } } diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/IncrementalSSSPITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/IncrementalSSSPITCase.java similarity index 94% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/IncrementalSSSPITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/IncrementalSSSPITCase.java index b4cdfd508e8e0..d27dcd87ee891 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/IncrementalSSSPITCase.java +++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/IncrementalSSSPITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.test.example; +package org.apache.flink.graph.test.examples; import com.google.common.base.Charsets; import com.google.common.io.Files; @@ -26,10 +26,11 @@ import org.apache.flink.graph.EdgeDirection; import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.example.IncrementalSSSP; -import org.apache.flink.graph.example.utils.IncrementalSSSPData; +import org.apache.flink.graph.examples.IncrementalSSSP; +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 org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -128,6 +129,6 @@ public void testIncrementalSSSPNonSPEdge() throws Exception { @After public void after() throws Exception { - compareResultsByLinesInMemory(expected, resultPath); + TestBaseUtils.compareResultsByLinesInMemory(expected, resultPath); } } diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/JaccardSimilarityMeasureITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/JaccardSimilarityMeasureITCase.java similarity index 87% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/JaccardSimilarityMeasureITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/JaccardSimilarityMeasureITCase.java index 294a756112905..92cca86f1b441 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/JaccardSimilarityMeasureITCase.java +++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/JaccardSimilarityMeasureITCase.java @@ -16,13 +16,14 @@ * limitations under the License. */ -package org.apache.flink.graph.test.example; +package org.apache.flink.graph.test.examples; import com.google.common.base.Charsets; import com.google.common.io.Files; -import org.apache.flink.graph.example.JaccardSimilarityMeasure; -import org.apache.flink.graph.example.utils.JaccardSimilarityMeasureData; +import org.apache.flink.graph.examples.JaccardSimilarityMeasure; +import org.apache.flink.graph.examples.data.JaccardSimilarityMeasureData; import org.apache.flink.test.util.MultipleProgramsTestBase; +import org.apache.flink.test.util.TestBaseUtils; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -67,6 +68,6 @@ public void testJaccardSimilarityMeasureExample() throws Exception { @After public void after() throws Exception { - compareResultsByLinesInMemory(expected, resultPath); + TestBaseUtils.compareResultsByLinesInMemory(expected, resultPath); } } diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/MusicProfilesITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/MusicProfilesITCase.java similarity index 89% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/MusicProfilesITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/MusicProfilesITCase.java index 8152885f10342..d76a3ec02400d 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/MusicProfilesITCase.java +++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/MusicProfilesITCase.java @@ -16,14 +16,15 @@ * limitations under the License. */ -package org.apache.flink.graph.test.example; +package org.apache.flink.graph.test.examples; import com.google.common.base.Charsets; import com.google.common.io.Files; -import org.apache.flink.graph.example.MusicProfiles; -import org.apache.flink.graph.example.utils.MusicProfilesData; +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 org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -80,10 +81,10 @@ public void testMusicProfilesExample() throws Exception { @After public void after() throws Exception { - compareResultsByLinesInMemory(expectedTopSongs, topSongsResultPath); + TestBaseUtils.compareResultsByLinesInMemory(expectedTopSongs, topSongsResultPath); ArrayList list = new ArrayList<>(); - readAllResultLines(list, communitiesResultPath, new String[]{}, false); + TestBaseUtils.readAllResultLines(list, communitiesResultPath, new String[]{}, false); String[] result = list.toArray(new String[list.size()]); Arrays.sort(result); @@ -98,4 +99,4 @@ public void after() throws Exception { Assert.assertEquals("users 4 and 5 are not in the same community", result[3].substring(7), result[4].substring(7)); } -} \ No newline at end of file +} diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/SingleSourceShortestPathsITCase.java b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/SingleSourceShortestPathsITCase.java similarity index 87% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/SingleSourceShortestPathsITCase.java rename to flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/SingleSourceShortestPathsITCase.java index d8f8c8ff67d0c..faf92c0f4ccc1 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/example/SingleSourceShortestPathsITCase.java +++ b/flink-libraries/flink-gelly-examples/src/test/java/org/apache/flink/graph/test/examples/SingleSourceShortestPathsITCase.java @@ -16,15 +16,16 @@ * limitations under the License. */ -package org.apache.flink.graph.test.example; +package org.apache.flink.graph.test.examples; import com.google.common.base.Charsets; import com.google.common.io.Files; -import org.apache.flink.graph.example.GSASingleSourceShortestPaths; -import org.apache.flink.graph.example.SingleSourceShortestPaths; -import org.apache.flink.graph.example.utils.SingleSourceShortestPathsData; +import org.apache.flink.graph.examples.GSASingleSourceShortestPaths; +import org.apache.flink.graph.examples.SingleSourceShortestPaths; +import org.apache.flink.graph.examples.data.SingleSourceShortestPathsData; import org.apache.flink.test.util.MultipleProgramsTestBase; +import org.apache.flink.test.util.TestBaseUtils; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -76,6 +77,6 @@ public void testGSASSSPExample() throws Exception { @After public void after() throws Exception { - compareResultsByLinesInMemory(expected, resultPath); + TestBaseUtils.compareResultsByLinesInMemory(expected, resultPath); } -} \ No newline at end of file +} diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/ConnectedComponents.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/ConnectedComponents.java index 866f3347966af..12047e7dc835d 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/ConnectedComponents.java +++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/ConnectedComponents.java @@ -41,7 +41,7 @@ * * The result is a DataSet of vertices, where the vertex value corresponds to the assigned component ID. * - * @see org.apache.flink.graph.library.GSAConnectedComponents + * @see GSAConnectedComponents */ @SuppressWarnings("serial") public class ConnectedComponents implements GraphAlgorithm>> { diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/GSAConnectedComponents.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/GSAConnectedComponents.java index a44ba14aa1ea9..0354da4055f91 100755 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/GSAConnectedComponents.java +++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/GSAConnectedComponents.java @@ -34,7 +34,7 @@ * This implementation assumes that the vertices of the input Graph are initialized with unique, Long component IDs. * The result is a DataSet of vertices, where the vertex value corresponds to the assigned component ID. * - * @see org.apache.flink.graph.library.ConnectedComponents + * @see ConnectedComponents */ public class GSAConnectedComponents implements GraphAlgorithm>> { diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/SingleSourceShortestPaths.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/SingleSourceShortestPaths.java index 0c5080dedd546..29183e99ab433 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/SingleSourceShortestPaths.java +++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/SingleSourceShortestPaths.java @@ -116,4 +116,4 @@ public void sendMessages(Vertex vertex) { } } } -} \ No newline at end of file +} diff --git a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/TriangleEnumerator.java b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/TriangleEnumerator.java index c6bba4cf02814..3842e6cfc9bc6 100644 --- a/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/TriangleEnumerator.java +++ b/flink-libraries/flink-gelly/src/main/java/org/apache/flink/graph/library/TriangleEnumerator.java @@ -7,7 +7,7 @@ * "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 + * 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, @@ -353,4 +353,4 @@ public void setThirdVertex(final K vertex3) { this.setField(vertex3, V3); } } -} \ No newline at end of file +} diff --git a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/ConnectedComponentsWithRandomisedEdgesITCase.java b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/library/ConnectedComponentsWithRandomisedEdgesITCase.java similarity index 96% rename from flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/ConnectedComponentsWithRandomisedEdgesITCase.java rename to flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/library/ConnectedComponentsWithRandomisedEdgesITCase.java index c8d85f0a58263..2f619a67ccac7 100644 --- a/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/test/library/ConnectedComponentsWithRandomisedEdgesITCase.java +++ b/flink-libraries/flink-gelly/src/test/java/org/apache/flink/graph/library/ConnectedComponentsWithRandomisedEdgesITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.graph.test.library; +package org.apache.flink.graph.library; import org.apache.flink.api.common.functions.MapFunction; import org.apache.flink.api.common.functions.RichMapFunction; @@ -25,7 +25,6 @@ import org.apache.flink.graph.Edge; import org.apache.flink.graph.Graph; import org.apache.flink.graph.Vertex; -import org.apache.flink.graph.library.ConnectedComponents; import org.apache.flink.test.testdata.ConnectedComponentsData; import org.apache.flink.test.util.JavaProgramTestBase; import org.apache.flink.types.NullValue; diff --git a/flink-libraries/pom.xml b/flink-libraries/pom.xml index 34153c9467da0..64ad7e4a6b4a1 100644 --- a/flink-libraries/pom.xml +++ b/flink-libraries/pom.xml @@ -36,6 +36,7 @@ under the License. flink-gelly flink-gelly-scala + flink-gelly-examples flink-python flink-table flink-ml From 4612d68e72739f6fe0420ebc4cc6c2bbdd72a8c1 Mon Sep 17 00:00:00 2001 From: Till Rohrmann Date: Fri, 26 Feb 2016 15:57:45 +0100 Subject: [PATCH 2/6] [FLINK-3511] [avro] Move avro examples to test scope --- flink-batch-connectors/flink-avro/pom.xml | 1 - .../flink/api/io/avro/example/AvroTypeExample.java | 9 +++------ .../java/org/apache/flink/api/io/avro/example/User.java | 0 3 files changed, 3 insertions(+), 7 deletions(-) rename flink-batch-connectors/flink-avro/src/{main => test}/java/org/apache/flink/api/io/avro/example/AvroTypeExample.java (99%) rename flink-batch-connectors/flink-avro/src/{main => test}/java/org/apache/flink/api/io/avro/example/User.java (100%) diff --git a/flink-batch-connectors/flink-avro/pom.xml b/flink-batch-connectors/flink-avro/pom.xml index e5616698f2e40..6162d3e2c6767 100644 --- a/flink-batch-connectors/flink-avro/pom.xml +++ b/flink-batch-connectors/flink-avro/pom.xml @@ -71,7 +71,6 @@ under the License. ${project.version} test - diff --git a/flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/AvroTypeExample.java b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/example/AvroTypeExample.java similarity index 99% rename from flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/AvroTypeExample.java rename to flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/example/AvroTypeExample.java index 6affeec1d00d3..5a216918d9f78 100644 --- a/flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/AvroTypeExample.java +++ b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/example/AvroTypeExample.java @@ -34,22 +34,19 @@ public class AvroTypeExample { public static void main(String[] args) throws Exception { - + ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment(); - + DataSet users = env.createInput(new UserGeneratingInputFormat()); - + users .map(new NumberExtractingMapper()) .groupBy(1) .reduceGroup(new ConcatenatingReducer()) .print(); - - env.execute(); } - public static final class NumberExtractingMapper implements MapFunction> { @Override diff --git a/flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/User.java b/flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/example/User.java similarity index 100% rename from flink-batch-connectors/flink-avro/src/main/java/org/apache/flink/api/io/avro/example/User.java rename to flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/example/User.java From 17561bc863481adfd9c0f9df23c666a376354c70 Mon Sep 17 00:00:00 2001 From: Till Rohrmann Date: Fri, 26 Feb 2016 16:12:59 +0100 Subject: [PATCH 3/6] [FLINK-3511] [hadoop-compatibility] Move hadoop-compatibility examples to test scope --- .../test/hadoopcompatibility/mapred/HadoopMapredITCase.java | 2 +- .../mapred/example/HadoopMapredCompatWordCount.java | 2 +- .../hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java | 2 +- .../test}/hadoopcompatibility/mapreduce/example/WordCount.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename flink-batch-connectors/flink-hadoop-compatibility/src/{main/java/org/apache/flink => test/java/org/apache/flink/test}/hadoopcompatibility/mapred/example/HadoopMapredCompatWordCount.java (98%) rename flink-batch-connectors/flink-hadoop-compatibility/src/{main/java/org/apache/flink => test/java/org/apache/flink/test}/hadoopcompatibility/mapreduce/example/WordCount.java (98%) diff --git a/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapredITCase.java b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapredITCase.java index bbb75037ff251..ccc0d82017b8d 100644 --- a/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapredITCase.java +++ b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/HadoopMapredITCase.java @@ -18,7 +18,7 @@ package org.apache.flink.test.hadoopcompatibility.mapred; -import org.apache.flink.hadoopcompatibility.mapred.example.HadoopMapredCompatWordCount; +import org.apache.flink.test.hadoopcompatibility.mapred.example.HadoopMapredCompatWordCount; import org.apache.flink.test.testdata.WordCountData; import org.apache.flink.test.util.JavaProgramTestBase; diff --git a/flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/example/HadoopMapredCompatWordCount.java b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/example/HadoopMapredCompatWordCount.java similarity index 98% rename from flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/example/HadoopMapredCompatWordCount.java rename to flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/example/HadoopMapredCompatWordCount.java index 3547e471ab09b..ce0143a2b0e43 100644 --- a/flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapred/example/HadoopMapredCompatWordCount.java +++ b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapred/example/HadoopMapredCompatWordCount.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.hadoopcompatibility.mapred.example; +package org.apache.flink.test.hadoopcompatibility.mapred.example; import java.io.IOException; import java.util.Iterator; diff --git a/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java index 9b4aeea78eb66..698e356e9262c 100644 --- a/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java +++ b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/HadoopInputOutputITCase.java @@ -18,7 +18,7 @@ package org.apache.flink.test.hadoopcompatibility.mapreduce; -import org.apache.flink.hadoopcompatibility.mapreduce.example.WordCount; +import org.apache.flink.test.hadoopcompatibility.mapreduce.example.WordCount; import org.apache.flink.test.testdata.WordCountData; import org.apache.flink.test.util.JavaProgramTestBase; diff --git a/flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/example/WordCount.java b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/example/WordCount.java similarity index 98% rename from flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/example/WordCount.java rename to flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/example/WordCount.java index f5758ebbb8c6f..3de3f7285f91d 100644 --- a/flink-batch-connectors/flink-hadoop-compatibility/src/main/java/org/apache/flink/hadoopcompatibility/mapreduce/example/WordCount.java +++ b/flink-batch-connectors/flink-hadoop-compatibility/src/test/java/org/apache/flink/test/hadoopcompatibility/mapreduce/example/WordCount.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.hadoopcompatibility.mapreduce.example; +package org.apache.flink.test.hadoopcompatibility.mapreduce.example; import org.apache.flink.api.java.aggregation.Aggregations; import org.apache.flink.api.common.functions.RichFlatMapFunction; From a8745801364624ce13bc195751eaaac1bcccda6f Mon Sep 17 00:00:00 2001 From: Till Rohrmann Date: Fri, 26 Feb 2016 16:15:44 +0100 Subject: [PATCH 4/6] [FLINK-3511] [jdbc] Move jdbc examples to test scope and add flink-clients dependency --- flink-batch-connectors/flink-jdbc/pom.xml | 7 +++++++ .../apache/flink/api/java/io/jdbc/example/JDBCExample.java | 0 2 files changed, 7 insertions(+) rename flink-batch-connectors/flink-jdbc/src/{main => test}/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java (100%) diff --git a/flink-batch-connectors/flink-jdbc/pom.xml b/flink-batch-connectors/flink-jdbc/pom.xml index f7befce35c927..20e5bdb7eed80 100644 --- a/flink-batch-connectors/flink-jdbc/pom.xml +++ b/flink-batch-connectors/flink-jdbc/pom.xml @@ -43,6 +43,13 @@ under the License. provided + + org.apache.flink + flink-clients_2.10 + ${project.version} + test + + org.apache.derby derby diff --git a/flink-batch-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java b/flink-batch-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java similarity index 100% rename from flink-batch-connectors/flink-jdbc/src/main/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java rename to flink-batch-connectors/flink-jdbc/src/test/java/org/apache/flink/api/java/io/jdbc/example/JDBCExample.java From b849f740766664459be08abb6f2a35e9266edda5 Mon Sep 17 00:00:00 2001 From: Till Rohrmann Date: Fri, 26 Feb 2016 16:21:13 +0100 Subject: [PATCH 5/6] [FLINK-3511] [nifi, elasticsearch] Move nifi and elasticsearch examples to test scope --- .../connectors/elasticsearch/examples/ElasticsearchExample.java | 0 .../connectors/nifi/examples/NiFiSinkTopologyExample.java | 0 .../connectors/nifi/examples/NiFiSourceTopologyExample.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename flink-streaming-connectors/flink-connector-elasticsearch/src/{main => test}/java/org/apache/flink/streaming/connectors/elasticsearch/examples/ElasticsearchExample.java (100%) rename flink-streaming-connectors/flink-connector-nifi/src/{main => test}/java/org/apache/flink/streaming/connectors/nifi/examples/NiFiSinkTopologyExample.java (100%) rename flink-streaming-connectors/flink-connector-nifi/src/{main => test}/java/org/apache/flink/streaming/connectors/nifi/examples/NiFiSourceTopologyExample.java (100%) diff --git a/flink-streaming-connectors/flink-connector-elasticsearch/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/examples/ElasticsearchExample.java b/flink-streaming-connectors/flink-connector-elasticsearch/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/examples/ElasticsearchExample.java similarity index 100% rename from flink-streaming-connectors/flink-connector-elasticsearch/src/main/java/org/apache/flink/streaming/connectors/elasticsearch/examples/ElasticsearchExample.java rename to flink-streaming-connectors/flink-connector-elasticsearch/src/test/java/org/apache/flink/streaming/connectors/elasticsearch/examples/ElasticsearchExample.java diff --git a/flink-streaming-connectors/flink-connector-nifi/src/main/java/org/apache/flink/streaming/connectors/nifi/examples/NiFiSinkTopologyExample.java b/flink-streaming-connectors/flink-connector-nifi/src/test/java/org/apache/flink/streaming/connectors/nifi/examples/NiFiSinkTopologyExample.java similarity index 100% rename from flink-streaming-connectors/flink-connector-nifi/src/main/java/org/apache/flink/streaming/connectors/nifi/examples/NiFiSinkTopologyExample.java rename to flink-streaming-connectors/flink-connector-nifi/src/test/java/org/apache/flink/streaming/connectors/nifi/examples/NiFiSinkTopologyExample.java diff --git a/flink-streaming-connectors/flink-connector-nifi/src/main/java/org/apache/flink/streaming/connectors/nifi/examples/NiFiSourceTopologyExample.java b/flink-streaming-connectors/flink-connector-nifi/src/test/java/org/apache/flink/streaming/connectors/nifi/examples/NiFiSourceTopologyExample.java similarity index 100% rename from flink-streaming-connectors/flink-connector-nifi/src/main/java/org/apache/flink/streaming/connectors/nifi/examples/NiFiSourceTopologyExample.java rename to flink-streaming-connectors/flink-connector-nifi/src/test/java/org/apache/flink/streaming/connectors/nifi/examples/NiFiSourceTopologyExample.java From 2c053f58e76bc62658f404139a9192a832084f1a Mon Sep 17 00:00:00 2001 From: Till Rohrmann Date: Fri, 26 Feb 2016 16:27:06 +0100 Subject: [PATCH 6/6] [FLINK-3511] [twitter] Move twitter examples to test scope --- flink-batch-connectors/flink-avro/pom.xml | 15 +++++++-------- .../examples}/TwitterFilterSourceExample.java | 18 ++++++++++-------- .../src/test/resources/twitter.properties | 19 +++++++++++++++++++ 3 files changed, 36 insertions(+), 16 deletions(-) rename flink-streaming-connectors/flink-connector-twitter/src/{main/java/org/apache/flink/streaming/connectors/twitter => test/java/org/apache/flink/streaming/connectors/twitter/examples}/TwitterFilterSourceExample.java (74%) create mode 100644 flink-streaming-connectors/flink-connector-twitter/src/test/resources/twitter.properties diff --git a/flink-batch-connectors/flink-avro/pom.xml b/flink-batch-connectors/flink-avro/pom.xml index 6162d3e2c6767..c4f7ac6485741 100644 --- a/flink-batch-connectors/flink-avro/pom.xml +++ b/flink-batch-connectors/flink-avro/pom.xml @@ -43,14 +43,6 @@ under the License. provided - - - org.apache.flink - flink-clients_2.10 - ${project.version} - provided - - org.apache.avro avro @@ -64,6 +56,13 @@ under the License. test-jar test + + + org.apache.flink + flink-clients_2.10 + ${project.version} + test + org.apache.flink diff --git a/flink-streaming-connectors/flink-connector-twitter/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterFilterSourceExample.java b/flink-streaming-connectors/flink-connector-twitter/src/test/java/org/apache/flink/streaming/connectors/twitter/examples/TwitterFilterSourceExample.java similarity index 74% rename from flink-streaming-connectors/flink-connector-twitter/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterFilterSourceExample.java rename to flink-streaming-connectors/flink-connector-twitter/src/test/java/org/apache/flink/streaming/connectors/twitter/examples/TwitterFilterSourceExample.java index 43cb179ebc249..a30e40d19049d 100644 --- a/flink-streaming-connectors/flink-connector-twitter/src/main/java/org/apache/flink/streaming/connectors/twitter/TwitterFilterSourceExample.java +++ b/flink-streaming-connectors/flink-connector-twitter/src/test/java/org/apache/flink/streaming/connectors/twitter/examples/TwitterFilterSourceExample.java @@ -1,12 +1,13 @@ /* - * 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 + * 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 + * 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, @@ -15,11 +16,12 @@ * limitations under the License. */ -package org.apache.flink.streaming.connectors.twitter; +package org.apache.flink.streaming.connectors.twitter.examples; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.streaming.connectors.json.JSONParseFlatMap; +import org.apache.flink.streaming.connectors.twitter.TwitterFilterSource; import org.apache.flink.util.Collector; /** diff --git a/flink-streaming-connectors/flink-connector-twitter/src/test/resources/twitter.properties b/flink-streaming-connectors/flink-connector-twitter/src/test/resources/twitter.properties new file mode 100644 index 0000000000000..1ca4143bd39a4 --- /dev/null +++ b/flink-streaming-connectors/flink-connector-twitter/src/test/resources/twitter.properties @@ -0,0 +1,19 @@ +# 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. + +secret=*** +consumerSecret=*** +token=***-*** +consumerKey=***