From 1471ab656a68d805d833bdfa6664073dc4aa97d1 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Wed, 1 Jun 2022 23:49:11 -0300 Subject: [PATCH] Rename `DatasourceDbKindHibernateOrmMetadataBuildItem` to `DatabaseKindDialectBuildItem` As suggested in https://github.com/quarkusio/quarkus/pull/25792#issuecomment-1144353493 --- ...java => DatabaseKindDialectBuildItem.java} | 7 +++-- .../hibernate/orm/deployment/Dialects.java | 6 ++--- .../orm/deployment/HibernateOrmProcessor.java | 26 +++++++++---------- .../HibernateReactiveProcessor.java | 10 +++---- 4 files changed, 26 insertions(+), 23 deletions(-) rename extensions/hibernate-orm/deployment-spi/src/main/java/io.quarkus.hibernate.orm.deployment.spi/{DatasourceDbKindHibernateOrmMetadataBuildItem.java => DatabaseKindDialectBuildItem.java} (63%) diff --git a/extensions/hibernate-orm/deployment-spi/src/main/java/io.quarkus.hibernate.orm.deployment.spi/DatasourceDbKindHibernateOrmMetadataBuildItem.java b/extensions/hibernate-orm/deployment-spi/src/main/java/io.quarkus.hibernate.orm.deployment.spi/DatabaseKindDialectBuildItem.java similarity index 63% rename from extensions/hibernate-orm/deployment-spi/src/main/java/io.quarkus.hibernate.orm.deployment.spi/DatasourceDbKindHibernateOrmMetadataBuildItem.java rename to extensions/hibernate-orm/deployment-spi/src/main/java/io.quarkus.hibernate.orm.deployment.spi/DatabaseKindDialectBuildItem.java index 4d529e7d05a96..e5bfce436430a 100644 --- a/extensions/hibernate-orm/deployment-spi/src/main/java/io.quarkus.hibernate.orm.deployment.spi/DatasourceDbKindHibernateOrmMetadataBuildItem.java +++ b/extensions/hibernate-orm/deployment-spi/src/main/java/io.quarkus.hibernate.orm.deployment.spi/DatabaseKindDialectBuildItem.java @@ -2,11 +2,14 @@ import io.quarkus.builder.item.MultiBuildItem; -public final class DatasourceDbKindHibernateOrmMetadataBuildItem extends MultiBuildItem { +/** + * An Hibernate Dialect associated with a database kind. + */ +public final class DatabaseKindDialectBuildItem extends MultiBuildItem { private final String dbKind; private final String dialect; - public DatasourceDbKindHibernateOrmMetadataBuildItem(String dbKind, String dialect) { + public DatabaseKindDialectBuildItem(String dbKind, String dialect) { this.dbKind = dbKind; this.dialect = dialect; } diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/Dialects.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/Dialects.java index 283fcf28f90f5..2483830ae29ff 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/Dialects.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/Dialects.java @@ -3,7 +3,7 @@ import java.util.List; import io.quarkus.datasource.common.runtime.DatabaseKind; -import io.quarkus.hibernate.orm.deployment.spi.DatasourceDbKindHibernateOrmMetadataBuildItem; +import io.quarkus.hibernate.orm.deployment.spi.DatabaseKindDialectBuildItem; import io.quarkus.runtime.configuration.ConfigurationException; public final class Dialects { @@ -13,8 +13,8 @@ private Dialects() { } public static String guessDialect(String persistenceUnitName, String resolvedDbKind, - List dbKindMetadataBuildItems) { - for (DatasourceDbKindHibernateOrmMetadataBuildItem item : dbKindMetadataBuildItems) { + List dbKindDialectBuildItems) { + for (DatabaseKindDialectBuildItem item : dbKindDialectBuildItems) { if (DatabaseKind.is(resolvedDbKind, item.getDbKind())) { return item.getDialect(); } diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java index 9c7b39916c719..7c11b24800ca5 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java @@ -121,7 +121,7 @@ import io.quarkus.hibernate.orm.PersistenceUnit; import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationRuntimeConfiguredBuildItem; import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationStaticConfiguredBuildItem; -import io.quarkus.hibernate.orm.deployment.spi.DatasourceDbKindHibernateOrmMetadataBuildItem; +import io.quarkus.hibernate.orm.deployment.spi.DatabaseKindDialectBuildItem; import io.quarkus.hibernate.orm.runtime.HibernateOrmRecorder; import io.quarkus.hibernate.orm.runtime.HibernateOrmRuntimeConfig; import io.quarkus.hibernate.orm.runtime.JPAConfig; @@ -172,22 +172,22 @@ public final class HibernateOrmProcessor { @BuildStep void registerHibernateOrmMetadataForCoreDialects( - BuildProducer producer) { - producer.produce(new DatasourceDbKindHibernateOrmMetadataBuildItem(DatabaseKind.DB2, + BuildProducer producer) { + producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.DB2, "org.hibernate.dialect.DB297Dialect")); - producer.produce(new DatasourceDbKindHibernateOrmMetadataBuildItem(DatabaseKind.DERBY, + producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.DERBY, "org.hibernate.dialect.DerbyTenSevenDialect")); - producer.produce(new DatasourceDbKindHibernateOrmMetadataBuildItem(DatabaseKind.H2, + producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.H2, "io.quarkus.hibernate.orm.runtime.dialect.QuarkusH2Dialect")); - producer.produce(new DatasourceDbKindHibernateOrmMetadataBuildItem(DatabaseKind.MARIADB, + producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.MARIADB, "org.hibernate.dialect.MariaDB106Dialect")); - producer.produce(new DatasourceDbKindHibernateOrmMetadataBuildItem(DatabaseKind.MSSQL, + producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.MSSQL, "org.hibernate.dialect.SQLServer2016Dialect")); - producer.produce(new DatasourceDbKindHibernateOrmMetadataBuildItem(DatabaseKind.MYSQL, + producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.MYSQL, "org.hibernate.dialect.MySQL8Dialect")); - producer.produce(new DatasourceDbKindHibernateOrmMetadataBuildItem(DatabaseKind.ORACLE, + producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.ORACLE, "org.hibernate.dialect.Oracle12cDialect")); - producer.produce(new DatasourceDbKindHibernateOrmMetadataBuildItem(DatabaseKind.POSTGRESQL, + producer.produce(new DatabaseKindDialectBuildItem(DatabaseKind.POSTGRESQL, "io.quarkus.hibernate.orm.runtime.dialect.QuarkusPostgreSQL10Dialect")); } @@ -424,7 +424,7 @@ public void configurationDescriptorBuilding( BuildProducer nativeImageResources, BuildProducer hotDeploymentWatchedFiles, BuildProducer persistenceUnitDescriptors, - List dbKindMetadataBuildItems) { + List dbKindMetadataBuildItems) { if (!hasEntities(jpaModel)) { // we can bail out early as there are no entities @@ -935,7 +935,7 @@ private void handleHibernateORMWithNoPersistenceXml( BuildProducer nativeImageResources, BuildProducer hotDeploymentWatchedFiles, BuildProducer persistenceUnitDescriptors, - List dbKindMetadataBuildItems) { + List dbKindMetadataBuildItems) { if (!descriptors.isEmpty()) { if (hibernateOrmConfig.isAnyPropertySet() || !hibernateOrmConfig.persistenceUnits.isEmpty()) { throw new ConfigurationException( @@ -1016,7 +1016,7 @@ private static void producePersistenceUnitDescriptorFromConfig( BuildProducer hotDeploymentWatchedFiles, BuildProducer persistenceUnitDescriptors, Set storageEngineCollector, - List dbKindMetadataBuildItems) { + List dbKindMetadataBuildItems) { Optional jdbcDataSource = findJdbcDataSource(persistenceUnitName, persistenceUnitConfig, jdbcDataSources); diff --git a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java index 0abb6808696e7..a8daffdb1ac9c 100644 --- a/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java +++ b/extensions/hibernate-reactive/deployment/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java @@ -48,7 +48,7 @@ import io.quarkus.deployment.recording.RecorderContext; import io.quarkus.hibernate.orm.deployment.*; import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationRuntimeConfiguredBuildItem; -import io.quarkus.hibernate.orm.deployment.spi.DatasourceDbKindHibernateOrmMetadataBuildItem; +import io.quarkus.hibernate.orm.deployment.spi.DatabaseKindDialectBuildItem; import io.quarkus.hibernate.orm.runtime.HibernateOrmRuntimeConfig; import io.quarkus.hibernate.orm.runtime.PersistenceUnitUtil; import io.quarkus.hibernate.reactive.runtime.FastBootHibernateReactivePersistenceProvider; @@ -119,7 +119,7 @@ public void buildReactivePersistenceUnit( BuildProducer persistenceUnitDescriptors, List defaultDataSourceDbKindBuildItems, CurateOutcomeBuildItem curateOutcomeBuildItem, - List dbKindMetadataBuildItems) { + List dbKindDialectBuildItems) { final boolean enableHR = hasEntities(jpaModel); if (!enableHR) { @@ -151,7 +151,7 @@ public void buildReactivePersistenceUnit( ParsedPersistenceXmlDescriptor reactivePU = generateReactivePersistenceUnit( hibernateOrmConfig, jpaModel, dbKind, applicationArchivesBuildItem, launchMode.getLaunchMode(), - systemProperties, nativeImageResources, hotDeploymentWatchedFiles, dbKindMetadataBuildItems); + systemProperties, nativeImageResources, hotDeploymentWatchedFiles, dbKindDialectBuildItems); //Some constant arguments to the following method: // - this is Reactive @@ -204,7 +204,7 @@ private static ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit( BuildProducer systemProperties, BuildProducer nativeImageResources, BuildProducer hotDeploymentWatchedFiles, - List dbKindMetadataBuildItems) { + List dbKindDialectBuildItems) { HibernateOrmConfigPersistenceUnit persistenceUnitConfig = hibernateOrmConfig.defaultPersistenceUnit; @@ -216,7 +216,7 @@ private static ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit( if (explicitDialect.isPresent()) { dialect = explicitDialect.get(); } else { - dialect = Dialects.guessDialect(persistenceUnitConfigName, dbKind, dbKindMetadataBuildItems); + dialect = Dialects.guessDialect(persistenceUnitConfigName, dbKind, dbKindDialectBuildItems); } // we found one