From 1f57522ec0dcc1127cd44460cd2544bdd541f8a6 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Wed, 17 Nov 2021 19:15:11 +0300
Subject: [PATCH] #13654 JDBC URL template usage redesign. Use it always when
 it is defined and enabled by driver

---
 .../src/io/cloudbeaver/WebServiceUtils.java                     | 2 +-
 .../src/io/cloudbeaver/model/WebDatabaseDriverConfig.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
index c10202aa72..2f8459a5a0 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
@@ -169,7 +169,7 @@ public class WebServiceUtils {
             if (config.getServerName() != null) {
                 dsConfig.setServerName(config.getServerName());
             }
-            dsConfig.setUrl(driver.getDataSourceProvider().getConnectionURL(driver, dsConfig));
+            dsConfig.setUrl(driver.getConnectionURL(dsConfig));
         }
         if (config.getProperties() != null) {
             Map<String, String> newProps = new LinkedHashMap<>();
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverConfig.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverConfig.java
index 361f178ab7..9e6300baae 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverConfig.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/WebDatabaseDriverConfig.java
@@ -171,7 +171,7 @@ public class WebDatabaseDriverConfig {
             cfg.setUrl(driver.getSampleURL());
             cfg.setHostName("localhost");
             cfg.setHostPort(driver.getDefaultPort());
-            cfg.setUrl(driver.getDataSourceProvider().getConnectionURL(driver, cfg));
+            cfg.setUrl(driver.getConnectionURL(cfg));
             DBPPropertyDescriptor[] properties = driver.getDataSourceProvider().getConnectionProperties(webSession.getProgressMonitor(), driver, cfg);
             if (properties == null) {
                 return new WebPropertyInfo[0];