Skip to content

fix "weird" unwrap logic in the ConnectionProviders #10730

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
Aug 10, 2025
Merged

fix "weird" unwrap logic in the ConnectionProviders #10730

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
23 changes: 10 additions & 13 deletions hibernate-agroal/src/main/java/org/hibernate/agroal/internal/AgroalConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import java.io.Serial;
import java.sql.Connection;
import java.sql.SQLException;
import javax.sql.DataSource;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Function;
Expand Down Expand Up @@ -84,9 +83,9 @@ public class AgroalConnectionProvider implements ConnectionProvider, Configurabl

private static String extractIsolationAsString(Map<String, Object> properties) {
final Integer isolation = ConnectionProviderInitiator.extractIsolation( properties );
return isolation != null ?
return isolation != null
// Agroal resolves transaction isolation from the 'nice' name
toIsolationNiceName( isolation )
? toIsolationNiceName( isolation )
: null;
}

Expand Down Expand Up @@ -116,9 +115,7 @@ public void configure(Map<String, Object> properties) throws HibernateException
: String.valueOf( 10 );
config.put( AgroalSettings.AGROAL_MAX_SIZE, maxSize );
}
final AgroalPropertiesReader agroalProperties =
new AgroalPropertiesReader( CONFIG_PREFIX )
.readProperties( config );
final var agroalProperties = new AgroalPropertiesReader( CONFIG_PREFIX ).readProperties( config );
agroalProperties.modify()
.connectionPoolConfiguration( cp -> cp.connectionFactoryConfiguration( cf -> {
copyProperty( properties, JdbcSettings.DRIVER, cf::connectionProviderClassName, identity() );
Expand Down Expand Up @@ -205,22 +202,22 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {

@Override
public boolean isUnwrappableAs(Class<?> unwrapType) {
return ConnectionProvider.class.equals( unwrapType )
|| AgroalConnectionProvider.class.isAssignableFrom( unwrapType )
|| DataSource.class.isAssignableFrom( unwrapType );
return unwrapType.isAssignableFrom( AgroalConnectionProvider.class )
|| unwrapType.isAssignableFrom( AgroalDataSource.class );
}

@Override
@SuppressWarnings( "unchecked" )
public <T> T unwrap(Class<T> unwrapType) {
if ( ConnectionProvider.class.equals( unwrapType )
|| AgroalConnectionProvider.class.isAssignableFrom( unwrapType ) ) {
if ( unwrapType.isAssignableFrom( AgroalConnectionProvider.class ) ) {
return (T) this;
}
if ( DataSource.class.isAssignableFrom( unwrapType ) ) {
else if ( unwrapType.isAssignableFrom( AgroalDataSource.class ) ) {
return (T) agroalDataSource;
}
throw new UnknownUnwrapTypeException( unwrapType );
else {
throw new UnknownUnwrapTypeException( unwrapType );
}
}

// --- Stoppable
Expand Down
10 changes: 4 additions & 6 deletions hibernate-c3p0/src/main/java/org/hibernate/c3p0/internal/C3P0ConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,19 +115,17 @@ public void closeConnection(Connection connection) throws SQLException {

@Override
public boolean isUnwrappableAs(Class<?> unwrapType) {
return ConnectionProvider.class.equals( unwrapType )
|| C3P0ConnectionProvider.class.isAssignableFrom( unwrapType )
|| DataSource.class.isAssignableFrom( unwrapType );
return unwrapType.isAssignableFrom( C3P0ConnectionProvider.class )
|| unwrapType.isAssignableFrom( DataSource.class );
}

@Override
@SuppressWarnings("unchecked")
public <T> T unwrap(Class<T> unwrapType) {
if ( ConnectionProvider.class.equals( unwrapType )
|| C3P0ConnectionProvider.class.isAssignableFrom( unwrapType ) ) {
if ( unwrapType.isAssignableFrom( C3P0ConnectionProvider.class ) ) {
return (T) this;
}
else if ( DataSource.class.isAssignableFrom( unwrapType ) ) {
else if ( unwrapType.isAssignableFrom( DataSource.class ) ) {
return (T) dataSource;
}
else {
Expand Down
13 changes: 6 additions & 7 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 @@ -40,7 +40,8 @@
* @author Gavin King
* @author Steve Ebersole
*/
public class DatasourceConnectionProviderImpl implements ConnectionProvider, Configurable, Stoppable {
public class DatasourceConnectionProviderImpl
implements ConnectionProvider, Configurable, Stoppable {

private DataSource dataSource;
private String user;
Expand All @@ -67,19 +68,17 @@ public void setJndiService(JndiService jndiService) {

@Override
public boolean isUnwrappableAs(Class<?> unwrapType) {
return ConnectionProvider.class.equals( unwrapType )
|| DatasourceConnectionProviderImpl.class.isAssignableFrom( unwrapType )
|| DataSource.class.isAssignableFrom( unwrapType );
return unwrapType.isAssignableFrom( DatasourceConnectionProviderImpl.class )
|| unwrapType.isAssignableFrom( DataSource.class);
}

@Override
@SuppressWarnings("unchecked")
public <T> T unwrap(Class<T> unwrapType) {
if ( ConnectionProvider.class.equals( unwrapType )
|| DatasourceConnectionProviderImpl.class.isAssignableFrom( unwrapType ) ) {
if ( unwrapType.isAssignableFrom( DatasourceConnectionProviderImpl.class ) ) {
return (T) this;
}
else if ( DataSource.class.isAssignableFrom( unwrapType ) ) {
else if ( unwrapType.isAssignableFrom( DataSource.class) ) {
return (T) getDataSource();
}
else {
Expand Down
6 changes: 2 additions & 4 deletions ...a/org/hibernate/engine/jdbc/connections/internal/DriverManagerConnectionProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,15 +318,13 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {

@Override
public boolean isUnwrappableAs(Class<?> unwrapType) {
return ConnectionProvider.class.equals( unwrapType ) ||
DriverManagerConnectionProviderImpl.class.isAssignableFrom( unwrapType );
return unwrapType.isAssignableFrom( DriverManagerConnectionProviderImpl.class );
}

@Override
@SuppressWarnings( {"unchecked"})
public <T> T unwrap(Class<T> unwrapType) {
if ( ConnectionProvider.class.equals( unwrapType ) ||
DriverManagerConnectionProviderImpl.class.isAssignableFrom( unwrapType ) ) {
if ( unwrapType.isAssignableFrom( DriverManagerConnectionProviderImpl.class ) ) {
return (T) this;
}
else {
Expand Down
15 changes: 8 additions & 7 deletions ...te-hikaricp/src/main/java/org/hibernate/hikaricp/internal/HikariCPConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import java.io.Serial;
import java.sql.Connection;
import java.sql.SQLException;
import javax.sql.DataSource;
import java.util.Map;

import org.hibernate.HibernateException;
Expand Down Expand Up @@ -140,21 +139,23 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {

@Override
public boolean isUnwrappableAs(Class<?> unwrapType) {
return ConnectionProvider.class.equals( unwrapType )
|| HikariCPConnectionProvider.class.isAssignableFrom( unwrapType )
|| DataSource.class.isAssignableFrom( unwrapType );
return unwrapType.isAssignableFrom( HikariCPConnectionProvider.class )
|| unwrapType.isAssignableFrom( HikariDataSource.class )
|| unwrapType.isAssignableFrom( HikariConfig.class );
}

@Override
@SuppressWarnings("unchecked")
public <T> T unwrap(Class<T> unwrapType) {
if ( ConnectionProvider.class.equals( unwrapType )
|| HikariCPConnectionProvider.class.isAssignableFrom( unwrapType ) ) {
if ( unwrapType.isAssignableFrom( HikariCPConnectionProvider.class ) ) {
return (T) this;
}
else if ( DataSource.class.isAssignableFrom( unwrapType ) ) {
else if ( unwrapType.isAssignableFrom( HikariDataSource.class ) ) {
return (T) hikariDataSource;
}
else if ( unwrapType.isAssignableFrom( HikariConfig.class ) ) {
return (T) hikariConfig;
}
else {
throw new UnknownUnwrapTypeException( unwrapType );
}
Expand Down