---

Praful Makani · sduskis · commit 4a935e094dfb · 2019-04-25T15:18:21.000-04:00
yaml --- r: 34227 b: refs/heads/autosynth-speech c: 264643d h: refs/heads/master i: 34225: 069d4b1 34223: 7c5fd9c
diff --git a/[refs] b/[refs]
@@ -138,7 +138,7 @@ refs/heads/autosynth-os-login: 49028d40ac477fca5f948cc5a3ce7422729fdb67
 refs/heads/autosynth-redis: 2b698ebe7faaa0b93246576a88941682e0888e57
 refs/heads/autosynth-scheduler: a3de6480746d1cd586ca8b9d75c55a636f371539
 refs/heads/autosynth-spanner: d963fe4368e79cf6abae5d511785e8ced8ac57f4
-refs/heads/autosynth-speech: 3ec7a6f3bae9be9b51e69e605982adbbec66b119
+refs/heads/autosynth-speech: 264643df7bcc715efbd648c3ab40389ae2253d19
 refs/heads/autosynth-tasks: eb03eeab747e925175890db923945384d89b273a
 refs/heads/autosynth-texttospeech: 2c442fe0b7f089fbab266edfe4dd83c532e82dd0
 refs/heads/autosynth-trace: c94eef6e4d9c6fd24888216e28ca7271959c1cf0
diff --git a/branches/autosynth-speech/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/branches/autosynth-speech/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-speech/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/branches/autosynth-speech/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());
