---

Praful Makani · JesseLovelace · commit 294aa9c26128 · 2018-12-14T12:51:06.000-08:00
yaml --- r: 13185 b: refs/heads/autosynth-speech c: cbe19f2 h: refs/heads/master i: 13183: 2e9f31b
diff --git a/[refs] b/[refs]
@@ -141,7 +141,7 @@ refs/heads/autosynth-redis: 4c68cb0fbc599124e717ab3f24bd8a8a5d085ca9
 refs/heads/autosynth-scheduler: 2f0fe714a8541dc72f88b45bddd8748e5f21cf29
 refs/heads/autosynth-securitycenter: 8e95447ccb176c3648880ee0cb926cd1f4065156
 refs/heads/autosynth-spanner: 563dc6c78c6a2579b681f441f0a9b59005212394
-refs/heads/autosynth-speech: cb5f9c17a7d77ecaee724f135e51c7931bde7f05
+refs/heads/autosynth-speech: cbe19f24366e256d5669f07ac23c1274138ac2ec
 refs/heads/autosynth-tasks: afc9f4da54964dea5e7f3a9b164db282fc35db5c
 refs/heads/autosynth-texttospeech: a447278ab2ec3975aab3b641549c6780eac0a07a
 refs/heads/autosynth-trace: 80c58aa2fb54b0a9c6876f2c21aa8d19cf55962e
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
@@ -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-speech/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/TableInfo.java b/branches/autosynth-speech/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-speech/google-cloud-clients/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/WriteChannelConfiguration.java b/branches/autosynth-speech/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-speech/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/TableInfoTest.java b/branches/autosynth-speech/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-speech/google-cloud-clients/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/WriteChannelConfigurationTest.java b/branches/autosynth-speech/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);
