Skip to content

log warnings when settings are ignored for Datasource #9400

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
Dec 11, 2024
Merged

log warnings when settings are ignored for Datasource #9400

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSett
*
* @since 5.2.10
*/
String CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT= "hibernate.connection.provider_disables_autocommit";
String CONNECTION_PROVIDER_DISABLES_AUTOCOMMIT = "hibernate.connection.provider_disables_autocommit";

/**
* A prefix for properties specifying arbitrary JDBC connection properties. These
Expand Down
14 changes: 12 additions & 2 deletions ...java/org/hibernate/engine/jdbc/connections/internal/DatasourceConnectionProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.engine.jdbc.connections.spi.DatabaseConnectionInfo;
import org.hibernate.engine.jndi.spi.JndiService;
import org.hibernate.internal.log.ConnectionInfoLogger;
import org.hibernate.service.UnknownUnwrapTypeException;
import org.hibernate.service.spi.Configurable;
import org.hibernate.service.spi.InjectService;
Expand Down Expand Up @@ -87,8 +88,8 @@ else if ( DataSource.class.isAssignableFrom( unwrapType ) ) {
public void configure(Map<String, Object> configValues) {
if ( dataSource == null ) {
final Object dataSourceSetting = configValues.get( DATASOURCE );
if ( dataSourceSetting instanceof DataSource ) {
dataSource = (DataSource) dataSourceSetting;
if ( dataSourceSetting instanceof DataSource ds ) {
dataSource = ds;
}
else {
final String dataSourceJndiName = (String) dataSourceSetting;
Expand All @@ -109,6 +110,15 @@ public void configure(Map<String, Object> configValues) {
throw new HibernateException( "Unable to determine appropriate DataSource to use" );
}

if ( configValues.containsKey( AvailableSettings.AUTOCOMMIT ) ) {
ConnectionInfoLogger.INSTANCE.ignoredSetting( AvailableSettings.AUTOCOMMIT,
DatasourceConnectionProviderImpl.class );
}
if ( configValues.containsKey( AvailableSettings.ISOLATION ) ) {
ConnectionInfoLogger.INSTANCE.ignoredSetting( AvailableSettings.ISOLATION,
DatasourceConnectionProviderImpl.class );
}

user = (String) configValues.get( AvailableSettings.USER );
pass = (String) configValues.get( AvailableSettings.PASS );
useCredentials = user != null || pass != null;
Expand Down
6 changes: 5 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/internal/log/ConnectionInfoLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public interface ConnectionInfoLogger extends BasicLogger {
@Message(id = 10001006,
value = "No JDBC Driver class was specified by property '"
+ JdbcSettings.JAKARTA_JDBC_DRIVER + "', '"
+ JdbcSettings.JPA_JDBC_DRIVER + "', or '"
+ JdbcSettings.JPA_JDBC_DRIVER + "', or '"
+ JdbcSettings.DRIVER + "'")
void jdbcDriverNotSpecified();

Expand All @@ -72,4 +72,8 @@ public interface ConnectionInfoLogger extends BasicLogger {
@LogMessage(level = DEBUG)
@Message(value = "Configuring connection pool [%s]", id = 10001012)
void configureConnectionPool(String type);

@LogMessage(level = INFO)
@Message(value = "Ignoring setting '%s' for connection provider [%s]", id = 10001013)
void ignoredSetting(String setting, Class<?> provider);
}
Loading