From 2d2bf126faaeda0317f1afab6a2f2a3aaba91e9a Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Thu, 20 Mar 2025 11:54:36 +0100 Subject: [PATCH 1/2] HHH-19288 Make JdbcEnvironmentInitiator#getJdbcEnvironmentUsingJdbcMetadata protected For Hibernate Reactive, see issue https://github.com/hibernate/hibernate-reactive/issues/2129 --- .../engine/jdbc/env/internal/JdbcEnvironmentInitiator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 d49e97805db2..8d7b4ad6afb4 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 @@ -324,7 +324,8 @@ private static String getExplicitDatabaseName(Map configurationV ); } - private JdbcEnvironmentImpl getJdbcEnvironmentUsingJdbcMetadata( + // Used by Hibernate Reactive + protected JdbcEnvironmentImpl getJdbcEnvironmentUsingJdbcMetadata( Map configurationValues, ServiceRegistryImplementor registry, DialectFactory dialectFactory, String explicitDatabaseName, From ccf93dfa9a897067bad88f518c7542854411f466 Mon Sep 17 00:00:00 2001 From: Davide D'Alto Date: Fri, 21 Mar 2025 09:35:07 +0100 Subject: [PATCH 2/2] HHH-19288 Move log of connection details to a method For Hibernate Reactive, it needs to be able to disable, or customize, the log of the connection details. --- .../engine/jdbc/env/internal/JdbcEnvironmentInitiator.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 8d7b4ad6afb4..e40952399bcc 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 @@ -172,9 +172,14 @@ else if ( explicitDialectConfiguration( explicitDatabaseName, configurationValue databaseConnectionInfo = buildInfo( configurationValues, jdbcEnvironment ); } + logConnectionInfo( databaseConnectionInfo ); + return jdbcEnvironment; + } + + // For Hibernate Reactive: it needs to disable or customize the log + protected void logConnectionInfo(DatabaseConnectionInfo databaseConnectionInfo) { // Standardized info logging ConnectionInfoLogger.INSTANCE.logConnectionInfoDetails( databaseConnectionInfo.toInfoString() ); - return jdbcEnvironment; } private DatabaseConnectionInfo buildInfo(ServiceRegistryImplementor registry, JdbcEnvironment environment) {