fix(HikariCP:6.0.0): resolve test failures (#602)

* fix(HikariCP:6.0.0): resolve test failures
- Added GraalVM native agent configuration with conditional mode
- Included
- Updated  to include  and
- Regenerated GraalVM metadata

* remove JNI config

* Clean up GraalVM metadata for HikariCP 6.0.0 tests
- Removed unnecessary "jni-config.json"; the test failure was unrelated to JNI and was caused by missing reflection metadata for "HikariConfig#getCredentials()".
- Trimmed "reflect-config.json" by removing "getExceptionOverride()" which is not accessed reflectively; confirmed the test still passes after removal.

Author: erguiti-imane

metadata/com.zaxxer/HikariCP/6.0.0/index.json

@@ -0,0 +1,4 @@
+[
+  "proxy-config.json",
+  "reflect-config.json"
+]

metadata/com.zaxxer/HikariCP/6.0.0/proxy-config.json

@@ -0,0 +1,6 @@
+[
+  {
+    "condition":{"typeReachable":"com.zaxxer.hikari.pool.ProxyConnection$ClosedConnection"},
+    "interfaces":["java.sql.Connection"]
+  }
+]

metadata/com.zaxxer/HikariCP/6.0.0/reflect-config.json

@@ -0,0 +1,35 @@
+[
+{
+  "condition":{"typeReachable":"com.zaxxer.hikari.util.ConcurrentBag"},
+  "name":"[Lcom.zaxxer.hikari.util.ConcurrentBag$IConcurrentBagEntry;"
+},
+{
+  "condition":{"typeReachable":"com.zaxxer.hikari.pool.PoolEntry"},
+  "name":"[Ljava.sql.Statement;"
+},
+{
+  "condition":{"typeReachable":"com.zaxxer.hikari.HikariConfig"},
+  "name":"com.zaxxer.hikari.HikariConfig",
+  "allDeclaredFields":true
+},
+{
+  "condition":{"typeReachable":"com.zaxxer.hikari.pool.HikariPool$HouseKeeper"},
+  "name":"com.zaxxer.hikari.pool.PoolBase",
+  "fields":[{"name":"catalog"}]
+},
+{
+  "condition":{"typeReachable":"com.zaxxer.hikari.pool.PoolEntry"},
+  "name":"com.zaxxer.hikari.pool.PoolEntry",
+  "fields":[{"name":"state"}]
+},
+{
+  "condition":{"typeReachable":"com.zaxxer.hikari.HikariConfig"},
+  "name":"com.zaxxer.hikaricp.test.driver.CustomDriver",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "condition":{"typeReachable":"com.zaxxer.hikari.util.DriverDataSource"},
+  "name":"com.zaxxer.hikaricp.test.driver.CustomDriver",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+}
+]

metadata/com.zaxxer/HikariCP/index.json

@@ -1,11 +1,18 @@
 [
   {
-    "metadata-version" : "5.0.1",
-    "tested-versions" : [
+    "metadata-version": "5.0.1",
+    "tested-versions": [
       "5.0.1",
       "5.1.0"
     ],
-    "latest" : true,
-    "module" : "com.zaxxer:HikariCP"
+    "module": "com.zaxxer:HikariCP"
+  },
+  {
+    "latest": true,
+    "metadata-version": "6.0.0",
+    "module": "com.zaxxer:HikariCP",
+    "tested-versions": [
+      "6.0.0"
+    ]
   }
 ]

tests/src/com.zaxxer/HikariCP/6.0.0/.gitignore

@@ -0,0 +1,4 @@
+gradlew.bat
+gradlew
+gradle/
+build/

tests/src/com.zaxxer/HikariCP/6.0.0/build.gradle

@@ -0,0 +1,33 @@
+/*
+ * Copyright and related rights waived via CC0
+ *
+ * You should have received a copy of the CC0 legalcode along with this
+ * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+plugins {
+    id "org.graalvm.internal.tck"
+}
+
+String libraryVersion = tck.testedLibraryVersion.get()
+
+dependencies {
+    testImplementation "com.zaxxer:HikariCP:$libraryVersion"
+    testImplementation 'org.assertj:assertj-core:3.22.0'
+}
+
+graalvmNative {
+    agent {
+        defaultMode = "conditional"
+        modes {
+            conditional {
+                userCodeFilterPath = "user-code-filter.json"
+            }
+        }
+        metadataCopy {
+            mergeWithExisting = true
+            inputTaskNames.add("test")
+            outputDirectories.add("src/test/resources/META-INF/native-image/com.zaxxer/HikariCP")
+        }
+    }
+}

tests/src/com.zaxxer/HikariCP/6.0.0/gradle.properties

@@ -0,0 +1,2 @@
+library.version = 6.0.0
+metadata.dir = com.zaxxer/HikariCP/6.0.0/

tests/src/com.zaxxer/HikariCP/6.0.0/settings.gradle

@@ -0,0 +1,13 @@
+pluginManagement {
+    def tckPath = Objects.requireNonNullElse(
+            System.getenv("GVM_TCK_TCKDIR"),
+            "../../../../tck-build-logic"
+    )
+    includeBuild(tckPath)
+}
+
+plugins {
+    id "org.graalvm.internal.tck-settings" version "1.0.0-SNAPSHOT"
+}
+
+rootProject.name = 'com.zaxxer.HikariCP_tests'

tests/src/com.zaxxer/HikariCP/6.0.0/src/test/java/com/zaxxer/hikaricp/test/HikariCPTest.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright and related rights waived via CC0
+ *
+ * You should have received a copy of the CC0 legalcode along with this
+ * work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+
+package com.zaxxer.hikaricp.test;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+import com.zaxxer.hikaricp.test.driver.CustomDriver;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+public class HikariCPTest {
+    @Test
+    void test() throws SQLException {
+        HikariConfig config = new HikariConfig();
+
+        config.setAutoCommit(false);
+        config.setConnectionTimeout(1000);
+        config.setMaximumPoolSize(10);
+        config.setDriverClassName(CustomDriver.class.getName());
+        config.setJdbcUrl("jdbc:custom:foo");
+        config.setUsername("bart");
+        config.setPassword("51mp50n");
+        config.addDataSourceProperty("cachePrepStmts", "true");
+        config.addDataSourceProperty("prepStmtCacheSize", "250");
+        config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
+
+        try (HikariDataSource ds = new HikariDataSource(config)) {
+            for (int i = 0; i < 10; i++) {
+                try (Connection connection = ds.getConnection()) {
+                    assertNotNull(connection);
+                }
+            }
+        }
+
+    }
+}