Additinal examples code cleanups
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/7fbe4103 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/7fbe4103 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/7fbe4103 Branch: refs/heads/master Commit: 7fbe41035b775b631d5e9120d005497813d9e36c Parents: b9a66e4 Author: Pei He <pe...@google.com> Authored: Fri Sep 9 14:15:49 2016 -0700 Committer: Luke Cwik <lc...@google.com> Committed: Tue Sep 13 18:01:08 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/beam/examples/MinimalWordCount.java | 3 +-- .../main/java/org/apache/beam/examples/common/ExampleUtils.java | 2 +- .../archetype-resources/src/main/java/DebuggingWordCount.java | 1 - .../archetype-resources/src/main/java/MinimalWordCount.java | 3 +-- .../src/main/java/common/ExampleOptions.java | 5 ----- .../archetype-resources/src/main/java/common/ExampleUtils.java | 2 +- 6 files changed, 4 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7fbe4103/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java ---------------------------------------------------------------------- diff --git a/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java b/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java index f772dd5..14ffa18 100644 --- a/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java +++ b/examples/java/src/main/java/org/apache/beam/examples/MinimalWordCount.java @@ -75,8 +75,7 @@ public class MinimalWordCount { // dataflowOptions.setTempLocation("gs://SET_YOUR_BUCKET_NAME_HERE/AND_TEMP_DIRECTORY"); // For FlinkRunner, set the runner as follows. See {@code FlinkPipelineOptions} // for more details. - // options.as(FlinkPipelineOptions.class) - // .setRunner(FlinkRunner.class); + // options.setRunner(FlinkRunner.class); // Create the Pipeline object with the options we defined above. Pipeline p = Pipeline.create(options); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7fbe4103/examples/java/src/main/java/org/apache/beam/examples/common/ExampleUtils.java ---------------------------------------------------------------------- diff --git a/examples/java/src/main/java/org/apache/beam/examples/common/ExampleUtils.java b/examples/java/src/main/java/org/apache/beam/examples/common/ExampleUtils.java index 2e8dcf6..1209a67 100644 --- a/examples/java/src/main/java/org/apache/beam/examples/common/ExampleUtils.java +++ b/examples/java/src/main/java/org/apache/beam/examples/common/ExampleUtils.java @@ -53,7 +53,7 @@ import org.joda.time.Duration; * The utility class that sets up and tears down external resources, * and cancels the streaming pipelines once the program terminates. * - * <p>It is used to run Beam examples, such as TrafficMaxLaneFlow and TrafficRoutes. + * <p>It is used to run Beam examples. */ public class ExampleUtils { http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7fbe4103/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java index e315ba9..4099a37 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/DebuggingWordCount.java @@ -17,7 +17,6 @@ */ package ${package}; -import ${package}.WordCount; import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7fbe4103/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/MinimalWordCount.java ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/MinimalWordCount.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/MinimalWordCount.java index f739fd8..e8497c0 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/MinimalWordCount.java +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/MinimalWordCount.java @@ -75,8 +75,7 @@ public class MinimalWordCount { // dataflowOptions.setTempLocation("gs://SET_YOUR_BUCKET_NAME_HERE/AND_TEMP_DIRECTORY"); // For FlinkRunner, set the runner as follows. See {@code FlinkPipelineOptions} // for more details. - // options.as(FlinkPipelineOptions.class) - // .setRunner(FlinkRunner.class); + // options.setRunner(FlinkRunner.class); // Create the Pipeline object with the options we defined above. Pipeline p = Pipeline.create(options); http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7fbe4103/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleOptions.java ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleOptions.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleOptions.java index 90f935c..221e266 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleOptions.java +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleOptions.java @@ -29,9 +29,4 @@ public interface ExampleOptions extends PipelineOptions { @Default.Boolean(false) boolean getKeepJobsRunning(); void setKeepJobsRunning(boolean keepJobsRunning); - - @Description("Number of workers to use when executing the injector pipeline") - @Default.Integer(1) - int getInjectorNumWorkers(); - void setInjectorNumWorkers(int numWorkers); } http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/7fbe4103/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleUtils.java ---------------------------------------------------------------------- diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleUtils.java b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleUtils.java index afef188..c1b6489 100644 --- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleUtils.java +++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/src/main/java/common/ExampleUtils.java @@ -53,7 +53,7 @@ import org.joda.time.Duration; * The utility class that sets up and tears down external resources, * and cancels the streaming pipelines once the program terminates. * - * <p>It is used to run Beam examples, such as TrafficMaxLaneFlow and TrafficRoutes. + * <p>It is used to run Beam examples. */ public class ExampleUtils {
