---

Praful Makani · JesseLovelace · commit 32ccf565559c · 2018-12-14T12:51:06.000-08:00
yaml --- r: 14643 b: refs/heads/autosynth-asset c: cbe19f2 h: refs/heads/master i: 14641: 25c5234 14639: b2e15d9
diff --git a/[refs] b/[refs]
@@ -122,7 +122,7 @@ refs/heads/autosynth-vision: b8e47d76578b5f150ef530072ea7e485e2b02ca0
 refs/heads/spanner: b01127f885b4611bf1852abb0ce481eeb7fcc131
 refs/tags/v0.68.0: 9cc799fcf68c82ab431d425fefa58ef615ce8e5b
 refs/tags/v0.69.0: 78f67a29e8b9c46ba01de566a2eae0fd1c03edea
-refs/heads/autosynth-asset: cb5f9c17a7d77ecaee724f135e51c7931bde7f05
+refs/heads/autosynth-asset: cbe19f24366e256d5669f07ac23c1274138ac2ec
 refs/heads/autosynth-automl: d4315b3596bac160e3439432c54435f44b09953e
 refs/heads/autosynth-bigquerydatatransfer: 2a9f3938237f85a8919602d74011326580ff387f
 refs/heads/autosynth-bigquerystorage: 99aee05df348f39d98b6fb23c292006f1d2a6c28
diff --git a/branches/autosynth-asset/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/branches/autosynth-asset/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
@@ -625,7 +625,11 @@ private static Tuple<? extends Page<FieldValueList>, Long> listTableData(
       final BigQueryOptions serviceOptions,
       final Map<BigQueryRpc.Option, ?> optionsMap) {
     try {
-      final TableId completeTableId = tableId.setProjectId(serviceOptions.getProjectId());
+      final TableId completeTableId =
+          tableId.setProjectId(
+              Strings.isNullOrEmpty(serviceOptions.getProjectId())
+                  ? tableId.getProject()
+                  : serviceOptions.getProjectId());
       TableDataList result =
           runWithRetries(
               new Callable<TableDataList>() {
diff --git a/branches/autosynth-asset/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableInfo.java b/branches/autosynth-asset/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableInfo.java
@@ -20,6 +20,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.api.client.util.Data;
+import com.google.api.client.util.Strings;
 import com.google.api.core.BetaApi;
 import com.google.api.services.bigquery.model.Table;
 import com.google.common.base.Function;
@@ -396,7 +397,10 @@ public static TableInfo of(TableId tableId, TableDefinition definition) {
   }
 
   TableInfo setProjectId(String projectId) {
-    return toBuilder().setTableId(getTableId().setProjectId(projectId)).build();
+    if (Strings.isNullOrEmpty(getTableId().getProject())) {
+      return toBuilder().setTableId(getTableId().setProjectId(projectId)).build();
+    }
+    return this;
   }
 
   Table toPb() {
diff --git a/branches/autosynth-asset/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/WriteChannelConfiguration.java b/branches/autosynth-asset/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/WriteChannelConfiguration.java
@@ -18,6 +18,7 @@
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+import com.google.api.client.util.Strings;
 import com.google.api.services.bigquery.model.JobConfigurationLoad;
 import com.google.cloud.bigquery.JobInfo.CreateDisposition;
 import com.google.cloud.bigquery.JobInfo.SchemaUpdateOption;
@@ -390,7 +391,10 @@ public int hashCode() {
   }
 
   WriteChannelConfiguration setProjectId(String projectId) {
-    return toBuilder().setDestinationTable(getDestinationTable().setProjectId(projectId)).build();
+    if (Strings.isNullOrEmpty(getDestinationTable().getProject())) {
+      return toBuilder().setDestinationTable(getDestinationTable().setProjectId(projectId)).build();
+    }
+    return this;
   }
 
   com.google.api.services.bigquery.model.JobConfiguration toPb() {
diff --git a/branches/autosynth-asset/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableInfoTest.java b/branches/autosynth-asset/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableInfoTest.java
@@ -226,6 +226,13 @@ public void testSetProjectId() {
     assertEquals("project", VIEW_INFO.setProjectId("project").getTableId().getProject());
   }
 
+  @Test
+  public void testSetProjectIdDoNotOverride() {
+    TableInfo tableInfo = TableInfo.of(TABLE_ID, TABLE_DEFINITION).setProjectId("project");
+    tableInfo.setProjectId("not-override-project").toBuilder();
+    assertEquals("project", tableInfo.getTableId().getProject());
+  }
+
   private void compareTableInfo(TableInfo expected, TableInfo value) {
     assertEquals(expected, value);
     assertEquals(expected.getTableId(), value.getTableId());
diff --git a/branches/autosynth-asset/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/WriteChannelConfigurationTest.java b/branches/autosynth-asset/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/WriteChannelConfigurationTest.java
@@ -164,6 +164,14 @@ public void testToPbAndFromPb() {
     compareLoadConfiguration(configuration, WriteChannelConfiguration.fromPb(configuration.toPb()));
   }
 
+  @Test
+  public void testSetProjectIdDoNotOverride() {
+    WriteChannelConfiguration configuration =
+        WriteChannelConfiguration.of(TABLE_ID).setProjectId("project");
+    configuration.setProjectId("different-project").toBuilder();
+    assertEquals("project", configuration.getDestinationTable().getProject());
+  }
+
   private void compareLoadConfiguration(
       WriteChannelConfiguration expected, WriteChannelConfiguration value) {
     assertEquals(expected, value);
