You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lc...@apache.org on 2016/07/12 14:29:25 UTC
[1/2] incubator-beam git commit: Remove getDataflowClient() from
DataflowPipelineJob
Repository: incubator-beam
Updated Branches:
refs/heads/master f5a5eb34e -> 1685a6626
Remove getDataflowClient() from DataflowPipelineJob
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/23637cbd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/23637cbd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/23637cbd
Branch: refs/heads/master
Commit: 23637cbd1d0fa008851829e46b392de84352c10a
Parents: f5a5eb3
Author: Pei He <pe...@google.com>
Authored: Mon Jul 11 21:29:26 2016 -0700
Committer: Pei He <pe...@google.com>
Committed: Mon Jul 11 21:29:26 2016 -0700
----------------------------------------------------------------------
.../beam/runners/dataflow/DataflowPipelineJob.java | 7 -------
.../runners/dataflow/testing/TestDataflowRunner.java | 2 +-
.../dataflow/testing/TestDataflowRunnerTest.java | 12 ------------
3 files changed, 1 insertion(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/23637cbd/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java
index 0c79a92..1b3dd43 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java
@@ -153,13 +153,6 @@ public class DataflowPipelineJob implements PipelineResult {
}
/**
- * Get the Cloud Dataflow API Client used by this job.
- */
- public Dataflow getDataflowClient() {
- return dataflowClient;
- }
-
- /**
* Waits for the job to finish and return the final status.
*
* @param timeToWait The time to wait in units timeUnit for the job to finish.
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/23637cbd/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunner.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunner.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunner.java
index 19a2178..1325cf3 100644
--- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunner.java
+++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunner.java
@@ -182,7 +182,7 @@ public class TestDataflowRunner extends PipelineRunner<DataflowPipelineJob> {
return Optional.of(false);
}
- JobMetrics metrics = job.getDataflowClient().projects().jobs()
+ JobMetrics metrics = options.getDataflowClient().projects().jobs()
.getMetrics(job.getProjectId(), job.getJobId()).execute();
if (metrics == null || metrics.getMetrics() == null) {
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/23637cbd/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunnerTest.java
----------------------------------------------------------------------
diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunnerTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunnerTest.java
index cd99643..221cd0d 100644
--- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunnerTest.java
+++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/testing/TestDataflowRunnerTest.java
@@ -127,7 +127,6 @@ public class TestDataflowRunnerTest {
PAssert.that(pc).containsInAnyOrder(1, 2, 3);
DataflowPipelineJob mockJob = Mockito.mock(DataflowPipelineJob.class);
- when(mockJob.getDataflowClient()).thenReturn(service);
when(mockJob.getState()).thenReturn(State.DONE);
when(mockJob.getProjectId()).thenReturn("test-project");
when(mockJob.getJobId()).thenReturn("test-job");
@@ -148,7 +147,6 @@ public class TestDataflowRunnerTest {
PAssert.that(pc).containsInAnyOrder(1, 2, 3);
DataflowPipelineJob mockJob = Mockito.mock(DataflowPipelineJob.class);
- when(mockJob.getDataflowClient()).thenReturn(service);
when(mockJob.getState()).thenReturn(State.FAILED);
when(mockJob.getProjectId()).thenReturn("test-project");
when(mockJob.getJobId()).thenReturn("test-job");
@@ -174,7 +172,6 @@ public class TestDataflowRunnerTest {
PAssert.that(pc).containsInAnyOrder(1, 2, 3);
DataflowPipelineJob mockJob = Mockito.mock(DataflowPipelineJob.class);
- when(mockJob.getDataflowClient()).thenReturn(service);
when(mockJob.getState()).thenReturn(State.RUNNING);
when(mockJob.getProjectId()).thenReturn("test-project");
when(mockJob.getJobId()).thenReturn("test-job");
@@ -218,7 +215,6 @@ public class TestDataflowRunnerTest {
PAssert.that(pc).containsInAnyOrder(1, 2, 3);
DataflowPipelineJob mockJob = Mockito.mock(DataflowPipelineJob.class);
- when(mockJob.getDataflowClient()).thenReturn(service);
when(mockJob.getState()).thenReturn(State.RUNNING);
when(mockJob.getProjectId()).thenReturn("test-project");
when(mockJob.getJobId()).thenReturn("test-job");
@@ -240,7 +236,6 @@ public class TestDataflowRunnerTest {
PAssert.that(pc).containsInAnyOrder(1, 2, 3);
DataflowPipelineJob mockJob = Mockito.mock(DataflowPipelineJob.class);
- when(mockJob.getDataflowClient()).thenReturn(service);
when(mockJob.getState()).thenReturn(State.RUNNING);
when(mockJob.getProjectId()).thenReturn("test-project");
when(mockJob.getJobId()).thenReturn("test-job");
@@ -350,7 +345,6 @@ public class TestDataflowRunnerTest {
PAssert.that(pc).containsInAnyOrder(1, 2, 3);
DataflowPipelineJob mockJob = Mockito.mock(DataflowPipelineJob.class);
- when(mockJob.getDataflowClient()).thenReturn(service);
when(mockJob.getState()).thenReturn(State.RUNNING);
when(mockJob.getProjectId()).thenReturn("test-project");
when(mockJob.getJobId()).thenReturn("test-job");
@@ -393,7 +387,6 @@ public class TestDataflowRunnerTest {
PAssert.that(pc).containsInAnyOrder(1, 2, 3);
final DataflowPipelineJob mockJob = Mockito.mock(DataflowPipelineJob.class);
- when(mockJob.getDataflowClient()).thenReturn(service);
when(mockJob.getState()).thenReturn(State.DONE);
when(mockJob.getProjectId()).thenReturn("test-project");
when(mockJob.getJobId()).thenReturn("test-job");
@@ -418,7 +411,6 @@ public class TestDataflowRunnerTest {
PAssert.that(pc).containsInAnyOrder(1, 2, 3);
final DataflowPipelineJob mockJob = Mockito.mock(DataflowPipelineJob.class);
- when(mockJob.getDataflowClient()).thenReturn(service);
when(mockJob.getState()).thenReturn(State.DONE);
when(mockJob.getProjectId()).thenReturn("test-project");
when(mockJob.getJobId()).thenReturn("test-job");
@@ -445,7 +437,6 @@ public class TestDataflowRunnerTest {
PAssert.that(pc).containsInAnyOrder(1, 2, 3);
final DataflowPipelineJob mockJob = Mockito.mock(DataflowPipelineJob.class);
- when(mockJob.getDataflowClient()).thenReturn(service);
when(mockJob.getState()).thenReturn(State.DONE);
when(mockJob.getProjectId()).thenReturn("test-project");
when(mockJob.getJobId()).thenReturn("test-job");
@@ -470,7 +461,6 @@ public class TestDataflowRunnerTest {
PAssert.that(pc).containsInAnyOrder(1, 2, 3);
final DataflowPipelineJob mockJob = Mockito.mock(DataflowPipelineJob.class);
- when(mockJob.getDataflowClient()).thenReturn(service);
when(mockJob.getState()).thenReturn(State.DONE);
when(mockJob.getProjectId()).thenReturn("test-project");
when(mockJob.getJobId()).thenReturn("test-job");
@@ -497,7 +487,6 @@ public class TestDataflowRunnerTest {
PAssert.that(pc).containsInAnyOrder(1, 2, 3);
final DataflowPipelineJob mockJob = Mockito.mock(DataflowPipelineJob.class);
- when(mockJob.getDataflowClient()).thenReturn(service);
when(mockJob.getState()).thenReturn(State.FAILED);
when(mockJob.getProjectId()).thenReturn("test-project");
when(mockJob.getJobId()).thenReturn("test-job");
@@ -529,7 +518,6 @@ public class TestDataflowRunnerTest {
PAssert.that(pc).containsInAnyOrder(1, 2, 3);
final DataflowPipelineJob mockJob = Mockito.mock(DataflowPipelineJob.class);
- when(mockJob.getDataflowClient()).thenReturn(service);
when(mockJob.getState()).thenReturn(State.FAILED);
when(mockJob.getProjectId()).thenReturn("test-project");
when(mockJob.getJobId()).thenReturn("test-job");
[2/2] incubator-beam git commit: API cleanup: Remove
getDataflowClient() from DataflowPipelineJob
Posted by lc...@apache.org.
API cleanup: Remove getDataflowClient() from DataflowPipelineJob
This closes #637
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1685a662
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1685a662
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1685a662
Branch: refs/heads/master
Commit: 1685a6626f47e86c4c0ab9a2b22398f5cef06b1c
Parents: f5a5eb3 23637cb
Author: Luke Cwik <lc...@google.com>
Authored: Tue Jul 12 07:29:11 2016 -0700
Committer: Luke Cwik <lc...@google.com>
Committed: Tue Jul 12 07:29:11 2016 -0700
----------------------------------------------------------------------
.../beam/runners/dataflow/DataflowPipelineJob.java | 7 -------
.../runners/dataflow/testing/TestDataflowRunner.java | 2 +-
.../dataflow/testing/TestDataflowRunnerTest.java | 12 ------------
3 files changed, 1 insertion(+), 20 deletions(-)
----------------------------------------------------------------------