From 0c13dc0f9569a71a2f1eca10c136faa2682a6487 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Tue, 18 Mar 2025 10:14:32 +0100 Subject: [PATCH] HHH-19267 Change scope of methods in JdbcEnvironmentInitiator This way Hibernate Reactive can reuse the logic for determining the database version, or the dialect resolution info. Related to https://github.com/hibernate/hibernate-reactive/issues/2129 --- .../env/internal/JdbcEnvironmentInitiator.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java index e55557518497..d49e97805db2 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java @@ -192,7 +192,8 @@ private DatabaseConnectionInfo buildInfo(Map configurationValues return new DatabaseConnectionInfoImpl( configurationValues, environment.getDialect() ); } - private static JdbcEnvironmentImpl getJdbcEnvironmentWithDefaults( + // Used by Hibernate Reactive + protected JdbcEnvironmentImpl getJdbcEnvironmentWithDefaults( Map configurationValues, ServiceRegistryImplementor registry, DialectFactory dialectFactory) { @@ -200,7 +201,8 @@ private static JdbcEnvironmentImpl getJdbcEnvironmentWithDefaults( return new JdbcEnvironmentImpl( registry, dialect ); } - private static JdbcEnvironmentImpl getJdbcEnvironmentWithExplicitConfiguration( + // Used by Hibernate Reactive + protected JdbcEnvironmentImpl getJdbcEnvironmentWithExplicitConfiguration( Map configurationValues, ServiceRegistryImplementor registry, DialectFactory dialectFactory, @@ -221,6 +223,15 @@ private static JdbcEnvironmentImpl getJdbcEnvironmentWithExplicitConfiguration( null, configurationValues ); + return getJdbcEnvironmentWithExplicitConfiguration( configurationValues, registry, dialectFactory, dialectResolutionInfo ); + } + + // Used by Hibernate Reactive + protected JdbcEnvironmentImpl getJdbcEnvironmentWithExplicitConfiguration( + Map configurationValues, + ServiceRegistryImplementor registry, + DialectFactory dialectFactory, + DialectResolutionInfo dialectResolutionInfo) { final Dialect dialect = dialectFactory.buildDialect( configurationValues, () -> dialectResolutionInfo ); return new JdbcEnvironmentImpl( registry, dialect ); }