bug: adding getProjectId() when datasetInfo projectId is null (#21)

* bug: adding getProjectId() when datasetInfo projectId is null * bug: adding getProjectId() when datasetInfo projectId is null * update based on comment
googleapis · Dec 11, 2019 · 841d075 · 841d075
1 parent 1b0b21b
commit 841d075
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java b/google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/BigQueryImpl.java
@@ -202,7 +202,12 @@ public Page<FieldValueList> getNextPage() {
   @Override
   public Dataset create(DatasetInfo datasetInfo, DatasetOption... options) {
     final com.google.api.services.bigquery.model.Dataset datasetPb =
-        datasetInfo.setProjectId(getOptions().getProjectId()).toPb();
+        datasetInfo
+            .setProjectId(
+                Strings.isNullOrEmpty(datasetInfo.getDatasetId().getProject())
+                    ? getOptions().getProjectId()
+                    : datasetInfo.getDatasetId().getProject())
+            .toPb();
     final Map<BigQueryRpc.Option, ?> optionsMap = optionMap(options);
     try {
       return Dataset.fromPb(

diff --git a/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java b/google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/BigQueryImplTest.java
@@ -478,7 +478,9 @@ public void testCreateDataset() {
     EasyMock.expect(bigqueryRpcMock.create(datasetInfo.toPb(), EMPTY_RPC_OPTIONS))
         .andReturn(datasetInfo.toPb());
     EasyMock.replay(bigqueryRpcMock);
-    bigquery = options.getService();
+    BigQueryOptions bigQueryOptions =
+        createBigQueryOptionsForProject(OTHER_PROJECT, rpcFactoryMock);
+    bigquery = bigQueryOptions.getService();
     Dataset dataset = bigquery.create(datasetInfo);
     assertEquals(new Dataset(bigquery, new DatasetInfo.BuilderImpl(datasetInfo)), dataset);
   }