chore: add missing default values

Author: keshavdandeva

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

@@ -40,6 +40,7 @@
 import com.google.cloud.bigquery.storage.v1.BigQueryWriteClient;
 import com.google.cloud.bigquery.storage.v1.BigQueryWriteSettings;
 import com.google.cloud.http.HttpTransportOptions;
+import com.google.common.base.Splitter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.CallableStatement;
@@ -52,6 +53,7 @@
 import java.sql.Statement;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.ConcurrentModificationException;
 import java.util.List;
 import java.util.Map;
@@ -244,8 +246,8 @@ public class BigQueryConnection extends BigQueryNoOpsConnection {
     String additionalProjectsStr = ds.getAdditionalProjects();
     this.additionalProjects =
         (additionalProjectsStr == null || additionalProjectsStr.isEmpty())
-            ? java.util.Collections.emptyList()
-            : java.util.Arrays.asList(additionalProjectsStr.split(","));
+            ? Collections.emptyList()
+            : Splitter.on(',').trimResults().omitEmptyStrings().splitToList(additionalProjectsStr);
 
     this.filterTablesOnDefaultDataset = ds.getFilterTablesOnDefaultDataset();
     this.requestGoogleDriveScope = ds.getRequestGoogleDriveScope();

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

@@ -134,7 +134,10 @@ protected boolean removeEldestEntry(Map.Entry<String, Map<String, String>> eldes
   static final String BYOID_POOL_USER_PROJECT_PROPERTY_NAME = "BYOID_PoolUserProject";
   static final String BYOID_SA_IMPERSONATION_URI_PROPERTY_NAME = "BYOID_SA_Impersonation_Uri";
   static final String BYOID_SUBJECT_TOKEN_TYPE_PROPERTY_NAME = "BYOID_SubjectTokenType";
+  static final String DEFAULT_BYOID_SUBJECT_TOKEN_TYPE_VALUE =
+      "urn:ietf:params:oauth:tokentype:id_token";
   static final String BYOID_TOKEN_URI_PROPERTY_NAME = "BYOID_TokenUri";
+  static final String DEFAULT_BYOID_TOKEN_URI_VALUE = "https://sts.googleapis.com/v1/token";
   static final String PARTNER_TOKEN_PROPERTY_NAME = "PartnerToken";
   private static final Pattern PARTNER_TOKEN_PATTERN =
       Pattern.compile(
@@ -513,7 +516,7 @@ protected boolean removeEldestEntry(Map.Entry<String, Map<String, String>> eldes
                               + " Corresponds\n"
                               + " to the subject_token_type property in the external account"
                               + " configuration file.")
-                      .setDefaultValue("urn:ietf:params:oauth:tokentype:id_token")
+                      .setDefaultValue(DEFAULT_BYOID_SUBJECT_TOKEN_TYPE_VALUE)
                       .build(),
                   BigQueryConnectionProperty.newBuilder()
                       .setName(BYOID_TOKEN_URI_PROPERTY_NAME)
@@ -523,7 +526,7 @@ protected boolean removeEldestEntry(Map.Entry<String, Map<String, String>> eldes
                               + " tokens. Corresponds to the token_url property in the external"
                               + " account\n"
                               + " configuration file.")
-                      .setDefaultValue("https://sts.googleapis.com/v1/token")
+                      .setDefaultValue(DEFAULT_BYOID_TOKEN_URI_VALUE)
                       .build(),
                   BigQueryConnectionProperty.newBuilder()
                       .setName(PARTNER_TOKEN_PROPERTY_NAME)
@@ -839,7 +842,7 @@ static Map<String, String> parsePropertiesMapFromValue(
     }
     Map<String, String> propertiesMap = new HashMap<>();
     for (String keyValuePair : Splitter.on(",").split(propertiesString)) {
-      List<String> parts = Splitter.on("=").splitToList(keyValuePair);
+      List<String> parts = Splitter.on("=").limit(2).splitToList(keyValuePair);
       if (parts.size() == 2) {
         propertiesMap.put(parts.get(0), parts.get(1));
       } else {

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

@@ -1182,15 +1182,19 @@ public void setByoidSAImpersonationUri(String byoidSAImpersonationUri) {
   }
 
   public String getByoidSubjectTokenType() {
-    return byoidSubjectTokenType;
+    return byoidSubjectTokenType != null
+        ? byoidSubjectTokenType
+        : BigQueryJdbcUrlUtility.DEFAULT_BYOID_SUBJECT_TOKEN_TYPE_VALUE;
   }
 
   public void setByoidSubjectTokenType(String byoidSubjectTokenType) {
     this.byoidSubjectTokenType = byoidSubjectTokenType;
   }
 
   public String getByoidTokenUri() {
-    return byoidTokenUri;
+    return byoidTokenUri != null
+        ? byoidTokenUri
+        : BigQueryJdbcUrlUtility.DEFAULT_BYOID_TOKEN_URI_VALUE;
   }
 
   public void setByoidTokenUri(String byoidTokenUri) {

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

@@ -40,17 +40,7 @@ public PooledConnection getPooledConnection() throws SQLException {
       throw new BigQueryJdbcRuntimeException(
           "Cannot get pooled connection: unable to get underlying physical connection");
     }
-    Long connectionPoolSize = this.getConnectionPoolSize();
-    if (connectionPoolSize != null
-        && connectionPoolSize == BigQueryJdbcUrlUtility.DEFAULT_CONNECTION_POOL_SIZE_VALUE) {
-      String connectionURl = ((BigQueryConnection) bqConnection).getConnectionUrl();
-      String parsedValue =
-          BigQueryJdbcUrlUtility.parseUriProperty(
-              connectionURl, BigQueryJdbcUrlUtility.CONNECTION_POOL_SIZE_PROPERTY_NAME);
-      if (parsedValue != null) {
-        connectionPoolSize = Long.parseLong(parsedValue);
-      }
-    }
+    Long connectionPoolSize = ((BigQueryConnection) bqConnection).getConnectionPoolSize();
     if (connectionPoolManager == null) {
       connectionPoolManager = new PooledConnectionListener(connectionPoolSize);
     }