Fix googleapis#3924 ExtractJobConfiguration's setProjectId makes cros…

…s-project BQ extracts impossible
ajaaym · Dec 5, 2018 · 2dbf234 · 2dbf234
1 parent 90f8c98
commit 2dbf234
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/...s/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/CopyJobConfiguration.java b/...s/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/CopyJobConfiguration.java
@@ -21,6 +21,7 @@
 import com.google.api.services.bigquery.model.JobConfigurationTableCopy;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import java.util.List;
@@ -216,10 +217,15 @@ CopyJobConfiguration setProjectId(final String projectId) {
             new Function<TableId, TableId>() {
               @Override
               public TableId apply(TableId tableId) {
-                return tableId.setProjectId(projectId);
+                if (Strings.isNullOrEmpty(tableId.getProject())) {
+                  return tableId.setProjectId(projectId);
+                }
+                return tableId;
               }
             }));
-    builder.setDestinationTable(getDestinationTable().setProjectId(projectId));
+    if (Strings.isNullOrEmpty(getDestinationTable().getProject())) {
+      builder.setDestinationTable(getDestinationTable().setProjectId(projectId));
+    }
     return builder.build();
   }
 

diff --git a/...oogle-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExtractJobConfiguration.java b/...oogle-cloud-bigquery/src/main/java/com/google/cloud/bigquery/ExtractJobConfiguration.java
@@ -20,6 +20,7 @@
 
 import com.google.api.services.bigquery.model.JobConfigurationExtract;
 import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import java.util.List;
 import java.util.Objects;
@@ -215,7 +216,10 @@ public int hashCode() {
 
   @Override
   ExtractJobConfiguration setProjectId(String projectId) {
-    return toBuilder().setSourceTable(getSourceTable().setProjectId(projectId)).build();
+    if (Strings.isNullOrEmpty(getSourceTable().getProject())) {
+      return toBuilder().setSourceTable(getSourceTable().setProjectId(projectId)).build();
+    }
+    return this;
   }
 
   @Override

diff --git a/...s/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadJobConfiguration.java b/...s/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/LoadJobConfiguration.java
@@ -20,6 +20,7 @@
 
 import com.google.api.services.bigquery.model.JobConfigurationLoad;
 import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
 import java.util.List;
@@ -398,7 +399,10 @@ public int hashCode() {
 
   @Override
   LoadJobConfiguration setProjectId(String projectId) {
-    return toBuilder().setDestinationTable(getDestinationTable().setProjectId(projectId)).build();
+    if (Strings.isNullOrEmpty(getDestinationTable().getProject())) {
+      return toBuilder().setDestinationTable(getDestinationTable().setProjectId(projectId)).build();
+    }
+    return this;
   }
 
   @Override

diff --git a/.../google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java b/.../google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/QueryJobConfiguration.java
@@ -26,6 +26,7 @@
 import com.google.cloud.bigquery.JobInfo.WriteDisposition;
 import com.google.common.base.Function;
 import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
@@ -769,7 +770,8 @@ public int hashCode() {
   @Override
   QueryJobConfiguration setProjectId(String projectId) {
     Builder builder = toBuilder();
-    if (getDestinationTable() != null) {
+    if (getDestinationTable() != null
+        && Strings.isNullOrEmpty(getDestinationTable().getProject())) {
       builder.setDestinationTable(getDestinationTable().setProjectId(projectId));
     }
     if (getDefaultDataset() != null) {