diff --git a/aot-smoke-test-third-party-hints/src/main/java/org/springframework/aot/smoketest/thirdpartyhints/HikariRuntimeHints.java b/aot-smoke-test-third-party-hints/src/main/java/org/springframework/aot/smoketest/thirdpartyhints/HikariRuntimeHints.java deleted file mode 100644 index d7dc55ce..00000000 --- a/aot-smoke-test-third-party-hints/src/main/java/org/springframework/aot/smoketest/thirdpartyhints/HikariRuntimeHints.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.springframework.aot.smoketest.thirdpartyhints; - -import java.sql.Statement; - -import org.springframework.aot.hint.RuntimeHints; -import org.springframework.aot.hint.RuntimeHintsRegistrar; -import org.springframework.aot.hint.TypeReference; -import org.springframework.util.ClassUtils; - -// TODO: Contribute these hints to graalvm-reachability-metadata repository -public class HikariRuntimeHints implements RuntimeHintsRegistrar { - - @Override - public void registerHints(RuntimeHints hints, ClassLoader classLoader) { - if (!ClassUtils.isPresent("com.zaxxer.hikari.HikariDataSource", classLoader)) { - return; - } - hints.reflection().registerType(Statement[].class, hint -> { - }); - hints.reflection().registerType(TypeReference.of("com.zaxxer.hikari.util.ConcurrentBag$IConcurrentBagEntry[]"), - hint -> { - }); - } - -} diff --git a/batch/build.gradle b/batch/build.gradle index 7f55bcb5..a0e4ddc9 100644 --- a/batch/build.gradle +++ b/batch/build.gradle @@ -8,7 +8,6 @@ plugins { dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-batch") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("com.h2database:h2") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/batch/src/main/java/com/example/batch/BatchApplication.java b/batch/src/main/java/com/example/batch/BatchApplication.java index 65e82d8a..dc880490 100644 --- a/batch/src/main/java/com/example/batch/BatchApplication.java +++ b/batch/src/main/java/com/example/batch/BatchApplication.java @@ -1,12 +1,9 @@ package com.example.batch; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication -@ImportRuntimeHints(HikariRuntimeHints.class) public class BatchApplication { public static void main(String[] args) throws InterruptedException { diff --git a/cloud-task/build.gradle b/cloud-task/build.gradle index 1804e9ee..4e76a33b 100644 --- a/cloud-task/build.gradle +++ b/cloud-task/build.gradle @@ -14,7 +14,6 @@ dependencies { implementation(platform("org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}")) implementation("org.springframework.boot:spring-boot-starter") implementation("org.springframework.cloud:spring-cloud-starter-task") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("com.h2database:h2") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/cloud-task/src/main/java/com/example/cloud/task/CloudTaskApplication.java b/cloud-task/src/main/java/com/example/cloud/task/CloudTaskApplication.java index 171f9926..a4460cf5 100644 --- a/cloud-task/src/main/java/com/example/cloud/task/CloudTaskApplication.java +++ b/cloud-task/src/main/java/com/example/cloud/task/CloudTaskApplication.java @@ -1,16 +1,13 @@ package com.example.cloud.task; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.ApplicationRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.task.configuration.EnableTask; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication @EnableTask -@ImportRuntimeHints(HikariRuntimeHints.class) public class CloudTaskApplication { @Bean diff --git a/data-jdbc-h2/build.gradle b/data-jdbc-h2/build.gradle index 316bdf0b..085b4b32 100644 --- a/data-jdbc-h2/build.gradle +++ b/data-jdbc-h2/build.gradle @@ -8,7 +8,6 @@ plugins { dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-data-jdbc") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("com.h2database:h2") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/data-jdbc-h2/src/main/java/com/example/data/jdbc/h2/DataJdbcH2Application.java b/data-jdbc-h2/src/main/java/com/example/data/jdbc/h2/DataJdbcH2Application.java index 32a5b785..abc758f3 100644 --- a/data-jdbc-h2/src/main/java/com/example/data/jdbc/h2/DataJdbcH2Application.java +++ b/data-jdbc-h2/src/main/java/com/example/data/jdbc/h2/DataJdbcH2Application.java @@ -1,12 +1,9 @@ package com.example.data.jdbc.h2; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication -@ImportRuntimeHints(HikariRuntimeHints.class) public class DataJdbcH2Application { public static void main(String[] args) throws InterruptedException { diff --git a/data-jdbc-postgresql/build.gradle b/data-jdbc-postgresql/build.gradle index b5c9e537..95a0a3fb 100644 --- a/data-jdbc-postgresql/build.gradle +++ b/data-jdbc-postgresql/build.gradle @@ -8,7 +8,6 @@ plugins { dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-data-jdbc") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("org.postgresql:postgresql") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/data-jdbc-postgresql/src/main/java/com/example/data/jdbc/postgresql/DataJdbcPostgreSQLApplication.java b/data-jdbc-postgresql/src/main/java/com/example/data/jdbc/postgresql/DataJdbcPostgreSQLApplication.java index 349eeb65..c887a6f5 100644 --- a/data-jdbc-postgresql/src/main/java/com/example/data/jdbc/postgresql/DataJdbcPostgreSQLApplication.java +++ b/data-jdbc-postgresql/src/main/java/com/example/data/jdbc/postgresql/DataJdbcPostgreSQLApplication.java @@ -1,12 +1,9 @@ package com.example.data.jdbc.postgresql; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication -@ImportRuntimeHints(HikariRuntimeHints.class) public class DataJdbcPostgreSQLApplication { public static void main(String[] args) throws InterruptedException { diff --git a/data-jpa/build.gradle b/data-jpa/build.gradle index c4286487..8df1b1ec 100644 --- a/data-jpa/build.gradle +++ b/data-jpa/build.gradle @@ -8,7 +8,6 @@ plugins { dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-data-jpa") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("com.h2database:h2") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/data-jpa/src/main/java/com/example/data/jpa/DataJpaApplication.java b/data-jpa/src/main/java/com/example/data/jpa/DataJpaApplication.java index f9f7f0c8..502c38a7 100644 --- a/data-jpa/src/main/java/com/example/data/jpa/DataJpaApplication.java +++ b/data-jpa/src/main/java/com/example/data/jpa/DataJpaApplication.java @@ -1,12 +1,9 @@ package com.example.data.jpa; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication -@ImportRuntimeHints(HikariRuntimeHints.class) public class DataJpaApplication { public static void main(String[] args) throws InterruptedException { diff --git a/flyway/build.gradle b/flyway/build.gradle index 0d330923..8ba7ccf3 100644 --- a/flyway/build.gradle +++ b/flyway/build.gradle @@ -9,7 +9,6 @@ dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-jdbc") implementation("org.flywaydb:flyway-core") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("com.h2database:h2") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/flyway/src/main/java/com/example/flyway/FlywayApplication.java b/flyway/src/main/java/com/example/flyway/FlywayApplication.java index 5e879de6..61f68ad9 100644 --- a/flyway/src/main/java/com/example/flyway/FlywayApplication.java +++ b/flyway/src/main/java/com/example/flyway/FlywayApplication.java @@ -1,12 +1,9 @@ package com.example.flyway; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication -@ImportRuntimeHints(HikariRuntimeHints.class) public class FlywayApplication { public static void main(String[] args) throws InterruptedException { diff --git a/jdbc-h2/build.gradle b/jdbc-h2/build.gradle index 5cd37caa..001d54d6 100644 --- a/jdbc-h2/build.gradle +++ b/jdbc-h2/build.gradle @@ -8,7 +8,6 @@ plugins { dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-jdbc") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("com.h2database:h2") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/jdbc-h2/src/main/java/com/example/jdbc/h2/JdbcH2Application.java b/jdbc-h2/src/main/java/com/example/jdbc/h2/JdbcH2Application.java index 7c2c9533..21801a14 100644 --- a/jdbc-h2/src/main/java/com/example/jdbc/h2/JdbcH2Application.java +++ b/jdbc-h2/src/main/java/com/example/jdbc/h2/JdbcH2Application.java @@ -1,12 +1,9 @@ package com.example.jdbc.h2; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication -@ImportRuntimeHints(HikariRuntimeHints.class) public class JdbcH2Application { public static void main(String[] args) throws InterruptedException { diff --git a/jdbc-mariadb/build.gradle b/jdbc-mariadb/build.gradle index 885adaee..e71ce285 100644 --- a/jdbc-mariadb/build.gradle +++ b/jdbc-mariadb/build.gradle @@ -8,7 +8,6 @@ plugins { dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-jdbc") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("org.mariadb.jdbc:mariadb-java-client") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/jdbc-mariadb/src/main/java/com/example/jdbc/mariadb/JdbcMariaDBApplication.java b/jdbc-mariadb/src/main/java/com/example/jdbc/mariadb/JdbcMariaDBApplication.java index 796c7c37..079779d2 100644 --- a/jdbc-mariadb/src/main/java/com/example/jdbc/mariadb/JdbcMariaDBApplication.java +++ b/jdbc-mariadb/src/main/java/com/example/jdbc/mariadb/JdbcMariaDBApplication.java @@ -1,12 +1,9 @@ package com.example.jdbc.mariadb; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication -@ImportRuntimeHints(HikariRuntimeHints.class) public class JdbcMariaDBApplication { public static void main(String[] args) throws InterruptedException { diff --git a/jdbc-mysql/build.gradle b/jdbc-mysql/build.gradle index f30b11d0..0e95d213 100644 --- a/jdbc-mysql/build.gradle +++ b/jdbc-mysql/build.gradle @@ -8,7 +8,6 @@ plugins { dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-jdbc") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("mysql:mysql-connector-java") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/jdbc-mysql/src/main/java/com/example/jdbc/mysql/JdbcMySQLApplication.java b/jdbc-mysql/src/main/java/com/example/jdbc/mysql/JdbcMySQLApplication.java index cd610639..89aeb740 100644 --- a/jdbc-mysql/src/main/java/com/example/jdbc/mysql/JdbcMySQLApplication.java +++ b/jdbc-mysql/src/main/java/com/example/jdbc/mysql/JdbcMySQLApplication.java @@ -1,12 +1,9 @@ package com.example.jdbc.mysql; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication -@ImportRuntimeHints(HikariRuntimeHints.class) public class JdbcMySQLApplication { public static void main(String[] args) throws InterruptedException { diff --git a/jdbc-postgresql/build.gradle b/jdbc-postgresql/build.gradle index 841bf103..2466f317 100644 --- a/jdbc-postgresql/build.gradle +++ b/jdbc-postgresql/build.gradle @@ -8,7 +8,6 @@ plugins { dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-jdbc") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("org.postgresql:postgresql") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/jdbc-postgresql/src/main/java/com/example/jdbc/postgresql/JdbcPostgreSQLApplication.java b/jdbc-postgresql/src/main/java/com/example/jdbc/postgresql/JdbcPostgreSQLApplication.java index af94bd16..0cf5a6cc 100644 --- a/jdbc-postgresql/src/main/java/com/example/jdbc/postgresql/JdbcPostgreSQLApplication.java +++ b/jdbc-postgresql/src/main/java/com/example/jdbc/postgresql/JdbcPostgreSQLApplication.java @@ -1,12 +1,9 @@ package com.example.jdbc.postgresql; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication -@ImportRuntimeHints(HikariRuntimeHints.class) public class JdbcPostgreSQLApplication { public static void main(String[] args) throws InterruptedException { diff --git a/liquibase/build.gradle b/liquibase/build.gradle index 596efd6d..30e02a40 100644 --- a/liquibase/build.gradle +++ b/liquibase/build.gradle @@ -9,7 +9,6 @@ dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-jdbc") implementation("org.liquibase:liquibase-core") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("com.h2database:h2") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/liquibase/src/main/java/com/example/liquibase/LiquibaseApplication.java b/liquibase/src/main/java/com/example/liquibase/LiquibaseApplication.java index fe25da5f..e4e8231b 100644 --- a/liquibase/src/main/java/com/example/liquibase/LiquibaseApplication.java +++ b/liquibase/src/main/java/com/example/liquibase/LiquibaseApplication.java @@ -1,12 +1,9 @@ package com.example.liquibase; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication -@ImportRuntimeHints(HikariRuntimeHints.class) public class LiquibaseApplication { public static void main(String[] args) throws InterruptedException { diff --git a/quartz/build.gradle b/quartz/build.gradle index 2134c325..7d908cb0 100644 --- a/quartz/build.gradle +++ b/quartz/build.gradle @@ -9,7 +9,6 @@ dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-quartz") implementation("org.springframework.boot:spring-boot-starter-jdbc") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("com.h2database:h2") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/quartz/src/main/java/com/example/quartz/QuartzApplication.java b/quartz/src/main/java/com/example/quartz/QuartzApplication.java index 2f593292..e3f605dc 100644 --- a/quartz/src/main/java/com/example/quartz/QuartzApplication.java +++ b/quartz/src/main/java/com/example/quartz/QuartzApplication.java @@ -8,13 +8,12 @@ import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.RuntimeHintsRegistrar; import org.springframework.aot.hint.TypeHint.Builder; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication -@ImportRuntimeHints({ HikariRuntimeHints.class, QuartzApplicationHints.class }) +@ImportRuntimeHints({ QuartzApplicationHints.class }) public class QuartzApplication { public static void main(String[] args) throws InterruptedException { diff --git a/transactional/build.gradle b/transactional/build.gradle index 5cd37caa..001d54d6 100644 --- a/transactional/build.gradle +++ b/transactional/build.gradle @@ -8,7 +8,6 @@ plugins { dependencies { implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES)) implementation("org.springframework.boot:spring-boot-starter-jdbc") - implementation(project(":aot-smoke-test-third-party-hints")) runtimeOnly("com.h2database:h2") testImplementation("org.springframework.boot:spring-boot-starter-test") diff --git a/transactional/src/main/java/com/example/transactional/TransactionalApplication.java b/transactional/src/main/java/com/example/transactional/TransactionalApplication.java index 2048d383..88a7ac13 100644 --- a/transactional/src/main/java/com/example/transactional/TransactionalApplication.java +++ b/transactional/src/main/java/com/example/transactional/TransactionalApplication.java @@ -1,12 +1,9 @@ package com.example.transactional; -import org.springframework.aot.smoketest.thirdpartyhints.HikariRuntimeHints; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ImportRuntimeHints; @SpringBootApplication -@ImportRuntimeHints(HikariRuntimeHints.class) public class TransactionalApplication { public static void main(String[] args) throws InterruptedException {