Skip to content

Commit

Permalink
Rename DatasourceDbKindHibernateOrmMetadataBuildItem to `DatabaseKi…
Browse files Browse the repository at this point in the history 
…ndDialectBuildItem`

As suggested in quarkusio#25792 (comment)
  • Loading branch information
@gastaldi
gastaldi committed Jun 2, 2022
1 parent 76b6817 commit 1471ab6
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 23 deletions.
7 changes: 5 additions & 2 deletions ...eDbKindHibernateOrmMetadataBuildItem.java → ...ent.spi/DatabaseKindDialectBuildItem.java
View file
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions .../hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/Dialects.java
View file
Expand Up @@ -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 {
Expand All @@ -13,8 +13,8 @@ private Dialects() {
}

public static String guessDialect(String persistenceUnitName, String resolvedDbKind,
List<DatasourceDbKindHibernateOrmMetadataBuildItem> dbKindMetadataBuildItems) {
for (DatasourceDbKindHibernateOrmMetadataBuildItem item : dbKindMetadataBuildItems) {
List<DatabaseKindDialectBuildItem> dbKindDialectBuildItems) {
for (DatabaseKindDialectBuildItem item : dbKindDialectBuildItems) {
if (DatabaseKind.is(resolvedDbKind, item.getDbKind())) {
return item.getDialect();
}
Expand Down
26 changes: 13 additions & 13 deletions ...m/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmProcessor.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -172,22 +172,22 @@ public final class HibernateOrmProcessor {

@BuildStep
void registerHibernateOrmMetadataForCoreDialects(
BuildProducer<DatasourceDbKindHibernateOrmMetadataBuildItem> producer) {
producer.produce(new DatasourceDbKindHibernateOrmMetadataBuildItem(DatabaseKind.DB2,
BuildProducer<DatabaseKindDialectBuildItem> 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"));
}

Expand Down Expand Up @@ -424,7 +424,7 @@ public void configurationDescriptorBuilding(
BuildProducer<NativeImageResourceBuildItem> nativeImageResources,
BuildProducer<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFiles,
BuildProducer<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors,
List<DatasourceDbKindHibernateOrmMetadataBuildItem> dbKindMetadataBuildItems) {
List<DatabaseKindDialectBuildItem> dbKindMetadataBuildItems) {

if (!hasEntities(jpaModel)) {
// we can bail out early as there are no entities
Expand Down Expand Up @@ -935,7 +935,7 @@ private void handleHibernateORMWithNoPersistenceXml(
BuildProducer<NativeImageResourceBuildItem> nativeImageResources,
BuildProducer<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFiles,
BuildProducer<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors,
List<DatasourceDbKindHibernateOrmMetadataBuildItem> dbKindMetadataBuildItems) {
List<DatabaseKindDialectBuildItem> dbKindMetadataBuildItems) {
if (!descriptors.isEmpty()) {
if (hibernateOrmConfig.isAnyPropertySet() || !hibernateOrmConfig.persistenceUnits.isEmpty()) {
throw new ConfigurationException(
Expand Down Expand Up @@ -1016,7 +1016,7 @@ private static void producePersistenceUnitDescriptorFromConfig(
BuildProducer<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFiles,
BuildProducer<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors,
Set<String> storageEngineCollector,
List<DatasourceDbKindHibernateOrmMetadataBuildItem> dbKindMetadataBuildItems) {
List<DatabaseKindDialectBuildItem> dbKindMetadataBuildItems) {
Optional<JdbcDataSourceBuildItem> jdbcDataSource = findJdbcDataSource(persistenceUnitName, persistenceUnitConfig,
jdbcDataSources);

Expand Down
10 changes: 5 additions & 5 deletions ...nt/src/main/java/io/quarkus/hibernate/reactive/deployment/HibernateReactiveProcessor.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -119,7 +119,7 @@ public void buildReactivePersistenceUnit(
BuildProducer<PersistenceUnitDescriptorBuildItem> persistenceUnitDescriptors,
List<DefaultDataSourceDbKindBuildItem> defaultDataSourceDbKindBuildItems,
CurateOutcomeBuildItem curateOutcomeBuildItem,
List<DatasourceDbKindHibernateOrmMetadataBuildItem> dbKindMetadataBuildItems) {
List<DatabaseKindDialectBuildItem> dbKindDialectBuildItems) {

final boolean enableHR = hasEntities(jpaModel);
if (!enableHR) {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -204,7 +204,7 @@ private static ParsedPersistenceXmlDescriptor generateReactivePersistenceUnit(
BuildProducer<SystemPropertyBuildItem> systemProperties,
BuildProducer<NativeImageResourceBuildItem> nativeImageResources,
BuildProducer<HotDeploymentWatchedFileBuildItem> hotDeploymentWatchedFiles,
List<DatasourceDbKindHibernateOrmMetadataBuildItem> dbKindMetadataBuildItems) {
List<DatabaseKindDialectBuildItem> dbKindDialectBuildItems) {

HibernateOrmConfigPersistenceUnit persistenceUnitConfig = hibernateOrmConfig.defaultPersistenceUnit;

Expand All @@ -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
Expand Down

0 comments on commit 1471ab6

Please sign in to comment.