Added metadata for org.apache.tomcat:tomcat-jdbc:10.1.7 (#268)

msupic · web-flow · commit cb132c563071 · 2023-04-18T09:07:17.000+02:00
diff --git a/metadata/index.json b/metadata/index.json
@@ -61,6 +61,10 @@
     "directory": "org.apache.tomcat.embed/tomcat-embed-core",
     "module": "org.apache.tomcat.embed:tomcat-embed-core"
   },
+  {
+    "directory" : "org.apache.tomcat/tomcat-jdbc",
+    "module" : "org.apache.tomcat:tomcat-jdbc"
+  },
   {
     "directory": "com.google.protobuf/protobuf-java-util",
     "module": "com.google.protobuf:protobuf-java-util"
diff --git a/metadata/org.apache.tomcat/tomcat-jdbc/10.1.7/index.json b/metadata/org.apache.tomcat/tomcat-jdbc/10.1.7/index.json
@@ -0,0 +1,3 @@
+[
+  "proxy-config.json"
+]
diff --git a/metadata/org.apache.tomcat/tomcat-jdbc/10.1.7/proxy-config.json b/metadata/org.apache.tomcat/tomcat-jdbc/10.1.7/proxy-config.json
@@ -0,0 +1,35 @@
+[
+    {
+        "condition": {
+            "typeReachable": "org.apache.tomcat.jdbc.pool.interceptor.AbstractCreateStatementInterceptor"
+        },
+        "interfaces": [
+            "java.sql.CallableStatement"
+        ]
+    },
+    {
+        "condition": {
+            "typeReachable": "org.apache.tomcat.jdbc.pool.ConnectionPool"
+        },
+        "interfaces": [
+            "java.sql.Connection",
+            "javax.sql.PooledConnection"
+        ]
+    },
+    {
+        "condition": {
+            "typeReachable": "org.apache.tomcat.jdbc.pool.interceptor.AbstractCreateStatementInterceptor"
+        },
+        "interfaces": [
+            "java.sql.PreparedStatement"
+        ]
+    },
+    {
+        "condition": {
+            "typeReachable": "org.apache.tomcat.jdbc.pool.interceptor.AbstractCreateStatementInterceptor"
+        },
+        "interfaces": [
+            "java.sql.Statement"
+        ]
+    }
+]
diff --git a/metadata/org.apache.tomcat/tomcat-jdbc/index.json b/metadata/org.apache.tomcat/tomcat-jdbc/index.json
@@ -0,0 +1,10 @@
+[
+  {
+    "latest": true,
+    "metadata-version": "10.1.7",
+    "module": "org.apache.tomcat:tomcat-jdbc",
+    "tested-versions": [
+      "10.1.7"
+    ]
+  }
+]
diff --git a/tests/src/index.json b/tests/src/index.json
@@ -142,6 +142,17 @@
       }
     ]
   },
+  {
+    "test-project-path": "org.apache.tomcat/tomcat-jdbc/10.1.7",
+    "libraries": [
+      {
+        "name": "org.apache.tomcat:tomcat-jdbc",
+        "versions": [
+          "10.1.7"
+        ]
+      }
+    ]
+  },
   {
     "test-project-path": "com.google.protobuf/protobuf-java-util/3.21.12",
     "libraries": [
diff --git a/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/.gitignore b/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/.gitignore
@@ -0,0 +1,4 @@
+gradlew.bat
+gradlew
+gradle/
+build/
diff --git a/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/build.gradle b/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/build.gradle
@@ -0,0 +1,30 @@
+/*
+ * 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 "org.apache.tomcat:tomcat-jdbc:$libraryVersion"
+    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'com.h2database:h2:2.1.214'
+}
+
+graalvmNative {
+    agent {
+        defaultMode = "conditional"
+        modes {
+            conditional {
+                userCodeFilterPath = "metadata-user-code-filter.json"
+                extraFilterPath = "metadata-extra-filter.json"
+            }
+        }
+    }
+}
diff --git a/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/gradle.properties b/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/gradle.properties
@@ -0,0 +1,2 @@
+library.version = 10.1.7
+metadata.dir = org.apache.tomcat/tomcat-jdbc/10.1.7/
diff --git a/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/metadata-extra-filter.json b/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/metadata-extra-filter.json
@@ -0,0 +1,5 @@
+{
+  "rules": [
+    {"includeClasses": "org.apache.tomcat.**"}
+  ]
+}
diff --git a/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/metadata-user-code-filter.json b/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/metadata-user-code-filter.json
@@ -0,0 +1,5 @@
+{
+  "rules": [
+    {"includeClasses": "org.apache.tomcat.**"}
+  ]
+}
diff --git a/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/settings.gradle b/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/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 = 'org.apache.tomcat.tomcat-jdbc_tests'
diff --git a/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/src/test/java/org_apache_tomcat/tomcat_jdbc/TomcatJdbcTest.java b/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/src/test/java/org_apache_tomcat/tomcat_jdbc/TomcatJdbcTest.java
@@ -0,0 +1,94 @@
+/*
+ * 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 org_apache_tomcat.tomcat_jdbc;
+
+import org.apache.tomcat.jdbc.pool.DataSourceFactory;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+
+import javax.sql.DataSource;
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Properties;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class TomcatJdbcTest {
+
+    private DataSource dataSource;
+    private Connection connection;
+
+    @BeforeAll
+    public void init() throws Exception {
+        Properties properties = new Properties();
+        properties.setProperty("driverClassName", "org.h2.Driver");
+        properties.setProperty("url", "jdbc:h2:mem:default;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE");
+        properties.setProperty("username", "fred");
+        properties.setProperty("password", "secret");
+        properties.setProperty("initialSize", "2");
+        properties.setProperty("minIdle", "1");
+        properties.setProperty("testOnBorrow", "true");
+        properties.setProperty("testOnConnect", "true");
+        properties.setProperty("validationQuery", "select 1");
+        DataSourceFactory dataSourceFactory = new DataSourceFactory();
+        dataSource = dataSourceFactory.createDataSource(properties);
+    }
+
+    @AfterAll
+    public void close() throws Exception {
+        ((org.apache.tomcat.jdbc.pool.DataSource) dataSource).close(true);
+    }
+
+    @BeforeEach
+    public void setConnection() throws SQLException {
+        connection = dataSource.getConnection();
+    }
+
+    @AfterEach
+    public void removeConnection() throws SQLException {
+        if (connection != null) {
+            connection.close();
+            connection = null;
+        }
+    }
+
+    @Test
+    void testPreparedStatement() throws SQLException {
+        try (Statement statement = connection.createStatement()) {
+            statement.executeUpdate("CREATE TABLE foo (id INT NOT NULL, name VARCHAR(255), PRIMARY KEY (id))");
+        }
+
+        try (PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO foo(id, name) VALUES( ?, ?)")) {
+            preparedStatement.setInt(1, 1);
+            preparedStatement.setString(2, "test1");
+            int count = preparedStatement.executeUpdate();
+            assertThat(count).isEqualTo(1);
+        }
+    }
+
+    @Test
+    void testCallableStatement() throws SQLException {
+        try (Statement statement = connection.createStatement()) {
+            statement.executeUpdate("CREATE ALIAS my_round FOR 'java.lang.Math.round(double)'");
+        }
+        try (CallableStatement callableStatement = connection.prepareCall("CALL my_round(?)")) {
+            callableStatement.setFloat(1, 4567.9874f);
+            ResultSet resultSet = callableStatement.executeQuery();
+            assertThat(resultSet.next()).isTrue();
+            assertThat(resultSet.getInt(1)).isEqualTo(4568);
+        }
+    }
+}
diff --git a/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/src/test/resources/META-INF/native-image/tests-only/reflect-config.json b/tests/src/org.apache.tomcat/tomcat-jdbc/10.1.7/src/test/resources/META-INF/native-image/tests-only/reflect-config.json
@@ -0,0 +1,23 @@
+[
+  {
+    "name": "java.lang.Math",
+    "queryAllPublicMethods": true,
+    "condition": {
+      "typeReachable": "org.h2.schema.FunctionAlias"
+    }
+  },
+  {
+    "name": "java.lang.Math",
+    "condition": {
+      "typeReachable": "org.h2.schema.FunctionAlias$JavaMethod"
+    },
+    "methods": [
+      {
+        "name": "round",
+        "parameterTypes": [
+          "double"
+        ]
+      }
+    ]
+  }
+]
diff --git a/tests/src/org.hibernate.orm/hibernate-core/6.1.1.Final/README.md b/tests/src/org.hibernate.orm/hibernate-core/6.1.1.Final/README.md

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,17 @@`
`142`	`142`	`}`
`143`	`143`	`]`
`144`	`144`	`},`
	`145`	`+ {`
	`146`	`+ "test-project-path": "org.apache.tomcat/tomcat-jdbc/10.1.7",`
	`147`	`+ "libraries": [`
	`148`	`+ {`
	`149`	`+ "name": "org.apache.tomcat:tomcat-jdbc",`
	`150`	`+ "versions": [`
	`151`	`+ "10.1.7"`
	`152`	`+ ]`
	`153`	`+ }`
	`154`	`+ ]`
	`155`	`+ },`
`145`	`156`	`{`
`146`	`157`	`"test-project-path": "com.google.protobuf/protobuf-java-util/3.21.12",`
`147`	`158`	`"libraries": [`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +gradlew.bat
 +gradlew
 +gradle/
 +build/
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+library.version = 10.1.7`
	`2`	`+metadata.dir = org.apache.tomcat/tomcat-jdbc/10.1.7/`