This is an automated email from the ASF dual-hosted git repository. iemejia pushed a commit to branch BEAM-7092-spark3 in repository https://gitbox.apache.org/repos/asf/beam.git
commit c5e35fa9c735b81975ea3cb3139441a85e673dc3 Author: Ismaël Mejía <ieme...@gmail.com> AuthorDate: Mon Jan 13 13:42:27 2020 +0100 Remove SparkStructuredStreamingRunner from the Registrar --- .../java/org/apache/beam/runners/spark/SparkRunnerRegistrar.java | 8 ++------ .../org/apache/beam/runners/spark/SparkRunnerRegistrarTest.java | 7 ++----- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkRunnerRegistrar.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkRunnerRegistrar.java index 1919014..3e64e76 100644 --- a/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkRunnerRegistrar.java +++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/SparkRunnerRegistrar.java @@ -18,8 +18,6 @@ package org.apache.beam.runners.spark; import com.google.auto.service.AutoService; -import org.apache.beam.runners.spark.structuredstreaming.SparkStructuredStreamingPipelineOptions; -import org.apache.beam.runners.spark.structuredstreaming.SparkStructuredStreamingRunner; import org.apache.beam.sdk.PipelineRunner; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.options.PipelineOptionsRegistrar; @@ -41,8 +39,7 @@ public final class SparkRunnerRegistrar { public static class Runner implements PipelineRunnerRegistrar { @Override public Iterable<Class<? extends PipelineRunner<?>>> getPipelineRunners() { - return ImmutableList.of( - SparkRunner.class, TestSparkRunner.class, SparkStructuredStreamingRunner.class); + return ImmutableList.of(SparkRunner.class, TestSparkRunner.class); } } @@ -51,8 +48,7 @@ public final class SparkRunnerRegistrar { public static class Options implements PipelineOptionsRegistrar { @Override public Iterable<Class<? extends PipelineOptions>> getPipelineOptions() { - return ImmutableList.of( - SparkPipelineOptions.class, SparkStructuredStreamingPipelineOptions.class); + return ImmutableList.of(SparkPipelineOptions.class); } } } diff --git a/runners/spark/src/test/java/org/apache/beam/runners/spark/SparkRunnerRegistrarTest.java b/runners/spark/src/test/java/org/apache/beam/runners/spark/SparkRunnerRegistrarTest.java index 6b273d0..03852a7 100644 --- a/runners/spark/src/test/java/org/apache/beam/runners/spark/SparkRunnerRegistrarTest.java +++ b/runners/spark/src/test/java/org/apache/beam/runners/spark/SparkRunnerRegistrarTest.java @@ -21,8 +21,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import java.util.ServiceLoader; -import org.apache.beam.runners.spark.structuredstreaming.SparkStructuredStreamingPipelineOptions; -import org.apache.beam.runners.spark.structuredstreaming.SparkStructuredStreamingRunner; import org.apache.beam.sdk.options.PipelineOptionsRegistrar; import org.apache.beam.sdk.runners.PipelineRunnerRegistrar; import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; @@ -37,15 +35,14 @@ public class SparkRunnerRegistrarTest { @Test public void testOptions() { assertEquals( - ImmutableList.of(SparkPipelineOptions.class, SparkStructuredStreamingPipelineOptions.class), + ImmutableList.of(SparkPipelineOptions.class), new SparkRunnerRegistrar.Options().getPipelineOptions()); } @Test public void testRunners() { assertEquals( - ImmutableList.of( - SparkRunner.class, TestSparkRunner.class, SparkStructuredStreamingRunner.class), + ImmutableList.of(SparkRunner.class, TestSparkRunner.class), new SparkRunnerRegistrar.Runner().getPipelineRunners()); }