---

Praful Makani · sduskis · commit 0399ae9cdcba · 2019-04-25T15:18:21.000-04:00
yaml --- r: 27827 b: refs/heads/autosynth-pubsub c: 264643d h: refs/heads/master i: 27825: 1bf105a 27823: 9a33ac8
diff --git a/[refs] b/[refs]
@@ -114,7 +114,7 @@ refs/tags/v0.67.0: 30b56f02092efc6f3c3667650ea8b8825003e0b7
 refs/heads/autosynth-compute: c0ad4e5b54b2b167d47e508ca215c039404837d3
 refs/heads/autosynth-container: d17e1a76a903f9e05eba56a9bf5d12c1b15b67d7
 refs/heads/autosynth-monitoring: e66569bd7358a90d17097f90cf8c70dbeeb048cf
-refs/heads/autosynth-pubsub: 3ec7a6f3bae9be9b51e69e605982adbbec66b119
+refs/heads/autosynth-pubsub: 264643df7bcc715efbd648c3ab40389ae2253d19
 refs/heads/autosynth-video-intelligence: 376f1f5972d56c508e9755b817ac478e84b219de
 refs/heads/autosynth-vision: c99f959b6acf4840e473f2e67144d00ec52875e5
 refs/heads/spanner: b01127f885b4611bf1852abb0ce481eeb7fcc131
diff --git a/branches/autosynth-pubsub/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/branches/autosynth-pubsub/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
@@ -655,9 +655,9 @@ private static Tuple<? extends Page<FieldValueList>, Long> listTableData(
     try {
       final TableId completeTableId =
           tableId.setProjectId(
-              Strings.isNullOrEmpty(serviceOptions.getProjectId())
-                  ? tableId.getProject()
-                  : serviceOptions.getProjectId());
+              Strings.isNullOrEmpty(tableId.getProject())
+                  ? serviceOptions.getProjectId()
+                  : tableId.getProject());
       TableDataList result =
           runWithRetries(
               new Callable<TableDataList>() {
diff --git a/branches/autosynth-pubsub/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/branches/autosynth-pubsub/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
@@ -1246,8 +1246,7 @@ public void testListTableDataFromTableIdWithProject() {
     EasyMock.expect(bigqueryRpcMock.listTableData(OTHER_PROJECT, DATASET, TABLE, EMPTY_RPC_OPTIONS))
         .andReturn(TABLE_DATA_PB);
     EasyMock.replay(bigqueryRpcMock);
-    BigQueryOptions bigQueryOptions =
-        createBigQueryOptionsForProject(OTHER_PROJECT, rpcFactoryMock);
+    BigQueryOptions bigQueryOptions = createBigQueryOptionsForProject(PROJECT, rpcFactoryMock);
     bigquery = bigQueryOptions.getService();
     Page<FieldValueList> page = bigquery.listTableData(tableId);
     assertEquals(CURSOR, page.getNextPageToken());
