feat(jdbc): add HttpTransportOptions timeout configurations

Author: keshavdandeva

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

@@ -130,6 +130,8 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
   String sslTrustStorePassword;
   long maxBytesBilled;
   Map<String, String> labels;
+  Integer httpConnectTimeout;
+  Integer httpReadTimeout;
 
   BigQueryConnection(String url) throws IOException {
     this.connectionUrl = url;
@@ -271,11 +273,25 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
             BigQueryJdbcUrlUtility.SSL_TRUST_STORE_PWD_PROPERTY_NAME,
             null,
             this.connectionClassName);
+    this.httpConnectTimeout =
+        BigQueryJdbcUrlUtility.parseIntProperty(
+            url,
+            BigQueryJdbcUrlUtility.HTTP_CONNECT_TIMEOUT_PROPERTY_NAME,
+            BigQueryJdbcUrlUtility.DEFAULT_HTTP_CONNECT_TIMEOUT_VALUE,
+            this.connectionClassName);
+    this.httpReadTimeout =
+        BigQueryJdbcUrlUtility.parseIntProperty(
+            url,
+            BigQueryJdbcUrlUtility.HTTP_READ_TIMEOUT_PROPERTY_NAME,
+            BigQueryJdbcUrlUtility.DEFAULT_HTTP_READ_TIMEOUT_VALUE,
+            this.connectionClassName);
     this.httpTransportOptions =
         BigQueryJdbcProxyUtility.getHttpTransportOptions(
             proxyProperties,
             this.sslTrustStorePath,
             this.sslTrustStorePassword,
+            this.httpConnectTimeout,
+            this.httpReadTimeout,
             this.connectionClassName);
     this.transportChannelProvider =
         BigQueryJdbcProxyUtility.getTransportChannelProvider(
@@ -723,6 +739,14 @@ String getSSLTrustStorePassword() {
     return sslTrustStorePassword;
   }
 
+  Integer getHttpConnectTimeout() {
+    return httpConnectTimeout;
+  }
+
+  Integer getHttpReadTimeout() {
+    return httpReadTimeout;
+  }
+
   @Override
   public boolean isValid(int timeout) throws SQLException {
     if (timeout < 0) {

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

@@ -97,7 +97,8 @@ static Map<String, String> parseProxyProperties(String URL, String callerClassNa
         (proxyHost == null && proxyPort != null) || (proxyHost != null && proxyPort == null);
     if (isMissingProxyHostOrPortWhenProxySet) {
       throw new IllegalArgumentException(
-          "Both ProxyHost and ProxyPort parameters need to be specified. No defaulting behavior occurs.");
+          "Both ProxyHost and ProxyPort parameters need to be specified. No defaulting behavior"
+              + " occurs.");
     }
     boolean isMissingProxyUidOrPwdWhenAuthSet =
         (proxyUid == null && proxyPwd != null) || (proxyUid != null && proxyPwd == null);
@@ -117,18 +118,34 @@ static HttpTransportOptions getHttpTransportOptions(
       Map<String, String> proxyProperties,
       String sslTrustStorePath,
       String sslTrustStorePassword,
+      Integer connectTimeout,
+      Integer readTimeout,
       String callerClassName) {
     LOG.finest("++enter++\t" + callerClassName);
 
     if (!proxyProperties.containsKey(BigQueryJdbcUrlUtility.PROXY_HOST_PROPERTY_NAME)
-        && sslTrustStorePath == null) {
+        && sslTrustStorePath == null
+        && connectTimeout == null
+        && readTimeout == null) {
       return null;
     }
-    return HttpTransportOptions.newBuilder()
-        .setHttpTransportFactory(
-            getHttpTransportFactory(
-                proxyProperties, sslTrustStorePath, sslTrustStorePassword, callerClassName))
-        .build();
+
+    HttpTransportOptions.Builder httpTransportOptionsBuilder = HttpTransportOptions.newBuilder();
+    if (proxyProperties.containsKey(BigQueryJdbcUrlUtility.PROXY_HOST_PROPERTY_NAME)
+        || sslTrustStorePath != null) {
+      httpTransportOptionsBuilder.setHttpTransportFactory(
+          getHttpTransportFactory(
+              proxyProperties, sslTrustStorePath, sslTrustStorePassword, callerClassName));
+    }
+
+    if (connectTimeout != null) {
+      httpTransportOptionsBuilder.setConnectTimeout(connectTimeout);
+    }
+    if (readTimeout != null) {
+      httpTransportOptionsBuilder.setReadTimeout(readTimeout);
+    }
+
+    return httpTransportOptionsBuilder.build();
   }
 
   private static HttpTransportFactory getHttpTransportFactory(

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

@@ -98,6 +98,10 @@ final class BigQueryJdbcUrlUtility {
   static final String PROXY_PORT_PROPERTY_NAME = "ProxyPort";
   static final String PROXY_USER_ID_PROPERTY_NAME = "ProxyUid";
   static final String PROXY_PASSWORD_PROPERTY_NAME = "ProxyPwd";
+  static final String HTTP_CONNECT_TIMEOUT_PROPERTY_NAME = "HttpConnectTimeout";
+  static final String HTTP_READ_TIMEOUT_PROPERTY_NAME = "HttpReadTimeout";
+  static final int DEFAULT_HTTP_CONNECT_TIMEOUT_VALUE = 60000;
+  static final int DEFAULT_HTTP_READ_TIMEOUT_VALUE = 60000;
   static final boolean DEFAULT_ENABLE_HTAPI_VALUE = false;
   static final boolean DEFAULT_ENABLE_SESSION_VALUE = false;
   static final int DEFAULT_LOG_LEVEL = 0;
@@ -249,7 +253,8 @@ final class BigQueryJdbcUrlUtility {
                   BigQueryConnectionProperty.newBuilder()
                       .setName(OAUTH_SA_IMPERSONATION_CHAIN_PROPERTY_NAME)
                       .setDescription(
-                          "Comma separated list of service account emails in the impersonation chain.")
+                          "Comma separated list of service account emails in the impersonation"
+                              + " chain.")
                       .build(),
                   BigQueryConnectionProperty.newBuilder()
                       .setName(OAUTH_SA_IMPERSONATION_SCOPES_PROPERTY_NAME)
@@ -569,6 +574,18 @@ final class BigQueryJdbcUrlUtility {
                       .setDescription(
                           "The password for accessing the Java TrustStore that is specified using"
                               + " the property SSLTrustStore.")
+                      .build(),
+                  BigQueryConnectionProperty.newBuilder()
+                      .setName(HTTP_CONNECT_TIMEOUT_PROPERTY_NAME)
+                      .setDescription(
+                          "The timeout (in milliseconds) for establishing a connection to the"
+                              + " server.")
+                      .setDefaultValue(String.valueOf(DEFAULT_HTTP_CONNECT_TIMEOUT_VALUE))
+                      .build(),
+                  BigQueryConnectionProperty.newBuilder()
+                      .setName(HTTP_READ_TIMEOUT_PROPERTY_NAME)
+                      .setDescription("The timeout (in milliseconds) when reading from the server.")
+                      .setDefaultValue(String.valueOf(DEFAULT_HTTP_READ_TIMEOUT_VALUE))
                       .build())));
 
   private BigQueryJdbcUrlUtility() {}