dbeaver/dbeaver#38710 simplified check

Author: Nexus6v2

com.dbeaver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlConstants.java

@@ -21,9 +21,8 @@
 public class LibSqlConstants {
 
     public static final String CONNECTION_URL_EXAMPLES = "jdbc:dbeaver:libsql:<hostname>, libsql://<hostname>";
-    public static final String CONNECTION_PROTOCOLS_REGEXP = "jdbc:dbeaver:libsql:(http(s)?://)?(libsql://)?|libsql://";
     public static final Pattern CONNECTION_URL_PATTERN =
-        Pattern.compile("(" + CONNECTION_PROTOCOLS_REGEXP + ")[a-z0-9:.-]+");
+        Pattern.compile("(jdbc:dbeaver:libsql:)?(libsql://)?[a-z0-9/:.-]+");
 
     public static final int DRIVER_VERSION_MAJOR = 1;
     public static final int DRIVER_VERSION_MINOR = 0;

com.dbeaver.jdbc.driver.libsql/src/main/java/com/dbeaver/jdbc/driver/libsql/LibSqlDriver.java

@@ -49,10 +49,9 @@ public Connection connect(String url, Properties info) throws SQLException {
                 ".\nExpected URL formats: " + LibSqlConstants.CONNECTION_URL_EXAMPLES);
         }
 
-        String targetUrl = url.replace("jdbc:dbeaver:libsql:", "");
-        if (!targetUrl.startsWith("http")) {
-            targetUrl = matcher.group(0)
-                .replaceAll(LibSqlConstants.CONNECTION_PROTOCOLS_REGEXP, "https://");
+        String targetUrl = url.replaceFirst("jdbc:dbeaver:libsql:", "");
+        if (targetUrl.startsWith("libsql://")) {
+            targetUrl = targetUrl.replaceFirst("libsql://", "https://");
         }
 
         Map<String, Object> props = new LinkedHashMap<>();

com.dbeaver.jdbc.driver.libsql/src/test/java/com/dbeaver/jdbc/upd/driver/test/LibSqlDriverTest.java

@@ -16,7 +16,13 @@
  */
 package com.dbeaver.jdbc.upd.driver.test;
 
+import com.dbeaver.jdbc.driver.libsql.LibSqlConnection;
+import com.dbeaver.jdbc.driver.libsql.LibSqlDriver;
+
 import java.sql.*;
+import java.util.Collections;
+import java.util.Hashtable;
+import java.util.Properties;
 
 public class LibSqlDriverTest {
     /**
@@ -25,11 +31,33 @@ public class LibSqlDriverTest {
      * @param args mvn exec:java "-Dexec.args=database-url [token]"
      */
     public static void main(String[] args) throws Exception {
+//        String databaseUrl = args[0];
+//        String token = args.length > 1 ? args[1] : null;
+//        runBasicQuery(databaseUrl, token);
+
+        var driver = new LibSqlDriver();
+        assertConnectionUrl(driver,
+            "jdbc:dbeaver:libsql:localhost",
+            "https://localhost"
+        );
+//        assertConnectionUrl(driver,
+//            "jdbc:dbeaver:libsql:localhost:8080",
+//            "https://localhost:8080"
+//        );
+//        assertConnectionUrl(driver,
+//            "jdbc:dbeaver:libsql:http://localhost:8080",
+//            "http://localhost:8080"
+//        );
+//        assertConnectionUrl(driver,
+//            "jdbc:dbeaver:libsql:http://localhost:8080",
+//            "http://localhost:8080"
+//        );
+    }
+
+    private static void runBasicQuery(String databaseUrl, String token) throws Exception {
         long startTime = System.currentTimeMillis();
 
         try {
-            String databaseUrl = args[0];
-            String token = args.length > 1 ? args[1] : null;
             try (Connection connection = DriverManager.getConnection("jdbc:dbeaver:libsql:" + databaseUrl, null, token)) {
                 DatabaseMetaData metaData = connection.getMetaData();
                 System.out.println("Driver: " + metaData.getDriverName());
@@ -84,4 +112,11 @@ private static void printResultSet(ResultSet dbResults) throws SQLException {
             System.out.println();
         }
     }
+
+    private static void assertConnectionUrl(LibSqlDriver driver, String input, String output) throws SQLException {
+        Connection connection = driver.connect(input, new Properties());
+        assert connection instanceof LibSqlConnection;
+        LibSqlConnection libSqlConnection = (LibSqlConnection) connection;
+        assert libSqlConnection.getUrl().equals(output);
+    }
 }