Add jdbc URL helper to tests

Author: alex268

src/test/java/tech/ydb/jdbc/YdbDriverIntegrationTest.java

@@ -11,6 +11,7 @@
 
 import tech.ydb.jdbc.connection.YdbConnectionImpl;
 import tech.ydb.jdbc.connection.YdbContext;
+import tech.ydb.jdbc.impl.helper.JdbcUrlHelper;
 import tech.ydb.test.junit5.YdbHelperExtension;
 
 /**
@@ -21,27 +22,11 @@ public class YdbDriverIntegrationTest {
     @RegisterExtension
     private static final YdbHelperExtension ydb = new YdbHelperExtension();
 
-    private static String jdbcURL(String... extras) {
-        StringBuilder jdbc = new StringBuilder("jdbc:ydb:")
-                .append(ydb.useTls() ? "grpcs://" : "grpc://")
-                .append(ydb.endpoint())
-                .append(ydb.database())
-                .append("?");
-
-        if (ydb.authToken() != null) {
-            jdbc.append("token=").append(ydb.authToken()).append("&");
-        }
-
-        for (String extra: extras) {
-            jdbc.append(extra).append("=").append(extra).append("&");
-        }
-
-        return jdbc.toString();
-    }
+    private static final JdbcUrlHelper jdbcURL = new JdbcUrlHelper(ydb);
 
     @Test
     public void connect() throws SQLException {
-        try (Connection connection = DriverManager.getConnection(jdbcURL())) {
+        try (Connection connection = DriverManager.getConnection(jdbcURL.build())) {
             Assertions.assertTrue(connection instanceof YdbConnectionImpl);
 
             YdbConnection unwrapped = connection.unwrap(YdbConnection.class);
@@ -54,7 +39,7 @@ public void connect() throws SQLException {
     @Test
     public void testContextCache() throws SQLException {
         YdbContext ctx;
-        try (Connection conn1 = DriverManager.getConnection(jdbcURL())) {
+        try (Connection conn1 = DriverManager.getConnection(jdbcURL.build())) {
             Assertions.assertTrue(conn1.isValid(5000));
 
             YdbConnection unwrapped = conn1.unwrap(YdbConnection.class);
@@ -63,7 +48,7 @@ public void testContextCache() throws SQLException {
             ctx = unwrapped.getCtx();
         }
 
-        try (Connection conn2 = DriverManager.getConnection(jdbcURL())) {
+        try (Connection conn2 = DriverManager.getConnection(jdbcURL.build())) {
             Assertions.assertTrue(conn2.isValid(5000));
 
             YdbConnection unwrapped = conn2.unwrap(YdbConnection.class);
@@ -72,7 +57,7 @@ public void testContextCache() throws SQLException {
         }
 
         Properties props = new Properties();
-        try (Connection conn3 = DriverManager.getConnection(jdbcURL(), props)) {
+        try (Connection conn3 = DriverManager.getConnection(jdbcURL.build(), props)) {
             Assertions.assertTrue(conn3.isValid(5000));
 
             YdbConnection unwrapped = conn3.unwrap(YdbConnection.class);
@@ -81,15 +66,15 @@ public void testContextCache() throws SQLException {
         }
 
         props.setProperty("TEST_KEY", "TEST_VALUE");
-        try (Connection conn4 = DriverManager.getConnection(jdbcURL(), props)) {
+        try (Connection conn4 = DriverManager.getConnection(jdbcURL.build(), props)) {
             Assertions.assertTrue(conn4.isValid(5000));
 
             YdbConnection unwrapped = conn4.unwrap(YdbConnection.class);
             Assertions.assertNotNull(unwrapped.getCtx());
             Assertions.assertNotSame(ctx, unwrapped.getCtx());
         }
 
-        try (Connection conn5 = DriverManager.getConnection(jdbcURL("test"))) {
+        try (Connection conn5 = DriverManager.getConnection(jdbcURL.withArg("test", "false").build())) {
             Assertions.assertTrue(conn5.isValid(5000));
 
             YdbConnection unwrapped = conn5.unwrap(YdbConnection.class);
@@ -102,7 +87,7 @@ public void testContextCache() throws SQLException {
             YdbDriver.register();
         }
 
-        try (Connection conn6 = DriverManager.getConnection(jdbcURL())) {
+        try (Connection conn6 = DriverManager.getConnection(jdbcURL.build())) {
             Assertions.assertTrue(conn6.isValid(5000));
 
             YdbConnection unwrapped = conn6.unwrap(YdbConnection.class);

src/test/java/tech/ydb/jdbc/impl/helper/JdbcConnectionExtention.java

@@ -24,13 +24,16 @@ public class JdbcConnectionExtention implements
         BeforeEachCallback, BeforeAllCallback, AfterEachCallback, AfterAllCallback {
 
     private final YdbHelperExtension ydb;
-    private final boolean autoCommit;
+    private final JdbcUrlHelper jdbcURL;
+
     private final Map<ExtensionContext, Connection> map = new HashMap<>();
     private final Stack<Connection> stack = new Stack<>();
 
     public JdbcConnectionExtention(YdbHelperExtension ydb, boolean autoCommit) {
         this.ydb = ydb;
-        this.autoCommit = autoCommit;
+        this.jdbcURL = new JdbcUrlHelper(ydb)
+                .withArg("failOnTruncatedResult", "true")
+                .withArg("autoCommit", String.valueOf(autoCommit));
     }
 
     public JdbcConnectionExtention(YdbHelperExtension ydb) {
@@ -54,27 +57,14 @@ private void unregister(ExtensionContext ctx) throws SQLException {
     }
 
     public String jdbcURL() {
-        StringBuilder jdbc = new StringBuilder("jdbc:ydb:")
-                .append(ydb.useTls() ? "grpcs://" : "grpc://")
-                .append(ydb.endpoint())
-                .append(ydb.database())
-                .append("?autoCommit=")
-                .append(autoCommit)
-                .append("&failOnTruncatedResult=true");
-
-        if (ydb.authToken() != null) {
-            jdbc.append("&token=").append(ydb.authToken());
-        }
-
-        return jdbc.toString();
+        return jdbcURL.build();
     }
 
     public Connection connection() {
         Assert.assertFalse("Retrive connection before initialization", stack.isEmpty());
         return stack.peek();
     }
 
-
     @Override
     public void beforeEach(ExtensionContext ctx) throws Exception {
         register(ctx);

src/test/java/tech/ydb/jdbc/impl/helper/JdbcUrlHelper.java

@@ -0,0 +1,45 @@
+package tech.ydb.jdbc.impl.helper;
+
+
+import tech.ydb.test.junit5.YdbHelperExtension;
+
+/**
+ *
+ * @author Aleksandr Gorshenin
+ */
+public class JdbcUrlHelper {
+    private final YdbHelperExtension ydb;
+    private final String extra;
+
+    public JdbcUrlHelper(YdbHelperExtension ydb) {
+        this.ydb = ydb;
+        this.extra = "";
+    }
+
+    private JdbcUrlHelper(JdbcUrlHelper other, String extra) {
+        this.ydb = other.ydb;
+        this.extra = other.extra.isEmpty() ? extra : other.extra +  "&" + extra;
+    }
+
+    public JdbcUrlHelper withArg(String arg, String value) {
+        return new JdbcUrlHelper(this, arg + "=" + value);
+    }
+
+    public String build() {
+        StringBuilder jdbc = new StringBuilder("jdbc:ydb:")
+                .append(ydb.useTls() ? "grpcs://" : "grpc://")
+                .append(ydb.endpoint())
+                .append(ydb.database());
+
+        char splitter = '?';
+        if (ydb.authToken() != null) {
+            jdbc.append(splitter).append("token=").append(ydb.authToken());
+            splitter = '&';
+        }
+        if (!extra.isEmpty()) {
+            jdbc.append(splitter).append(extra);
+        }
+
+        return jdbc.toString();
+    }
+}