From a8210e983c359ae632d4fb583c776eb8b97e01b8 Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Tue, 21 Jul 2026 21:53:56 +0000 Subject: [PATCH 1/3] fix(bigquery-jdbc): fix WriteAPI when running in restricted environment --- .../jdbc/BigQueryJdbcBulkInsertWriter.java | 2 +- .../BigQueryJdbcBulkInsertWriterTest.java | 55 +++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java diff --git a/java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriter.java b/java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriter.java index 99b1374637ac..857600214626 100644 --- a/java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriter.java +++ b/java-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriter.java @@ -60,7 +60,7 @@ void initialize(TableName parentTable, BigQueryWriteClient client, RetrySettings WriteStream writeStream = client.createWriteStream(createWriteStreamRequest); JsonStreamWriter.Builder jsonStreamWriterBuilder = - JsonStreamWriter.newBuilder(writeStream.getName(), writeStream.getTableSchema()); + JsonStreamWriter.newBuilder(writeStream.getName(), writeStream.getTableSchema(), client); if (retrySettings != null) { jsonStreamWriterBuilder.setRetrySettings(retrySettings); diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java new file mode 100644 index 000000000000..8d11bc5ee2e5 --- /dev/null +++ b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java @@ -0,0 +1,55 @@ +/* + * Copyright 2026 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.cloud.bigquery.jdbc; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import com.google.cloud.bigquery.storage.v1.BigQueryWriteClient; +import com.google.cloud.bigquery.storage.v1.BigQueryWriteSettings; +import com.google.cloud.bigquery.storage.v1.CreateWriteStreamRequest; +import com.google.cloud.bigquery.storage.v1.TableName; +import com.google.cloud.bigquery.storage.v1.TableSchema; +import com.google.cloud.bigquery.storage.v1.WriteStream; +import org.junit.jupiter.api.Test; + +public class BigQueryJdbcBulkInsertWriterTest { + + @Test + public void testInitializePassesClientToJsonStreamWriter() throws Exception { + BigQueryWriteClient mockClient = mock(BigQueryWriteClient.class); + BigQueryWriteSettings mockSettings = BigQueryWriteSettings.newBuilder().build(); + when(mockClient.getSettings()).thenReturn(mockSettings); + + WriteStream stream = + WriteStream.newBuilder() + .setName("projects/test-project/datasets/test_dataset/tables/test_table/streams/_default") + .setTableSchema(TableSchema.newBuilder().build()) + .build(); + when(mockClient.createWriteStream(any(CreateWriteStreamRequest.class))).thenReturn(stream); + + TableName tableName = TableName.of("test-project", "test_dataset", "test_table"); + BigQueryJdbcBulkInsertWriter writer = new BigQueryJdbcBulkInsertWriter(); + writer.initialize(tableName, mockClient, null); + + assertNotNull(writer.getStreamName()); + verify(mockClient).getSettings(); + } +} From 778c8bf9163601bf3ec2b39feef1958a7dd28f47 Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Tue, 21 Jul 2026 23:42:29 +0000 Subject: [PATCH 2/3] lint --- .../cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java index 8d11bc5ee2e5..dd859f770fd3 100644 --- a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java +++ b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java @@ -40,7 +40,8 @@ public void testInitializePassesClientToJsonStreamWriter() throws Exception { WriteStream stream = WriteStream.newBuilder() - .setName("projects/test-project/datasets/test_dataset/tables/test_table/streams/_default") + .setName( + "projects/test-project/datasets/test_dataset/tables/test_table/streams/_default") .setTableSchema(TableSchema.newBuilder().build()) .build(); when(mockClient.createWriteStream(any(CreateWriteStreamRequest.class))).thenReturn(stream); From 79279eb33e17bcd74fa38276abceaf65845908c1 Mon Sep 17 00:00:00 2001 From: Kirill Logachev Date: Wed, 22 Jul 2026 00:25:19 +0000 Subject: [PATCH 3/3] fix unittest --- .../bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java index dd859f770fd3..98b4bd1392a9 100644 --- a/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java +++ b/java-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcBulkInsertWriterTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.google.api.gax.core.NoCredentialsProvider; import com.google.cloud.bigquery.storage.v1.BigQueryWriteClient; import com.google.cloud.bigquery.storage.v1.BigQueryWriteSettings; import com.google.cloud.bigquery.storage.v1.CreateWriteStreamRequest; @@ -35,7 +36,10 @@ public class BigQueryJdbcBulkInsertWriterTest { @Test public void testInitializePassesClientToJsonStreamWriter() throws Exception { BigQueryWriteClient mockClient = mock(BigQueryWriteClient.class); - BigQueryWriteSettings mockSettings = BigQueryWriteSettings.newBuilder().build(); + BigQueryWriteSettings mockSettings = + BigQueryWriteSettings.newBuilder() + .setCredentialsProvider(NoCredentialsProvider.create()) + .build(); when(mockClient.getSettings()).thenReturn(mockSettings); WriteStream stream =