Merge branch 'main' into PR #3942 to update

Author: lqiu96

google-cloud-bigquery-jdbc/pom.xml

@@ -48,6 +48,18 @@
         <version>3.5.2</version>
         <configuration>
           <skip>${skipSurefire}</skip>
+          <systemPropertyVariables>
+            <JDBC_TESTS>true</JDBC_TESTS>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <JDBC_TESTS>true</JDBC_TESTS>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
       <plugin>

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

@@ -17,12 +17,14 @@
 package com.google.cloud.bigquery.jdbc;
 
 import java.util.List;
+import java.util.function.Supplier;
 
 class BigQueryConnectionProperty {
 
   private final String name;
   private final String description;
   private final String defaultValue;
+  private final Supplier<String> defaultValueSupplier;
   private final List<String> validValues;
 
   public String getName() {
@@ -34,6 +36,9 @@ public String getDescription() {
   }
 
   public String getDefaultValue() {
+    if (defaultValueSupplier != null) {
+      return defaultValueSupplier.get();
+    }
     return defaultValue;
   }
 
@@ -43,6 +48,7 @@ public List<String> getValidValues() {
 
   BigQueryConnectionProperty(Builder builder) {
     this.name = builder.name;
+    this.defaultValueSupplier = builder.defaultValueSupplier;
     this.defaultValue = builder.defaultValue;
     this.description = builder.description;
     this.validValues = builder.validValues;
@@ -79,6 +85,7 @@ static final class Builder {
     private String name;
     private String description;
     private String defaultValue;
+    private Supplier<String> defaultValueSupplier = null;
     private List<String> validValues;
 
     private Builder(BigQueryConnectionProperty bigQueryConnectionProperty) {
@@ -105,6 +112,11 @@ Builder setDefaultValue(String defaultValue) {
       return this;
     }
 
+    Builder setLazyDefaultValue(Supplier<String> defaultValueSupplier) {
+      this.defaultValueSupplier = defaultValueSupplier;
+      return this;
+    }
+
     Builder setValidValues(List<String> validValues) {
       this.validValues = validValues;
       return this;

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

@@ -5208,8 +5208,13 @@ private List<String> getAccessibleCatalogNames() {
       accessibleCatalogs.add(primaryCatalog);
     }
 
-    List<String> additionalProjects = this.connection.getAdditionalProjects();
-    if (additionalProjects != null) {
+    String additionalProjectsStr = this.connection.getAdditionalProjects();
+    if (additionalProjectsStr != null && !additionalProjectsStr.trim().isEmpty()) {
+      List<String> additionalProjects =
+          com.google.common.base.Splitter.on(',')
+              .trimResults()
+              .omitEmptyStrings()
+              .splitToList(additionalProjectsStr);
       for (String project : additionalProjects) {
         if (project != null && !project.isEmpty()) {
           accessibleCatalogs.add(project);

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

@@ -130,19 +130,17 @@ public Connection connect(String url, Properties info) throws SQLException {
           throw new BigQueryJdbcException(e.getMessage(), e);
         }
 
+        DataSource ds = DataSource.fromUrl(connectionUri);
+
         // LogLevel
-        String logLevelStr =
-            BigQueryJdbcUrlUtility.parseUriProperty(
-                connectionUri, BigQueryJdbcUrlUtility.LOG_LEVEL_PROPERTY_NAME);
+        String logLevelStr = ds.getLogLevel();
         if (logLevelStr == null) {
           logLevelStr = System.getenv(BigQueryJdbcUrlUtility.LOG_LEVEL_ENV_VAR);
         }
         Level logLevel = BigQueryJdbcUrlUtility.parseLogLevel(logLevelStr);
 
         // LogPath
-        String logPath =
-            BigQueryJdbcUrlUtility.parseUriProperty(
-                connectionUri, BigQueryJdbcUrlUtility.LOG_PATH_PROPERTY_NAME);
+        String logPath = ds.getLogPath();
         if (logPath == null) {
           logPath = System.getenv(BigQueryJdbcUrlUtility.LOG_PATH_ENV_VAR);
         }
@@ -153,7 +151,7 @@ public Connection connect(String url, Properties info) throws SQLException {
         BigQueryJdbcRootLogger.setLevel(logLevel, logPath);
 
         // Logging starts from here.
-        BigQueryConnection connection = new BigQueryConnection(connectionUri);
+        BigQueryConnection connection = new BigQueryConnection(connectionUri, ds);
         LOG.info(
             "Driver info : { {Database Product Name : %s}, "
                 + "{Database Product Version : %s}, "
@@ -216,8 +214,10 @@ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) {
       driverProperty.description = prop.getDescription();
       propertyInfoList.add(driverProperty);
     }
+
+    DataSource ds = DataSource.fromUrl(connectionUri);
     Map<String, String> oAuthProperties =
-        BigQueryJdbcOAuthUtility.parseOAuthProperties(url, this.toString());
+        BigQueryJdbcOAuthUtility.parseOAuthProperties(ds, this.toString());
     for (Map.Entry<String, String> authProperty : oAuthProperties.entrySet()) {
       propertyInfoList.add(new DriverPropertyInfo(authProperty.getKey(), authProperty.getValue()));
     }