Provide metadata for MariaDB Java Client 3.5.2 (#612)

wilkinsona · web-flow · commit 9d4f07f8fd85 · 2025-05-26T10:31:24.000+02:00
Due to the changes in [1], mariadb-java-client now requires reflective access to all of the methods on Configuration$Builder in addition to its fields. [1] mariadb-corporation/mariadb-connector-j@ca5057c
diff --git a/metadata/org.mariadb.jdbc/mariadb-java-client/3.5.2/index.json b/metadata/org.mariadb.jdbc/mariadb-java-client/3.5.2/index.json
@@ -0,0 +1,4 @@
+[
+  "reflect-config.json",
+  "resource-config.json"
+]
diff --git a/metadata/org.mariadb.jdbc/mariadb-java-client/3.5.2/reflect-config.json b/metadata/org.mariadb.jdbc/mariadb-java-client/3.5.2/reflect-config.json
@@ -0,0 +1,29 @@
+[
+  {
+    "condition": {
+      "typeReachable": "org.mariadb.jdbc.Configuration"
+    },
+    "name": "org.mariadb.jdbc.Configuration",
+    "allDeclaredFields": true
+  },
+  {
+    "condition": {
+      "typeReachable": "org.mariadb.jdbc.Configuration"
+    },
+    "name": "org.mariadb.jdbc.Configuration$Builder",
+    "allDeclaredFields": true,
+    "allPublicMethods": true
+  },
+  {
+    "condition": {
+      "typeReachable": "org.mariadb.jdbc.plugin.authentication.standard.NativePasswordPlugin"
+    },
+    "name": "sun.security.provider.SHA",
+    "methods": [
+      {
+        "name": "<init>",
+        "parameterTypes": []
+      }
+    ]
+  }
+]
diff --git a/metadata/org.mariadb.jdbc/mariadb-java-client/3.5.2/resource-config.json b/metadata/org.mariadb.jdbc/mariadb-java-client/3.5.2/resource-config.json
@@ -0,0 +1,13 @@
+{
+  "bundles": [],
+  "resources": {
+    "includes": [
+      {
+        "condition": {
+          "typeReachable": "org.mariadb.jdbc.util.VersionFactory"
+        },
+        "pattern": "\\Qmariadb.properties\\E"
+      }
+    ]
+  }
+}
diff --git a/metadata/org.mariadb.jdbc/mariadb-java-client/index.json b/metadata/org.mariadb.jdbc/mariadb-java-client/index.json
@@ -25,6 +25,13 @@
       "3.5.0",
       "3.5.1"
     ],
+    "module" : "org.mariadb.jdbc:mariadb-java-client"
+  },
+  {
+    "metadata-version" : "3.5.2",
+    "tested-versions" : [
+      "3.5.2"
+    ],
     "latest" : true,
     "module" : "org.mariadb.jdbc:mariadb-java-client"
   }
diff --git a/tests/src/index.json b/tests/src/index.json
@@ -604,6 +604,12 @@
     "name" : "org.mariadb.jdbc:mariadb-java-client",
     "versions" : [ "3.0.6" ]
   } ]
+}, {
+  "test-project-path" : "org.mariadb.jdbc/mariadb-java-client/3.5.2",
+  "libraries" : [ {
+    "name" : "org.mariadb.jdbc:mariadb-java-client",
+    "versions" : [ "3.5.2" ]
+  } ]
 }, {
   "test-project-path" : "org.mariadb/r2dbc-mariadb/1.1.3",
   "libraries" : [ {
diff --git a/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/.gitignore b/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/.gitignore
@@ -0,0 +1,2 @@
+mariadb-stderr.txt
+mariadb-stdout.txt
diff --git a/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/build.gradle b/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/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 {
+    implementation "org.mariadb.jdbc:mariadb-java-client:$libraryVersion"
+    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'org.awaitility:awaitility:4.2.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/org.mariadb.jdbc/mariadb-java-client")
+        }
+    }
+}
diff --git a/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/gradle.properties b/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/gradle.properties
@@ -0,0 +1,2 @@
+library.version=3.5.2
+metadata.dir=org.mariadb.jdbc/mariadb-java-client/3.5.2
diff --git a/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/required-docker-images.txt b/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/required-docker-images.txt
@@ -0,0 +1 @@
+mariadb:10.8
diff --git a/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/settings.gradle b/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/settings.gradle
@@ -0,0 +1,20 @@
+/*
+ * 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/>.
+ */
+
+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 = 'mariadb-java-client-tests'
diff --git a/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/src/test/java/mariadb/MariaDbTests.java b/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/src/test/java/mariadb/MariaDbTests.java
@@ -0,0 +1,142 @@
+/*
+ * 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 mariadb;
+
+import org.awaitility.Awaitility;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLNonTransientConnectionException;
+import java.time.Duration;
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * This test uses docker to start a MariaDB database to test against.
+ */
+public class MariaDbTests {
+
+    private static final String USERNAME = "fred";
+
+    private static final String PASSWORD = "secret";
+
+    private static final String DATABASE = "test";
+
+    private static final String JDBC_URL = "jdbc:mariadb://localhost:3306/" + DATABASE;
+
+    private static Process process;
+
+    private static Connection openConnection() throws SQLException {
+        Properties props = new Properties();
+        props.setProperty("user", USERNAME);
+        props.setProperty("password", PASSWORD);
+        return DriverManager.getConnection(JDBC_URL, props);
+    }
+
+    @BeforeAll
+    static void beforeAll() throws IOException {
+        System.out.println("Starting MariaDB ...");
+        process = new ProcessBuilder(
+                "docker", "run", "--rm", "-p", "3306:3306", "-e", "MARIADB_DATABASE=" + DATABASE, "-e", "MARIADB_USER=" + USERNAME,
+                "-e", "MARIADB_PASSWORD=" + PASSWORD, "-e", "MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=true", "mariadb:10.8").redirectOutput(new File("mariadb-stdout.txt"))
+                .redirectError(new File("mariadb-stderr.txt")).start();
+
+        // Wait until connection can be established
+        Awaitility.await().atMost(Duration.ofMinutes(1)).ignoreExceptionsMatching(e ->
+                e instanceof SQLNonTransientConnectionException
+        ).until(() -> {
+            openConnection().close();
+            return true;
+        });
+        System.out.println("MariaDB started");
+    }
+
+    @AfterAll
+    static void tearDown() {
+        if (process != null && process.isAlive()) {
+            System.out.println("Shutting down MariaDB");
+            process.destroy();
+        }
+    }
+
+    @Test
+    void commitAndRollback() throws Exception {
+        try (Connection conn = openConnection()) {
+            conn.setAutoCommit(false);
+            conn.prepareStatement("CREATE TABLE foo (id INT AUTO_INCREMENT, name VARCHAR(255), PRIMARY KEY (id))").execute();
+            conn.commit();
+        }
+
+        try (Connection conn = openConnection()) {
+            conn.setAutoCommit(false);
+            PreparedStatement statement = conn.prepareStatement("INSERT INTO foo (name) VALUES (?)");
+            statement.setString(1, "Adam");
+            statement.execute();
+            statement.setString(1, "Eve");
+            statement.execute();
+            conn.commit();
+        }
+
+        try (Connection conn = openConnection()) {
+            // Test rollbacks
+            conn.setAutoCommit(false);
+            conn.prepareStatement("DELETE FROM foo").execute();
+            conn.rollback();
+        }
+
+        try (Connection conn = openConnection()) {
+            conn.setAutoCommit(false);
+            try (ResultSet resultSet = conn.prepareStatement("SELECT * FROM foo").executeQuery()) {
+                assertThat(resultSet.next()).isTrue();
+                assertThat(resultSet.getInt(1)).isEqualTo(1);
+                assertThat(resultSet.getString(2)).isEqualTo("Adam");
+                assertThat(resultSet.next()).isTrue();
+                assertThat(resultSet.getInt(1)).isEqualTo(2);
+                assertThat(resultSet.getString(2)).isEqualTo("Eve");
+                assertThat(resultSet.next()).isFalse();
+            }
+        }
+    }
+
+    @Test
+    void simpleDatatypes() throws Exception {
+        try (Connection connection = openConnection()) {
+            connection.setAutoCommit(false);
+            connection.prepareStatement("CREATE TABLE simple_datatypes " +
+                    "(b1 BIT, t1 TINYINT, b2 BOOLEAN, s1 SMALLINT, m1 MEDIUMINT, c2 INT, d1 BIGINT, d2 DECIMAL, " +
+                    "i1 FLOAT, j1 DOUBLE)").execute();
+            PreparedStatement statement = connection.prepareStatement("INSERT INTO simple_datatypes VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+            statement.setInt(1, 1); // BIT
+            statement.setByte(2, (byte) 127); // TINYINT
+            statement.setBoolean(3, true); // BOOLEAN
+            statement.setShort(4, (short) 2); // SMALLINT
+            statement.setInt(5, 3); // MEDIUMINT
+            statement.setInt(6, 4); // INT
+            statement.setLong(7, Long.MAX_VALUE); // BIGINT
+            statement.setDouble(8, Math.PI); // DECIMAL
+            statement.setFloat(9, 42.2f); // FLOAT
+            statement.setDouble(10, Math.PI); // DOUBLE
+            statement.execute();
+
+            try (ResultSet resultSet = connection.prepareStatement("SELECT * FROM simple_datatypes").executeQuery()) {
+                assertThat(resultSet.next()).isTrue();
+                for (int i = 1; i <= 10; i++) {
+                    System.out.printf("column %d: %s%n", i, resultSet.getObject(i));
+                }
+            }
+        }
+    }
+}
diff --git a/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/user-code-filter.json b/tests/src/org.mariadb.jdbc/mariadb-java-client/3.5.2/user-code-filter.json
@@ -0,0 +1,10 @@
+{
+  "rules": [
+    {
+      "excludeClasses": "**"
+    },
+    {
+      "includeClasses": "org.mariadb.jdbc.**"
+    }
+  ]
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +[
 +  "reflect-config.json",
 +  "resource-config.json"
 +]
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+mariadb-stderr.txt`
	`2`	`+mariadb-stdout.txt`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+library.version=3.5.2`
	`2`	`+metadata.dir=org.mariadb.jdbc/mariadb-java-client/3.5.2`