You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2016/07/21 17:25:03 UTC
[1/2] incubator-beam git commit: Rename DirectRegistrar Registrars
Repository: incubator-beam
Updated Branches:
refs/heads/master 0eb81fdc1 -> 9cdaed0d8
Rename DirectRegistrar Registrars
This removes the duplication of "DirectRunner" and "DirectOptions"
classes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/232c0e96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/232c0e96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/232c0e96
Branch: refs/heads/master
Commit: 232c0e9610a5d5559598a2059577b699299a0b76
Parents: 0eb81fd
Author: Thomas Groh <tg...@google.com>
Authored: Wed Jul 20 09:49:47 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Jul 21 10:24:53 2016 -0700
----------------------------------------------------------------------
.../beam/runners/direct/DirectRegistrar.java | 4 ++--
.../beam/runners/direct/DirectRegistrarTest.java | 17 +++++++++--------
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/232c0e96/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRegistrar.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRegistrar.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRegistrar.java
index 7c094ae..772777e 100644
--- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRegistrar.java
+++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRegistrar.java
@@ -35,7 +35,7 @@ public class DirectRegistrar {
* Registers the {@link org.apache.beam.runners.direct.DirectRunner}.
*/
@AutoService(PipelineRunnerRegistrar.class)
- public static class DirectRunner implements PipelineRunnerRegistrar {
+ public static class Runner implements PipelineRunnerRegistrar {
@Override
public Iterable<Class<? extends PipelineRunner<?>>> getPipelineRunners() {
return ImmutableList.<Class<? extends PipelineRunner<?>>>of(
@@ -47,7 +47,7 @@ public class DirectRegistrar {
* Registers the {@link org.apache.beam.runners.direct.DirectOptions}.
*/
@AutoService(PipelineOptionsRegistrar.class)
- public static class DirectOptions implements PipelineOptionsRegistrar {
+ public static class Options implements PipelineOptionsRegistrar {
@Override
public Iterable<Class<? extends PipelineOptions>> getPipelineOptions() {
return ImmutableList.<Class<? extends PipelineOptions>>of(
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/232c0e96/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DirectRegistrarTest.java
----------------------------------------------------------------------
diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DirectRegistrarTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DirectRegistrarTest.java
index 5c89f1b..d5cdee6 100644
--- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DirectRegistrarTest.java
+++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/DirectRegistrarTest.java
@@ -20,7 +20,8 @@ package org.apache.beam.runners.direct;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import org.apache.beam.runners.direct.DirectRegistrar.DirectRunner;
+import org.apache.beam.runners.direct.DirectRegistrar.Options;
+import org.apache.beam.runners.direct.DirectRegistrar.Runner;
import org.apache.beam.sdk.options.PipelineOptionsRegistrar;
import org.apache.beam.sdk.runners.PipelineRunnerRegistrar;
@@ -33,42 +34,42 @@ import org.junit.runners.JUnit4;
import java.util.ServiceLoader;
-/** Tests for {@link DirectRunner}. */
+/** Tests for {@link DirectRegistrar}. */
@RunWith(JUnit4.class)
public class DirectRegistrarTest {
@Test
public void testCorrectOptionsAreReturned() {
assertEquals(
ImmutableList.of(DirectOptions.class),
- new DirectRegistrar.DirectOptions().getPipelineOptions());
+ new Options().getPipelineOptions());
}
@Test
public void testCorrectRunnersAreReturned() {
assertEquals(
ImmutableList.of(org.apache.beam.runners.direct.DirectRunner.class),
- new DirectRunner().getPipelineRunners());
+ new Runner().getPipelineRunners());
}
@Test
public void testServiceLoaderForOptions() {
for (PipelineOptionsRegistrar registrar :
Lists.newArrayList(ServiceLoader.load(PipelineOptionsRegistrar.class).iterator())) {
- if (registrar instanceof DirectRegistrar.DirectOptions) {
+ if (registrar instanceof Options) {
return;
}
}
- fail("Expected to find " + DirectRegistrar.DirectOptions.class);
+ fail("Expected to find " + Options.class);
}
@Test
public void testServiceLoaderForRunner() {
for (PipelineRunnerRegistrar registrar :
Lists.newArrayList(ServiceLoader.load(PipelineRunnerRegistrar.class).iterator())) {
- if (registrar instanceof DirectRunner) {
+ if (registrar instanceof Runner) {
return;
}
}
- fail("Expected to find " + DirectRunner.class);
+ fail("Expected to find " + Runner.class);
}
}
[2/2] incubator-beam git commit: Closes #700
Posted by dh...@apache.org.
Closes #700
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/9cdaed0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/9cdaed0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/9cdaed0d
Branch: refs/heads/master
Commit: 9cdaed0d8a401caf5a9efb626fa629fd6f4f4627
Parents: 0eb81fd 232c0e9
Author: Dan Halperin <dh...@google.com>
Authored: Thu Jul 21 10:24:54 2016 -0700
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Jul 21 10:24:54 2016 -0700
----------------------------------------------------------------------
.../beam/runners/direct/DirectRegistrar.java | 4 ++--
.../beam/runners/direct/DirectRegistrarTest.java | 17 +++++++++--------
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------