Skip to content

feat(bigquery-jdbc): respect standard JVM trustStore properties by default #13435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keshavdandeva merged 12 commits into from
Jun 23, 2026
Merged

feat(bigquery-jdbc): respect standard JVM trustStore properties by default #13435

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6722f91
feat(bigquery-jdbc): respect JVM trustStore properties and default to…
keshavdandeva Jun 11, 2026
54b2c0c
simplify logic
keshavdandeva Jun 11, 2026
ce6f7fc
revert changes
keshavdandeva Jun 11, 2026
cf3dcd6
Merge branch 'main' into jdbc/add-jvm-trustStore-support
keshavdandeva Jun 11, 2026
1de12aa
address pr review
keshavdandeva Jun 11, 2026
0f696a3
remove `final`
keshavdandeva Jun 12, 2026
6beeb25
Merge branch 'main' into jdbc/add-jvm-trustStore-support
keshavdandeva Jun 12, 2026
16713a8
add integration test
keshavdandeva Jun 12, 2026
c7d1bae
Merge branch 'main' into jdbc/add-jvm-trustStore-support
keshavdandeva Jun 12, 2026
09c4ac8
make resource as classpath instead of hardcoding path
keshavdandeva Jun 12, 2026
898f091
address pr feedback
keshavdandeva Jun 12, 2026
168a5d4
Merge branch 'main' into jdbc/add-jvm-trustStore-support
keshavdandeva Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions ...-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcProxyUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import com.google.api.client.http.HttpTransport;
import com.google.api.client.http.apache.v5.Apache5HttpTransport;
import com.google.api.client.http.javanet.NetHttpTransport;
import com.google.api.gax.rpc.TransportChannelProvider;
import com.google.auth.http.HttpTransportFactory;
import com.google.cloud.bigquery.exception.BigQueryJdbcRuntimeException;
Expand Down Expand Up @@ -136,17 +137,15 @@ static HttpTransportOptions getHttpTransportOptions(
boolean hasProxyOrSsl =
proxyProperties.containsKey(BigQueryJdbcUrlUtility.PROXY_HOST_PROPERTY_NAME)
|| sslTrustStorePath != null;
boolean hasTimeoutConfig = connectTimeout != null || readTimeout != null;

if (!hasProxyOrSsl && !hasTimeoutConfig) {
return null;
}

HttpTransportOptions.Builder httpTransportOptionsBuilder = HttpTransportOptions.newBuilder();
if (hasProxyOrSsl) {
httpTransportOptionsBuilder.setHttpTransportFactory(
getHttpTransportFactory(
proxyProperties, sslTrustStorePath, sslTrustStorePassword, callerClassName));
} else {
final HttpTransport defaultTransport = new NetHttpTransport.Builder().build();

@logachev logachev Jun 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why using final here?

@keshavdandeva keshavdandeva Jun 12, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed. It was originally added because the variable is captured by a lambda, but since it is effectively final, the final keyword is redundant.

httpTransportOptionsBuilder.setHttpTransportFactory(() -> defaultTransport);
}

if (connectTimeout != null) {
Expand Down Expand Up @@ -178,9 +177,8 @@ private static HttpTransportFactory getHttpTransportFactory(
HttpRoutePlanner httpRoutePlanner = new DefaultProxyRoutePlanner(proxyHostDetails);
httpClientBuilder.setRoutePlanner(httpRoutePlanner);
addAuthToProxyIfPresent(proxyProperties, httpClientBuilder, callerClassName);
} else {
httpClientBuilder.useSystemProperties();
}
httpClientBuilder.useSystemProperties();

if (sslTrustStorePath != null) {
try (FileInputStream trustStoreStream = new FileInputStream(sslTrustStorePath)) {
Expand Down
10 changes: 6 additions & 4 deletions ...query-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcProxyUtilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public void testGetHttpTransportOptionsWithNonAuthenticatedProxy() {
}

@Test
public void testGetHttpTransportOptionsWithNoProxySettingsReturnsNull() {
public void testGetHttpTransportOptionsWithNoProxySettingsReturnsDefaultOptions() {
String connection_uri =
"jdbc:bigquery://https://www.googleapis.com/bigquery/v2:443;"
+ "ProjectId=TestProject"
Expand All @@ -172,7 +172,8 @@ public void testGetHttpTransportOptionsWithNoProxySettingsReturnsNull() {
HttpTransportOptions result =
BigQueryJdbcProxyUtility.getHttpTransportOptions(
proxyProperties, null, null, null, null, "TestClass");
assertNull(result);
assertNotNull(result);
assertNotNull(result.getHttpTransportFactory());
}

private String getTestResourcePath(String resourceName) throws URISyntaxException {
Expand Down Expand Up @@ -299,11 +300,12 @@ public void testGetTransportChannelProvider_noProxyNoSsl_returnsNull() {
}

@Test
public void testGetHttpTransportOptions_noProxyNoSsl_returnsNull() {
public void testGetHttpTransportOptions_noProxyNoSsl_returnsDefaultOptions() {
HttpTransportOptions options =
BigQueryJdbcProxyUtility.getHttpTransportOptions(
Collections.<String, String>emptyMap(), null, null, null, null, "TestClass");
assertNull(options);
assertNotNull(options);
assertNotNull(options.getHttpTransportFactory());
}

@Test
Expand Down
Loading