Skip to content

Backport changes for Reactive for 6.6: Make it possible to extends the JdbcEnvironmentInitiator #9958

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 7, 2025
Merged

Backport changes for Reactive for 6.6: Make it possible to extends the JdbcEnvironmentInitiator #9958

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
613dc57
HHH-19267 Change scope of methods in JdbcEnvironmentInitiator
DavideD Mar 18, 2025
719e656
HHH-19288 Make JdbcEnvironmentInitiator#getJdbcEnvironmentUsingJdbcMe…
DavideD Mar 20, 2025
71078a2
HHH-19288 Move log of connection details to a method
DavideD Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions ...e-core/src/main/java/org/hibernate/engine/jdbc/env/internal/JdbcEnvironmentInitiator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,14 @@ else if ( explicitDialectConfiguration( explicitDatabaseName, configurationValue
databaseConnectionInfo = buildDbInfo( configurationValues, jdbcEnvironment.getDialect() );
}

logConnectionInfo( databaseConnectionInfo );
return jdbcEnvironment;
}

// For Hibernate Reactive: it needs to disable or customize the log
protected void logConnectionInfo(DatabaseConnectionInfo databaseConnectionInfo) {
// Standardized DB info logging
ConnectionInfoLogger.INSTANCE.logConnectionInfoDetails( databaseConnectionInfo.toInfoString() );

return jdbcEnvironment;
}

private DatabaseConnectionInfo buildDbInfo(ServiceRegistryImplementor registry, Dialect dialect) {
Expand All @@ -174,15 +178,17 @@ private DatabaseConnectionInfo buildDbInfo(Map<String, Object> configurationValu
return new DatabaseConnectionInfoImpl( configurationValues, dialect );
}

private static JdbcEnvironmentImpl getJdbcEnvironmentWithDefaults(
// Used by Hibernate Reactive
protected JdbcEnvironmentImpl getJdbcEnvironmentWithDefaults(
Map<String, Object> configurationValues,
ServiceRegistryImplementor registry,
DialectFactory dialectFactory) {
final Dialect dialect = dialectFactory.buildDialect( configurationValues, null );
return new JdbcEnvironmentImpl( registry, dialect );
}

private static JdbcEnvironmentImpl getJdbcEnvironmentWithExplicitConfiguration(
// Used by Hibernate Reactive
protected JdbcEnvironmentImpl getJdbcEnvironmentWithExplicitConfiguration(
Map<String, Object> configurationValues,
ServiceRegistryImplementor registry,
DialectFactory dialectFactory,
Expand All @@ -203,6 +209,15 @@ private static JdbcEnvironmentImpl getJdbcEnvironmentWithExplicitConfiguration(
null,
configurationValues
);
return getJdbcEnvironmentWithExplicitConfiguration( configurationValues, registry, dialectFactory, dialectResolutionInfo );
}

// Used by Hibernate Reactive
protected JdbcEnvironmentImpl getJdbcEnvironmentWithExplicitConfiguration(
Map<String, Object> configurationValues,
ServiceRegistryImplementor registry,
DialectFactory dialectFactory,
DialectResolutionInfo dialectResolutionInfo) {
final Dialect dialect = dialectFactory.buildDialect( configurationValues, () -> dialectResolutionInfo );
return new JdbcEnvironmentImpl( registry, dialect );
}
Expand Down Expand Up @@ -295,7 +310,8 @@ private static String getExplicitDatabaseName(Map<String, Object> configurationV
);
}

private JdbcEnvironmentImpl getJdbcEnvironmentUsingJdbcMetadata(
// Used by Hibernate Reactive
protected JdbcEnvironmentImpl getJdbcEnvironmentUsingJdbcMetadata(
Map<String, Object> configurationValues,
ServiceRegistryImplementor registry,
DialectFactory dialectFactory, String explicitDatabaseName,
Expand Down
Loading