Skip to content

Change scope of methods in JdbcEnvironmentInitiator #9871

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 1 commit into from
Mar 18, 2025
Merged

Change scope of methods in JdbcEnvironmentInitiator #9871

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 13 additions & 2 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 @@ -192,15 +192,17 @@ private DatabaseConnectionInfo buildInfo(Map<String, Object> configurationValues
return new DatabaseConnectionInfoImpl( configurationValues, environment.getDialect() );
}

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 @@ -221,6 +223,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