Merge pull request #22 from paleolimbot/complex-types

feat: Support complex and datetime types in WherobotsResultSet

Author: peterfoldes

lib/build.gradle

@@ -7,7 +7,7 @@
  */
 
 plugins {
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'com.gradleup.shadow' version '8.3.10'
     id 'java-library'
     id 'net.thebugmc.gradle.sonatype-central-portal-publisher' version '1.2.4'
     id 'signing'
@@ -59,8 +59,9 @@ dependencies {
     implementation 'io.github.resilience4j:resilience4j-retry:2.2.0'
     implementation 'org.slf4j:slf4j-simple:2.0.13'
     // Test dependencies
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.12.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.12.2'
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.12.2'
     testImplementation 'org.mockito:mockito-core:5.11.0'
     testImplementation 'org.mockito:mockito-junit-jupiter:5.11.0'
 }
@@ -91,6 +92,13 @@ signing {
 
 test {
     useJUnitPlatform()
+    jvmArgs += ["--add-opens=java.base/java.nio=ALL-UNNAMED"]
+    ["WHEROBOTS_API_KEY", "WHEROBOTS_HOST", "WHEROBOTS_SHUTDOWN_AFTER_INACTIVE_SECONDS"].each { key ->
+        def val = System.getenv(key)
+        if (val != null) {
+            environment key, val
+        }
+    }
 }
 
 // Run this task with `./gradlew runSmokeTest -Papikey=<your_api_key>`

lib/src/main/java/com/wherobots/db/jdbc/WherobotsJdbcDriver.java

@@ -35,6 +35,7 @@ public class WherobotsJdbcDriver implements Driver {
     public static final String VERSION_PROP = "version";
     public static final String SESSION_TYPE_PROP = "sessionType";
     public static final String FORCE_NEW_PROP = "forceNew";
+    public static final String SHUTDOWN_AFTER_INACTIVE_SECONDS_PROP = "shutdownAfterInactiveSeconds";
     public static final String WS_URI_PROP = "wsUri";
 
     // Results format; one of {@link DataFormat}
@@ -108,6 +109,12 @@ public Connection connect(String url, Properties info) throws SQLException {
             forceNew = Boolean.parseBoolean(forceNewStr);
         }
 
+        Integer shutdownAfterInactiveSeconds = null;
+        String shutdownStr = info.getProperty(SHUTDOWN_AFTER_INACTIVE_SECONDS_PROP);
+        if (StringUtils.isNotBlank(shutdownStr)) {
+            shutdownAfterInactiveSeconds = Integer.parseInt(shutdownStr);
+        }
+
         Map<String, String> headers = new HashMap<>(getAuthHeaders(info));
         headers.putAll(getUserAgentHeader());
         WherobotsSession session;
@@ -128,6 +135,7 @@ public Connection connect(String url, Properties info) throws SQLException {
                     version,
                     sessionType,
                     forceNew,
+                    shutdownAfterInactiveSeconds,
                     headers
             );
         }