refactor(jdbc): clean up redundant property lookups in UrlUtility

Author: keshavdandeva

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

@@ -39,10 +39,8 @@ class BigQueryPooledConnection implements PooledConnection {
   BigQueryPooledConnection(Connection bqConnection) {
     this.bqConnection = bqConnection;
     this.id = UUID.randomUUID().toString();
-    String connectionUrl = ((BigQueryConnection) bqConnection).getConnectionUrl();
-    if (connectionUrl != null && !connectionUrl.isEmpty()) {
-      this.listenerPoolSize =
-          BigQueryJdbcUrlUtility.parseListenerPoolSize(connectionUrl, this.toString());
+    if (bqConnection instanceof BigQueryConnection) {
+      this.listenerPoolSize = ((BigQueryConnection) bqConnection).getListenerPoolSize();
     }
     if (getListenerPoolSize() > 0L) {
       listeners = new LinkedBlockingDeque<>(getListenerPoolSize().intValue());

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

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

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

@@ -90,8 +90,8 @@ public void testInvalidTokenUriForAuthType0() {
             + "EndpointOverrides=OAuth2=brokenuri{};";
     Map<String, String> oauthProperties =
         BigQueryJdbcOAuthUtility.parseOAuthProperties(connectionString, null);
-    Map<String, String> overrideProperties =
-        BigQueryJdbcUrlUtility.parseOverrideProperties(connectionString, null);
+    Map<String, String> overrideProperties = new HashMap<>();
+    overrideProperties.put(BigQueryJdbcUrlUtility.OAUTH2_TOKEN_URI_PROPERTY_NAME, "brokenuri{}");
 
     try {
       BigQueryJdbcOAuthUtility.getCredentials(oauthProperties, overrideProperties, null);
@@ -234,8 +234,9 @@ public void testGenerateUserAuthURLOverrideOauthEndpoint() {
               + ";";
       Map<String, String> authProperties =
           BigQueryJdbcOAuthUtility.parseOAuthProperties(connectionString, null);
-      Map<String, String> overrideProperties =
-          BigQueryJdbcUrlUtility.parseOverrideProperties(connectionString, null);
+      Map<String, String> overrideProperties = new HashMap<>();
+      overrideProperties.put(
+          BigQueryJdbcUrlUtility.OAUTH2_TOKEN_URI_PROPERTY_NAME, overrideTokenSeverURI.toString());
 
       UserAuthorizer userAuthorizer =
           BigQueryJdbcOAuthUtility.getUserAuthorizer(
@@ -274,8 +275,10 @@ public void testParseOverridePropsForRefreshTokenAuth() {
 
       Map<String, String> authProperties =
           BigQueryJdbcOAuthUtility.parseOAuthProperties(connectionString, null);
-      Map<String, String> overrideProperties =
-          BigQueryJdbcUrlUtility.parseOverrideProperties(connectionString, null);
+      Map<String, String> overrideProperties = new HashMap<>();
+      overrideProperties.put(
+          BigQueryJdbcUrlUtility.OAUTH2_TOKEN_URI_PROPERTY_NAME,
+          "https://oauth2-private.p.googleapis.com/token");
 
       UserCredentials userCredentials =
           BigQueryJdbcOAuthUtility.getPreGeneratedRefreshTokenCredentials(
@@ -296,9 +299,8 @@ public void testParseBYOIDProps() {
             "jdbc:bigquery://https://www.googleapis.com/bigquery/v2:433;OAuthType=4;"
                 + "ProjectId=MyBigQueryProject;"
                 + "BYOID_AudienceUri=//iam.googleapis.com/locations/global/workforcePools/pool-id/providers/provider-id;"
-                + "BYOID_PoolUserProject=workforceProjectNumber;"
-                + "BYOID_CredentialSource={\"file\": \"C:\\\\Token.txt\"};"
-                + "BYOID_SA_Impersonation_Uri=testSA;"
+                + "BYOID_PoolUserProject=workforceProjectNumber;BYOID_CredentialSource={\"file\":"
+                + " \"C:\\\\Token.txt\"};BYOID_SA_Impersonation_Uri=testSA;"
                 + "BYOID_SubjectTokenType=urn:ietf:params:oauth:tokentype:jwt;"
                 + "BYOID_TokenUri=https://testuri.com/v1/token",
             null);