[BEAM-151] Remove dependence on DataflowPipelineOptions This prevents moving DataflowPipelineOptions to its own runner specifc maven module.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/e0d4f85d Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/e0d4f85d Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/e0d4f85d Branch: refs/heads/master Commit: e0d4f85d4be3f55dc655258ffaa6eef213894df0 Parents: 49d6594 Author: Luke Cwik <[email protected]> Authored: Mon Mar 28 14:16:34 2016 -0700 Committer: Luke Cwik <[email protected]> Committed: Thu Apr 7 11:19:50 2016 -0700 ---------------------------------------------------------------------- .../cloud/dataflow/sdk/util/Transport.java | 16 ++-------- .../dataflow/sdk/testing/TestPipelineTest.java | 32 +++++--------------- 2 files changed, 10 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e0d4f85d/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java index 5888822..d5cdb24 100644 --- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java +++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/Transport.java @@ -27,7 +27,6 @@ import com.google.api.services.bigquery.Bigquery; import com.google.api.services.pubsub.Pubsub; import com.google.api.services.storage.Storage; import com.google.cloud.dataflow.sdk.options.BigQueryOptions; -import com.google.cloud.dataflow.sdk.options.DataflowPipelineDebugOptions; import com.google.cloud.dataflow.sdk.options.GcsOptions; import com.google.cloud.dataflow.sdk.options.PubsubOptions; import com.google.cloud.hadoop.util.ChainingHttpRequestInitializer; @@ -90,10 +89,7 @@ public class Transport { } /** - * Returns a BigQuery client builder. - * - * <p>Note: this client's endpoint is <b>not</b> modified by the - * {@link DataflowPipelineDebugOptions#getApiRootUrl()} option. + * Returns a BigQuery client builder using the specified {@link BigQueryOptions}. */ public static Bigquery.Builder newBigQueryClient(BigQueryOptions options) { @@ -107,10 +103,7 @@ public class Transport { } /** - * Returns a Pubsub client builder. - * - * <p>Note: this client's endpoint is <b>not</b> modified by the - * {@link DataflowPipelineDebugOptions#getApiRootUrl()} option. + * Returns a Pubsub client builder using the specified {@link PubsubOptions}. */ public static Pubsub.Builder newPubsubClient(PubsubOptions options) { @@ -125,10 +118,7 @@ public class Transport { } /** - * Returns a Cloud Storage client builder. - * - * <p>Note: this client's endpoint is <b>not</b> modified by the - * {@link DataflowPipelineDebugOptions#getApiRootUrl()} option. + * Returns a Cloud Storage client builder using the specified {@link GcsOptions}. */ public static Storage.Builder newStorageClient(GcsOptions options) { http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/e0d4f85d/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java index 6f119da..d6a2b63 100644 --- a/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java +++ b/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/testing/TestPipelineTest.java @@ -23,10 +23,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import com.google.cloud.dataflow.sdk.options.ApplicationNameOptions; -import com.google.cloud.dataflow.sdk.options.DataflowPipelineOptions; import com.google.cloud.dataflow.sdk.options.GcpOptions; import com.google.cloud.dataflow.sdk.options.PipelineOptions; -import com.google.cloud.dataflow.sdk.runners.DataflowPipelineRunner; +import com.google.cloud.dataflow.sdk.runners.DirectPipelineRunner; import com.fasterxml.jackson.databind.ObjectMapper; @@ -50,31 +49,14 @@ public class TestPipelineTest { public void testCreationOfPipelineOptions() throws Exception { ObjectMapper mapper = new ObjectMapper(); String stringOptions = mapper.writeValueAsString(new String[]{ - "--runner=DataflowPipelineRunner", - "--project=testProject", - "--apiRootUrl=testApiRootUrl", - "--dataflowEndpoint=testDataflowEndpoint", - "--tempLocation=testTempLocation", - "--serviceAccountName=testServiceAccountName", - "--serviceAccountKeyfile=testServiceAccountKeyfile", - "--zone=testZone", - "--numWorkers=1", - "--diskSizeGb=2" + "--runner=DirectPipelineRunner", + "--project=testProject" }); System.getProperties().put("dataflowOptions", stringOptions); - DataflowPipelineOptions options = - TestPipeline.testingPipelineOptions().as(DataflowPipelineOptions.class); - assertEquals(DataflowPipelineRunner.class, options.getRunner()); - assertThat(options.getJobName(), startsWith("testpipelinetest0testcreationofpipelineoptions-")); - assertEquals("testProject", options.as(GcpOptions.class).getProject()); - assertEquals("testApiRootUrl", options.getApiRootUrl()); - assertEquals("testDataflowEndpoint", options.getDataflowEndpoint()); - assertEquals("testTempLocation", options.getTempLocation()); - assertEquals("testServiceAccountName", options.getServiceAccountName()); - assertEquals( - "testServiceAccountKeyfile", options.as(GcpOptions.class).getServiceAccountKeyfile()); - assertEquals("testZone", options.getZone()); - assertEquals(2, options.getDiskSizeGb()); + GcpOptions options = + TestPipeline.testingPipelineOptions().as(GcpOptions.class); + assertEquals(DirectPipelineRunner.class, options.getRunner()); + assertEquals(options.getProject(), "testProject"); } @Test
