-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Improve native image support for detecting driver
- Loading branch information
1 parent
4260354
commit f32b8db
Showing
4 changed files
with
221 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
...te-jpa/src/main/java/io/micronaut/configuration/hibernate/jpa/graal/HibernateFeature.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package io.micronaut.configuration.hibernate.jpa.graal; | ||
|
|
||
| import com.oracle.svm.core.annotate.AutomaticFeature; | ||
| import org.graalvm.nativeimage.hosted.Feature; | ||
| import org.graalvm.nativeimage.hosted.RuntimeReflection; | ||
| import org.hibernate.dialect.*; | ||
|
|
||
| /** | ||
| * Feature for automatically configuring the dialect for the active driver with GraalVM. | ||
| * | ||
| * @author graemerocher | ||
| * @since 2.2.1 | ||
| */ | ||
| @AutomaticFeature | ||
| final class HibernateFeature implements Feature { | ||
| @Override | ||
| public void beforeAnalysis(BeforeAnalysisAccess access) { | ||
| registerIfPresent(access, "org.h2.Driver", H2Dialect.class); | ||
|
|
||
| registerIfPresent(access, "org.postgresql.Driver", | ||
| PostgreSQL9Dialect.class, | ||
| PostgreSQL10Dialect.class, | ||
| PostgreSQL91Dialect.class, | ||
| PostgreSQL92Dialect.class, | ||
| PostgreSQL93Dialect.class, | ||
| PostgreSQL94Dialect.class, | ||
| PostgreSQL95Dialect.class, | ||
| PostgreSQL81Dialect.class, | ||
| PostgreSQL82Dialect.class | ||
| ); | ||
|
|
||
| registerIfPresent(access, "com.microsoft.sqlserver.jdbc.SQLServerResource", | ||
| SQLServer2005Dialect.class, | ||
| SQLServer2008Dialect.class, | ||
| SQLServer2012Dialect.class); | ||
|
|
||
| registerIfPresent(access, "org.mariadb.jdbc.Driver", | ||
| MariaDBDialect.class, | ||
| MariaDB10Dialect.class, | ||
| MariaDB102Dialect.class, | ||
| MariaDB103Dialect.class, | ||
| MariaDB53Dialect.class); | ||
|
|
||
| registerIfPresent(access, "oracle.jdbc.OracleDriver", | ||
| Oracle8iDialect.class, | ||
| Oracle9iDialect.class, | ||
| Oracle10gDialect.class, | ||
| Oracle12cDialect.class); | ||
| } | ||
|
|
||
| private void registerIfPresent(BeforeAnalysisAccess access, String name, Class<? extends Dialect>...dialects) { | ||
| Class<?> h2 = access.findClassByName(name); | ||
| if (h2 != null) { | ||
| for (Class<? extends Dialect> dialect : dialects) { | ||
| RuntimeReflection.register(dialect); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
160 changes: 160 additions & 0 deletions
160
jdbc/src/main/java/io/micronaut/jdbc/nativeimage/JdbcFeature.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| package io.micronaut.jdbc.nativeimage; | ||
|
|
||
| import com.oracle.svm.core.annotate.AutomaticFeature; | ||
| import com.oracle.svm.core.configure.ResourcesRegistry; | ||
| import io.micronaut.core.annotation.Internal; | ||
| import org.graalvm.nativeimage.ImageSingletons; | ||
| import org.graalvm.nativeimage.hosted.Feature; | ||
| import org.graalvm.nativeimage.hosted.RuntimeClassInitialization; | ||
| import org.graalvm.nativeimage.hosted.RuntimeReflection; | ||
|
|
||
| import java.lang.reflect.Field; | ||
| import java.lang.reflect.Method; | ||
|
|
||
| /** | ||
| * A JDBC feature that configures JDBC drivers correctly for native image. | ||
| * | ||
| * @author graemerocher | ||
| * @since 1.0.0 | ||
| */ | ||
| @AutomaticFeature | ||
| @Internal | ||
| final class JdbcFeature implements Feature { | ||
|
|
||
| private static final String SQL_SERVER_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; | ||
|
|
||
| @Override | ||
| public void beforeAnalysis(BeforeAnalysisAccess access) { | ||
| // h2 | ||
| registerDriver(access, "org.h2.Driver"); | ||
|
|
||
| // postgres | ||
| registerDriver(access, "org.postgresql.Driver"); | ||
|
|
||
| // sql server | ||
| handleSqlServer(access); | ||
|
|
||
| // mariadb | ||
| handleMariadb(access); | ||
|
|
||
| // oracle | ||
| handleOracle(access); | ||
|
|
||
| } | ||
|
|
||
| private void handleOracle(BeforeAnalysisAccess access) { | ||
| Class<?> oracleDriver = access.findClassByName("oracle.jdbc.OracleDriver"); | ||
| if (oracleDriver != null) { | ||
| registerReflectionIfPresent(access, "oracle.jdbc.driver.T4CDriverExtension"); | ||
| registerReflectionIfPresent(access, "oracle.jdbc.driver.T2CDriverExtension"); | ||
| registerReflectionIfPresent(access, "oracle.net.ano.Ano"); | ||
| registerReflectionIfPresent(access, "oracle.net.ano.AuthenticationService"); | ||
| registerReflectionIfPresent(access, "oracle.net.ano.DataIntegrityService"); | ||
| registerReflectionIfPresent(access, "oracle.net.ano.EncryptionService"); | ||
| registerReflectionIfPresent(access, "oracle.net.ano.SupervisorService"); | ||
|
|
||
| ResourcesRegistry resourcesRegistry = ImageSingletons.lookup(ResourcesRegistry.class); | ||
| if (resourcesRegistry != null) { | ||
| resourcesRegistry.addResources("META-INF/services/java.sql.Driver"); | ||
| resourcesRegistry.addResources("oracle/sql/converter_xcharset/lx20002.glb"); | ||
| resourcesRegistry.addResources("oracle/sql/converter_xcharset/lx2001f.glb"); | ||
| resourcesRegistry.addResources("oracle/sql/converter_xcharset/lx200b2.glb"); | ||
| } | ||
|
|
||
| initializeAtBuildTime( | ||
| access, | ||
| "oracle.net.jdbc.nl.mesg.NLSR_en", | ||
| "oracle.jdbc.driver.DynamicByteArray", | ||
| "oracle.sql.ConverterArchive", | ||
| "oracle.sql.converter.CharacterConverterJDBC", | ||
| "oracle.sql.converter.CharacterConverter1Byte" | ||
| ); | ||
|
|
||
| initializeAtRuntime( | ||
| access, | ||
| "java.sql.DriverManager" | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| private void handleMariadb(BeforeAnalysisAccess access) { | ||
| Class<?> mariaDriver = access.findClassByName("org.mariadb.jdbc.Driver"); | ||
| if (mariaDriver != null) { | ||
| RuntimeReflection.register(mariaDriver); | ||
| registerAllIfPresent(access, "org.mariadb.jdbc.util.Options"); | ||
| registerAllAccess(mariaDriver); | ||
| RuntimeClassInitialization | ||
| .initializeAtBuildTime("org.mariadb"); | ||
| RuntimeClassInitialization | ||
| .initializeAtRunTime("org.mariadb.jdbc.credential.aws"); | ||
| initializeAtRuntime(access, "org.mariadb.jdbc.internal.failover.impl.MastersSlavesListener"); | ||
| initializeAtRuntime(access, "org.mariadb.jdbc.internal.com.send.authentication.SendPamAuthPacket"); | ||
| } | ||
| } | ||
|
|
||
| private void initializeAtRuntime(BeforeAnalysisAccess access, String n) { | ||
| Class<?> t = access.findClassByName(n); | ||
| if (t != null) { | ||
| RuntimeClassInitialization.initializeAtRunTime(t); | ||
| } | ||
| } | ||
|
|
||
| private void initializeAtBuildTime(BeforeAnalysisAccess access, String... names) { | ||
| for (String name : names) { | ||
| Class<?> t = access.findClassByName(name); | ||
| if (t != null) { | ||
| RuntimeClassInitialization.initializeAtBuildTime(t); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void registerAllIfPresent(BeforeAnalysisAccess access, String n) { | ||
| Class<?> t = access.findClassByName(n); | ||
| if (t != null) { | ||
| registerAllAccess(t); | ||
| } | ||
| } | ||
|
|
||
| private void registerReflectionIfPresent(BeforeAnalysisAccess access, String n) { | ||
| Class<?> t = access.findClassByName(n); | ||
| if (t != null) { | ||
| RuntimeReflection.register(t); | ||
| } | ||
| } | ||
|
|
||
| private void registerAllAccess(Class<?> t) { | ||
| RuntimeReflection.register(t); | ||
| for (Method method : t.getMethods()) { | ||
| RuntimeReflection.register(method); | ||
| } | ||
| Field[] fields = t.getFields(); | ||
| for (Field field : fields) { | ||
| RuntimeReflection.register(field); | ||
| } | ||
| } | ||
|
|
||
| private void handleSqlServer(BeforeAnalysisAccess access) { | ||
| Class<?> sqlServerDriver = access.findClassByName(SQL_SERVER_DRIVER); | ||
| if (sqlServerDriver != null) { | ||
|
|
||
| ResourcesRegistry resourcesRegistry = ImageSingletons.lookup(ResourcesRegistry.class); | ||
| if (resourcesRegistry != null) { | ||
| resourcesRegistry | ||
| .addResourceBundles("com.microsoft.sqlserver.jdbc.SQLServerResource"); | ||
| } | ||
| RuntimeReflection.register(sqlServerDriver); | ||
| RuntimeClassInitialization | ||
| .initializeAtRunTime("java.sql.DriverManager"); | ||
| RuntimeClassInitialization | ||
| .initializeAtBuildTime(SQL_SERVER_DRIVER); | ||
| } | ||
| } | ||
|
|
||
| private void registerDriver(BeforeAnalysisAccess access, String driverName) { | ||
| Class<?> h2Driver = access.findClassByName(driverName); | ||
| if (h2Driver != null) { | ||
| RuntimeReflection.register(h2Driver); | ||
| RuntimeClassInitialization.initializeAtBuildTime(h2Driver); | ||
| } | ||
| } | ||
| } |