---

Praful Makani · sduskis · commit 390bb5408ff3 · 2019-04-25T15:18:21.000-04:00
yaml --- r: 31875 b: refs/heads/autosynth-datastore c: 264643d h: refs/heads/master i: 31873: 30f5171 31871: 4a369d7
diff --git a/[refs] b/[refs]
@@ -127,7 +127,7 @@ refs/heads/autosynth-bigquerystorage: a345f72d7a6358e9fea9dcdae94ec85a27da3088
 refs/heads/autosynth-bigtable: 2a6af7e2959fd79c99b8ca5d773f29a6434b546d
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: 18d210f81f17cf74864d0db2c29e834302f74f2a
-refs/heads/autosynth-datastore: 3ec7a6f3bae9be9b51e69e605982adbbec66b119
+refs/heads/autosynth-datastore: 264643df7bcc715efbd648c3ab40389ae2253d19
 refs/heads/autosynth-dialogflow: 841930a680ebe370c9fc6ae824465f6bc51a5a46
 refs/heads/autosynth-errorreporting: 3f176c20b55dfaaa8fc32f28d82b31784b93e636
 refs/heads/autosynth-firestore: 983c75e4fb1076502c8cac73ef0538bdb10884f3
diff --git a/branches/autosynth-datastore/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/branches/autosynth-datastore/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-datastore/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/branches/autosynth-datastore/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());
