---

Praful Makani · sduskis · commit 1b439ab03526 · 2019-04-25T15:18:21.000-04:00
yaml --- r: 27279 b: refs/heads/pubsub-ordering-keys c: 264643d h: refs/heads/master i: 27277: 1de6966 27275: fc9606b 27271: c91078d 27263: 3cc7dc2
diff --git a/[refs] b/[refs]
@@ -155,7 +155,7 @@ refs/tags/v0.72.0: a7703f2593ba312c0b2dde6fdfd4f5c764bb55ac
 refs/tags/v0.73.0: 21241ea8be9439cc5764c4944cdce21d34ce4f9e
 refs/tags/v0.74.0: 9d1f733dbbf790de7b494418523b69c4a9a57638
 refs/heads/ignoretest: 23c412ae07af3d0ab1caa2d44d5bc5c0ccb8b31d
-refs/heads/pubsub-ordering-keys: 3ec7a6f3bae9be9b51e69e605982adbbec66b119
+refs/heads/pubsub-ordering-keys: 264643df7bcc715efbd648c3ab40389ae2253d19
 "refs/heads/update_mvn_badge": ae2d773814db0f71197ccf5a8612ee1d8056f8de
 refs/tags/v0.75.0: c3673089ae09a897c1b4cf7dfe167fe4f8ab32fb
 refs/tags/v0.76.0: 395b016826d3ddf9cb8b34919636df15a4dbd032
diff --git a/branches/pubsub-ordering-keys/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/branches/pubsub-ordering-keys/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/pubsub-ordering-keys/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/branches/pubsub-ordering-keys/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());
