chore: address gemini pr review comments

Author: keshavdandeva

google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryConnection.java

@@ -277,13 +277,13 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
         BigQueryJdbcUrlUtility.parseIntProperty(
             url,
             BigQueryJdbcUrlUtility.HTTP_CONNECT_TIMEOUT_PROPERTY_NAME,
-            BigQueryJdbcUrlUtility.DEFAULT_HTTP_CONNECT_TIMEOUT_VALUE,
+            null,
             this.connectionClassName);
     this.httpReadTimeout =
         BigQueryJdbcUrlUtility.parseIntProperty(
             url,
             BigQueryJdbcUrlUtility.HTTP_READ_TIMEOUT_PROPERTY_NAME,
-            BigQueryJdbcUrlUtility.DEFAULT_HTTP_READ_TIMEOUT_VALUE,
+            null,
             this.connectionClassName);
     this.httpTransportOptions =
         BigQueryJdbcProxyUtility.getHttpTransportOptions(

google-cloud-bigquery-jdbc/src/main/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcProxyUtility.java

@@ -123,26 +123,31 @@ static HttpTransportOptions getHttpTransportOptions(
       String callerClassName) {
     LOG.finest("++enter++\t" + callerClassName);
 
-    if (!proxyProperties.containsKey(BigQueryJdbcUrlUtility.PROXY_HOST_PROPERTY_NAME)
-        && sslTrustStorePath == null
-        && connectTimeout == null
-        && readTimeout == null) {
+    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 (proxyProperties.containsKey(BigQueryJdbcUrlUtility.PROXY_HOST_PROPERTY_NAME)
-        || sslTrustStorePath != null) {
+    if (hasProxyOrSsl) {
       httpTransportOptionsBuilder.setHttpTransportFactory(
           getHttpTransportFactory(
               proxyProperties, sslTrustStorePath, sslTrustStorePassword, callerClassName));
     }
 
-    if (connectTimeout != null) {
-      httpTransportOptionsBuilder.setConnectTimeout(connectTimeout);
-    }
-    if (readTimeout != null) {
-      httpTransportOptionsBuilder.setReadTimeout(readTimeout);
+    if (hasTimeoutConfig) {
+      httpTransportOptionsBuilder.setConnectTimeout(
+          connectTimeout != null
+              ? connectTimeout
+              : BigQueryJdbcUrlUtility.DEFAULT_HTTP_CONNECT_TIMEOUT_VALUE);
+      httpTransportOptionsBuilder.setReadTimeout(
+          readTimeout != null
+              ? readTimeout
+              : BigQueryJdbcUrlUtility.DEFAULT_HTTP_READ_TIMEOUT_VALUE);
     }
 
     return httpTransportOptionsBuilder.build();

google-cloud-bigquery-jdbc/src/test/java/com/google/cloud/bigquery/jdbc/BigQueryJdbcProxyUtilityTest.java

@@ -323,5 +323,18 @@ public void testGetHttpTransportOptions_withConnectTimeoutOnly_returnsOptions()
             Collections.<String, String>emptyMap(), null, null, 10000, null, "TestClass");
     assertNotNull(options);
     assertThat(options.getConnectTimeout()).isEqualTo(10000);
+    assertThat(options.getReadTimeout())
+        .isEqualTo(BigQueryJdbcUrlUtility.DEFAULT_HTTP_READ_TIMEOUT_VALUE);
+  }
+
+  @Test
+  public void testGetHttpTransportOptions_withReadTimeoutOnly_returnsOptions() {
+    HttpTransportOptions options =
+        BigQueryJdbcProxyUtility.getHttpTransportOptions(
+            Collections.<String, String>emptyMap(), null, null, null, 20000, "TestClass");
+    assertNotNull(options);
+    assertThat(options.getReadTimeout()).isEqualTo(20000);
+    assertThat(options.getConnectTimeout())
+        .isEqualTo(BigQueryJdbcUrlUtility.DEFAULT_HTTP_CONNECT_TIMEOUT_VALUE);
   }
 }