Spring/spring-aot-smoke-tests
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove Hikari from 3rd party hints

Browse Source 
We now use the metadata included in from graalvm-reachability-metadata.

Closes gh-87
This commit is contained in:
Moritz Halbritter
2022-08-22 09:43:21 +02:00
parent 66d0fbc93f
commit 664634067a
27 changed files with 1 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
aot-smoke-test-third-party-hints/src/main/java/org/springframework/aot/smoketest/thirdpartyhints/HikariRuntimeHints.java
View File

@@ -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 -> {
});
}
}

1
batch/build.gradle
View File

@@ -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")

3
batch/src/main/java/com/example/batch/BatchApplication.java
View File

@@ -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 {

1
cloud-task/build.gradle
View File

@@ -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")

3
cloud-task/src/main/java/com/example/cloud/task/CloudTaskApplication.java
View File

@@ -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

1
data-jdbc-h2/build.gradle
View File

@@ -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")

3
data-jdbc-h2/src/main/java/com/example/data/jdbc/h2/DataJdbcH2Application.java
View File

@@ -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 {

1
data-jdbc-postgresql/build.gradle
View File

@@ -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")

3
data-jdbc-postgresql/src/main/java/com/example/data/jdbc/postgresql/DataJdbcPostgreSQLApplication.java
View File

@@ -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 {

1
data-jpa/build.gradle
View File

@@ -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")

3
data-jpa/src/main/java/com/example/data/jpa/DataJpaApplication.java
View File

@@ -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 {

1
flyway/build.gradle
View File

@@ -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")

3
flyway/src/main/java/com/example/flyway/FlywayApplication.java
View File

@@ -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 {

1
jdbc-h2/build.gradle
View File

@@ -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")

3
jdbc-h2/src/main/java/com/example/jdbc/h2/JdbcH2Application.java
View File

@@ -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 {

1
jdbc-mariadb/build.gradle
View File

@@ -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")

3
jdbc-mariadb/src/main/java/com/example/jdbc/mariadb/JdbcMariaDBApplication.java
View File

@@ -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 {

1
jdbc-mysql/build.gradle
View File

@@ -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")

3
jdbc-mysql/src/main/java/com/example/jdbc/mysql/JdbcMySQLApplication.java
View File

@@ -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 {

1
jdbc-postgresql/build.gradle
View File

@@ -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")

3
jdbc-postgresql/src/main/java/com/example/jdbc/postgresql/JdbcPostgreSQLApplication.java
View File

@@ -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 {

1
liquibase/build.gradle
View File

@@ -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")

3
liquibase/src/main/java/com/example/liquibase/LiquibaseApplication.java
View File

@@ -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 {

1
quartz/build.gradle
View File

@@ -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")

3
quartz/src/main/java/com/example/quartz/QuartzApplication.java
View File

@@ -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 {

1
transactional/build.gradle
View File

@@ -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")

3
transactional/src/main/java/com/example/transactional/TransactionalApplication.java
View File

@@ -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 {