[FLINK-3560] [examples] Remove unchecked output of usage statement in…

… examples This closes apache#1752.
deepfield · Apr 25, 2016 · 44c2d2f · 44c2d2f
1 parent f2f5bd5
commit 44c2d2f
Show file tree

Hide file tree

Showing 33 changed files with 15 additions and 70 deletions.
diff --git a/.../flink-examples-batch/src/main/java/org/apache/flink/examples/java/clustering/KMeans.java b/.../flink-examples-batch/src/main/java/org/apache/flink/examples/java/clustering/KMeans.java
@@ -82,7 +82,6 @@ public static void main(String[] args) throws Exception {
 
  // Checking input parameters
  final ParameterTool params = ParameterTool.fromArgs(args);
- System.out.println("Usage: KMeans --points <path> --centroids <path> --output <path> --iterations <n>");
 
  // set up execution environment
  ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();

diff --git a/...ples/flink-examples-batch/src/main/java/org/apache/flink/examples/java/distcp/DistCp.java b/...ples/flink-examples-batch/src/main/java/org/apache/flink/examples/java/distcp/DistCp.java
@@ -102,7 +102,8 @@ public static void main(String[] args) throws Exception {
 
 
  FlatMapOperator<FileCopyTask, Object> res = inputTasks.flatMap(new RichFlatMapFunction<FileCopyTask, Object>() {
-
+
+ private static final long serialVersionUID = 1109254230243989929L;
  private LongCounter fileCounter;
  private LongCounter bytesCounter;
 
@@ -185,5 +186,4 @@ private static void getCopyTasks(Path p, String rel, List<FileCopyTask> tasks) t
  }
  }
  }
-
 }
diff --git a/...xamples-batch/src/main/java/org/apache/flink/examples/java/graph/ConnectedComponents.java b/...xamples-batch/src/main/java/org/apache/flink/examples/java/graph/ConnectedComponents.java
@@ -19,7 +19,6 @@
 
 package org.apache.flink.examples.java.graph;
 
-import org.apache.flink.api.common.ProgramDescription;
 import org.apache.flink.api.common.functions.FlatJoinFunction;
 import org.apache.flink.api.common.functions.FlatMapFunction;
 import org.apache.flink.api.common.functions.JoinFunction;
@@ -74,7 +73,7 @@
  * </ul>
  */
 @SuppressWarnings("serial")
-public class ConnectedComponents implements ProgramDescription {
+public class ConnectedComponents {
 
  // *************************************************************************
  // PROGRAM
@@ -84,7 +83,6 @@ public static void main(String... args) throws Exception {
 
  // Checking input parameters
  final ParameterTool params = ParameterTool.fromArgs(args);
- System.out.println("Usage: ConnectedComponents --vertices <path> --edges <path> --output <path> --iterations <n>");
 
  // set up execution environment
  ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
@@ -185,13 +183,6 @@ public void join(Tuple2<Long, Long> candidate, Tuple2<Long, Long> old, Collector
  }
  }
 
-
-
- @Override
- public String getDescription() {
- return "Parameters: --vertices <path> --edges <path> --output <path> --iterations <n>";
- }
-
  // *************************************************************************
  // UTIL METHODS
  // *************************************************************************

diff --git a/...link-examples-batch/src/main/java/org/apache/flink/examples/java/graph/EnumTriangles.java b/...link-examples-batch/src/main/java/org/apache/flink/examples/java/graph/EnumTriangles.java
@@ -82,7 +82,6 @@ public static void main(String[] args) throws Exception {
 
  // Checking input parameters
  final ParameterTool params = ParameterTool.fromArgs(args);
- System.out.println("Usage: EnumTriangleBasic --edges <path> --output <path>");
 
  // set up execution environment
  final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
@@ -124,7 +123,7 @@ public static void main(String[] args) throws Exception {
  triangles.print();
  }
  }
- 
+
  // *************************************************************************
  // USER FUNCTIONS
  // *************************************************************************

diff --git a/...les/flink-examples-batch/src/main/java/org/apache/flink/examples/java/graph/PageRank.java b/...les/flink-examples-batch/src/main/java/org/apache/flink/examples/java/graph/PageRank.java
@@ -83,7 +83,6 @@ public class PageRank {
  public static void main(String[] args) throws Exception {
 
  ParameterTool params = ParameterTool.fromArgs(args);
- System.out.println("Usage: PageRankBasic --pages <path> --links <path> --output <path> --numPages <n> --iterations <n>");
 
  final int numPages = params.getInt("numPages", PageRankData.getNumberOfPages());
  final int maxIterations = params.getInt("iterations", 10);
@@ -135,7 +134,7 @@ public static void main(String[] args) throws Exception {
 
 
  }
- 
+
  // *************************************************************************
  // USER FUNCTIONS
  // *************************************************************************
@@ -147,7 +146,7 @@ public static final class RankAssigner implements MapFunction<Long, Tuple2<Long,
  Tuple2<Long, Double> outPageWithRank;
 
  public RankAssigner(double rank) {
- this.outPageWithRank = new Tuple2<Long, Double>(-1l, rank);
+ this.outPageWithRank = new Tuple2<Long, Double>(-1L, rank);
  }
 
  @Override
@@ -189,9 +188,9 @@ public void flatMap(Tuple2<Tuple2<Long, Double>, Tuple2<Long, Long[]>> value, Co
  Long[] neighbors = value.f1.f1;
  double rank = value.f0.f1;
  double rankToDistribute = rank / ((double) neighbors.length);
- 
- for (int i = 0; i < neighbors.length; i++) {
- out.collect(new Tuple2<Long, Double>(neighbors[i], rankToDistribute));
+
+ for (Long neighbor: neighbors) {
+ out.collect(new Tuple2<Long, Double>(neighbor, rankToDistribute));
  }
  }
  }

diff --git a/...ples-batch/src/main/java/org/apache/flink/examples/java/graph/TransitiveClosureNaive.java b/...ples-batch/src/main/java/org/apache/flink/examples/java/graph/TransitiveClosureNaive.java
@@ -18,7 +18,6 @@
 
 package org.apache.flink.examples.java.graph;
 
-import org.apache.flink.api.common.ProgramDescription;
 import org.apache.flink.api.common.functions.CoGroupFunction;
 import org.apache.flink.api.common.functions.GroupReduceFunction;
 import org.apache.flink.api.common.functions.JoinFunction;
@@ -34,13 +33,12 @@
 import java.util.Set;
 
 @SuppressWarnings("serial")
-public class TransitiveClosureNaive implements ProgramDescription {
+public class TransitiveClosureNaive {
 
  public static void main (String... args) throws Exception {
 
  // Checking input parameters
  final ParameterTool params = ParameterTool.fromArgs(args);
- System.out.println("Usage: TransitiveClosure --edges <path> --output <path> --iterations <n>");
 
  // set up execution environment
  ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
@@ -117,10 +115,4 @@ public void coGroup(Iterable<Tuple2<Long, Long>> prevPaths, Iterable<Tuple2<Long
  transitiveClosure.print();
  }
  }
-
- @Override
- public String getDescription() {
- return "Parameters: --edges <path> --output <path> --iterations <n>";
- }
-
 }
diff --git a/...link-examples-batch/src/main/java/org/apache/flink/examples/java/ml/LinearRegression.java b/...link-examples-batch/src/main/java/org/apache/flink/examples/java/ml/LinearRegression.java
@@ -73,7 +73,6 @@ public class LinearRegression {
  public static void main(String[] args) throws Exception {
 
  final ParameterTool params = ParameterTool.fromArgs(args);
- System.out.println("Usage: LinearRegression --input <path> --output <path> --iterations <n>");
 
  // set up execution environment
  final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();

diff --git a/.../src/main/java/org/apache/flink/examples/java/relational/EmptyFieldsCountAccumulator.java b/.../src/main/java/org/apache/flink/examples/java/relational/EmptyFieldsCountAccumulator.java
@@ -65,7 +65,6 @@ public static void main(final String[] args) throws Exception {
  final ParameterTool params = ParameterTool.fromArgs(args);
 
  final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
- System.out.println("Usage: EmptyFieldsCountAccumulator --input <path> --output <path>");
 
  // make parameters available in the web interface
  env.getConfig().setGlobalJobParameters(params);

diff --git a/...k-examples-batch/src/main/java/org/apache/flink/examples/java/relational/TPCHQuery10.java b/...k-examples-batch/src/main/java/org/apache/flink/examples/java/relational/TPCHQuery10.java
@@ -216,5 +216,4 @@ private static DataSet<Tuple2<Integer, String>> getNationsDataSet(ExecutionEnvir
  .includeFields("1100")
  .types(Integer.class, String.class);
  }
-
 }
diff --git a/...nk-examples-batch/src/main/java/org/apache/flink/examples/java/relational/TPCHQuery3.java b/...nk-examples-batch/src/main/java/org/apache/flink/examples/java/relational/TPCHQuery3.java
@@ -181,7 +181,7 @@ public ShippingPriorityItem join(ShippingPriorityItem i, Lineitem l) {
  }
 
  }
- 
+
  // *************************************************************************
  // DATA TYPES
  // *************************************************************************

diff --git a/...xamples-batch/src/main/java/org/apache/flink/examples/java/relational/WebLogAnalysis.java b/...xamples-batch/src/main/java/org/apache/flink/examples/java/relational/WebLogAnalysis.java
@@ -102,7 +102,6 @@ public static void main(String[] args) throws Exception {
  final ParameterTool params = ParameterTool.fromArgs(args);
 
  final ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
- System.out.println("Usage: WebLogAnalysis --documents <path> --ranks <path> --visits <path> --output <path>");
 
  env.getConfig().setGlobalJobParameters(params);
 
@@ -147,7 +146,7 @@ public static void main(String[] args) throws Exception {
  result.print();
  }
  }
- 
+
  // *************************************************************************
  // USER FUNCTIONS
  // *************************************************************************

diff --git a/...link-examples-batch/src/main/java/org/apache/flink/examples/java/wordcount/WordCount.java b/...link-examples-batch/src/main/java/org/apache/flink/examples/java/wordcount/WordCount.java
@@ -62,7 +62,6 @@ public static void main(String[] args) throws Exception {
 
  // make parameters available in the web interface
  env.getConfig().setGlobalJobParameters(params);
- System.out.println("Usage: WordCount --input <path> --output <path>");
 
  // get input data
  DataSet<String> text;
@@ -94,7 +93,7 @@ public static void main(String[] args) throws Exception {
  }
 
  }
- 
+
  // *************************************************************************
  // USER FUNCTIONS
  // *************************************************************************

diff --git a/...ink-examples-batch/src/main/scala/org/apache/flink/examples/scala/clustering/KMeans.scala b/...ink-examples-batch/src/main/scala/org/apache/flink/examples/scala/clustering/KMeans.scala
@@ -76,7 +76,6 @@ object KMeans {
 
  // checking input parameters
  val params: ParameterTool = ParameterTool.fromArgs(args)
- println("Usage: KMeans --points <path> --centroids <path> --output <path> --iterations <n>")
 
  // set up execution environment
  val env: ExecutionEnvironment = ExecutionEnvironment.getExecutionEnvironment
@@ -225,7 +224,6 @@ object KMeans {
  }
 
  }
-
 }
 
 
diff --git a/...ples-batch/src/main/scala/org/apache/flink/examples/scala/graph/ConnectedComponents.scala b/...ples-batch/src/main/scala/org/apache/flink/examples/scala/graph/ConnectedComponents.scala
@@ -66,8 +66,6 @@ object ConnectedComponents {
  def main(args: Array[String]) {
 
  val params: ParameterTool = ParameterTool.fromArgs(args)
- println("Usage: ConnectedComponents " +
- "--vertices <path> --edges <path> --output <path> --iterations <n>")
 
  // set up execution environment
  val env = ExecutionEnvironment.getExecutionEnvironment
@@ -151,5 +149,4 @@ object ConnectedComponents {
  env.fromCollection(edgeData)
  }
  }
-
 }
diff --git a/...k-examples-batch/src/main/scala/org/apache/flink/examples/scala/graph/EnumTriangles.scala b/...k-examples-batch/src/main/scala/org/apache/flink/examples/scala/graph/EnumTriangles.scala
@@ -71,7 +71,6 @@ object EnumTriangles {
  def main(args: Array[String]) {
 
  val params: ParameterTool = ParameterTool.fromArgs(args)
- println("Usage: EnumTriangleBasic --edges <path> --output <path>")
 
  // set up execution environment
  val env = ExecutionEnvironment.getExecutionEnvironment
@@ -156,5 +155,4 @@ object EnumTriangles {
  }
  }
  }
-
 }
diff --git a/...k-examples-batch/src/main/scala/org/apache/flink/examples/scala/graph/PageRankBasic.scala b/...k-examples-batch/src/main/scala/org/apache/flink/examples/scala/graph/PageRankBasic.scala
@@ -75,8 +75,6 @@ object PageRankBasic {
  def main(args: Array[String]) {
 
  val params: ParameterTool = ParameterTool.fromArgs(args)
- println("Usage: PageRankBasic " +
- "--pages <path> --links <path> --output <path> --numPages <n> --iterations <n>")
 
  // set up execution environment
  val env = ExecutionEnvironment.getExecutionEnvironment
@@ -183,5 +181,4 @@ object PageRankBasic {
  env.fromCollection(edges)
  }
  }
-
 }
diff --git a/...s-batch/src/main/scala/org/apache/flink/examples/scala/graph/TransitiveClosureNaive.scala b/...s-batch/src/main/scala/org/apache/flink/examples/scala/graph/TransitiveClosureNaive.scala
@@ -23,12 +23,11 @@ import org.apache.flink.api.scala._
 import org.apache.flink.examples.java.graph.util.ConnectedComponentsData
 import org.apache.flink.util.Collector
 
-object  TransitiveClosureNaive {
+object TransitiveClosureNaive {
 
  def main (args: Array[String]): Unit = {
 
  val params: ParameterTool = ParameterTool.fromArgs(args)
- println("Usage: TransitiveClosure --edges <path> --output <path> --iterations <n>")
 
  // set up execution environment
  val env = ExecutionEnvironment.getExecutionEnvironment
@@ -86,5 +85,4 @@ object TransitiveClosureNaive {
  }
 
  }
-
 }
diff --git a/...k-examples-batch/src/main/scala/org/apache/flink/examples/scala/ml/LinearRegression.scala b/...k-examples-batch/src/main/scala/org/apache/flink/examples/scala/ml/LinearRegression.scala
@@ -64,7 +64,6 @@ object LinearRegression {
  def main(args: Array[String]) {
 
  val params: ParameterTool = ParameterTool.fromArgs(args)
- println("Usage: LinearRegression --input <path> --output <path> --iterations <n>")
 
  // set up execution environment
  val env = ExecutionEnvironment.getExecutionEnvironment
@@ -157,5 +156,4 @@ object LinearRegression {
  (Params(theta0, theta1), 1)
  }
  }
-
 }
diff --git a/...xamples-batch/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery10.scala b/...xamples-batch/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery10.scala
@@ -175,5 +175,4 @@ object TPCHQuery10 {
  fieldDelimiter = "|",
  includedFields = Array(0, 1) )
  }
-
 }
diff --git a/...examples-batch/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery3.scala b/...examples-batch/src/main/scala/org/apache/flink/examples/scala/relational/TPCHQuery3.scala
@@ -169,5 +169,4 @@ object TPCHQuery3 {
  fieldDelimiter = "|",
  includedFields = Array(0, 1, 4, 7) )
  }
-
 }
diff --git a/...ples-batch/src/main/scala/org/apache/flink/examples/scala/relational/WebLogAnalysis.scala b/...ples-batch/src/main/scala/org/apache/flink/examples/scala/relational/WebLogAnalysis.scala
@@ -93,7 +93,6 @@ object WebLogAnalysis {
  def main(args: Array[String]) {
 
  val params: ParameterTool = ParameterTool.fromArgs(args)
- println("Usage: --documents <path> --ranks <path> --visits <path> --output <path>")
 
  // set up execution environment
  val env = ExecutionEnvironment.getExecutionEnvironment

diff --git a/...k-examples-batch/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCount.scala b/...k-examples-batch/src/main/scala/org/apache/flink/examples/scala/wordcount/WordCount.scala
@@ -48,7 +48,6 @@ object WordCount {
  def main(args: Array[String]) {
 
  val params: ParameterTool = ParameterTool.fromArgs(args)
- System.out.println("Usage: WordCount --input <path> --output <path>")
 
  // set up execution environment
  val env = ExecutionEnvironment.getExecutionEnvironment
@@ -78,7 +77,6 @@ object WordCount {
  }
 
  }
-
 }
 
 
diff --git a/...streaming/src/main/java/org/apache/flink/streaming/examples/iteration/IterateExample.java b/...streaming/src/main/java/org/apache/flink/streaming/examples/iteration/IterateExample.java
@@ -58,7 +58,6 @@ public static void main(String[] args) throws Exception {
 
  // Checking input parameters
  final ParameterTool params = ParameterTool.fromArgs(args);
- System.out.println(" Usage: IterateExample --input <path> --output <path>");
 
  // set up input for the stream of integer pairs
 

diff --git a/...les-streaming/src/main/java/org/apache/flink/streaming/examples/kafka/WriteIntoKafka.java b/...les-streaming/src/main/java/org/apache/flink/streaming/examples/kafka/WriteIntoKafka.java
@@ -49,6 +49,7 @@ public static void main(String[] args) throws Exception {
 
  // very simple data generator
  DataStream<String> messageStream = env.addSource(new SourceFunction<String>() {
+ private static final long serialVersionUID = 6369260445318862378L;
  public boolean running = true;
 
  @Override

diff --git a/...ing/src/main/java/org/apache/flink/streaming/examples/ml/IncrementalLearningSkeleton.java b/...ing/src/main/java/org/apache/flink/streaming/examples/ml/IncrementalLearningSkeleton.java
@@ -61,7 +61,6 @@ public static void main(String[] args) throws Exception {
 
  // Checking input parameters
  final ParameterTool params = ParameterTool.fromArgs(args);
- System.out.println("Usage: IncrementalLearningSkeleton --output <path>");
 
  StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
  env.setStreamTimeCharacteristic(TimeCharacteristic.EventTime);

diff --git a/...reaming/src/main/java/org/apache/flink/streaming/examples/windowing/SessionWindowing.java b/...reaming/src/main/java/org/apache/flink/streaming/examples/windowing/SessionWindowing.java
@@ -37,7 +37,6 @@ public static void main(String[] args) throws Exception {
 
  final ParameterTool params = ParameterTool.fromArgs(args);
  final StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
- System.out.println("Usage: SessionWindowing --output <path>");
 
  env.getConfig().setGlobalJobParameters(params);
  env.setStreamTimeCharacteristic(TimeCharacteristic.EventTime);

diff --git a/...eaming/src/main/java/org/apache/flink/streaming/examples/windowing/TopSpeedWindowing.java b/...eaming/src/main/java/org/apache/flink/streaming/examples/windowing/TopSpeedWindowing.java
@@ -53,7 +53,6 @@ public class TopSpeedWindowing {
  public static void main(String[] args) throws Exception {
 
  final ParameterTool params = ParameterTool.fromArgs(args);
- System.err.println("Usage: TopSpeedWindowingExample --input <path> --output <path>");
 
  final StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
  env.setStreamTimeCharacteristic(TimeCharacteristic.EventTime);