Skip to content

fix more weird implementations of unwrap() #10766

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 15, 2025
Merged

fix more weird implementations of unwrap() #10766

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
6 changes: 2 additions & 4 deletions ...va/org/hibernate/engine/jdbc/connections/internal/UserSuppliedConnectionProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,13 @@
public class UserSuppliedConnectionProviderImpl implements ConnectionProvider {
@Override
public boolean isUnwrappableAs(Class<?> unwrapType) {
return ConnectionProvider.class.equals( unwrapType ) ||
UserSuppliedConnectionProviderImpl.class.isAssignableFrom( unwrapType );
return unwrapType.isAssignableFrom( UserSuppliedConnectionProviderImpl.class );
}

@Override
@SuppressWarnings( {"unchecked"})
public <T> T unwrap(Class<T> unwrapType) {
if ( ConnectionProvider.class.equals( unwrapType ) ||
UserSuppliedConnectionProviderImpl.class.isAssignableFrom( unwrapType ) ) {
if ( unwrapType.isAssignableFrom( UserSuppliedConnectionProviderImpl.class ) ) {
return (T) this;
}
else {
Expand Down
14 changes: 7 additions & 7 deletions ...engine/jdbc/connections/spi/AbstractDataSourceBasedMultiTenantConnectionProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*
* @author Steve Ebersole
*/
public abstract class AbstractDataSourceBasedMultiTenantConnectionProviderImpl<T> implements MultiTenantConnectionProvider<T> {
public abstract class AbstractDataSourceBasedMultiTenantConnectionProviderImpl<T>
implements MultiTenantConnectionProvider<T> {
protected abstract DataSource selectAnyDataSource();
protected abstract DataSource selectDataSource(T tenantIdentifier);

Expand Down Expand Up @@ -46,18 +47,17 @@ public boolean supportsAggressiveRelease() {

@Override
public boolean isUnwrappableAs(Class<?> unwrapType) {
return
DataSource.class.isAssignableFrom( unwrapType ) ||
MultiTenantConnectionProvider.class.isAssignableFrom( unwrapType );
return unwrapType.isInstance( this )
|| unwrapType.isAssignableFrom( DataSource.class );
}

@Override
@SuppressWarnings( {"unchecked"})
@SuppressWarnings("unchecked")
public <T> T unwrap(Class<T> unwrapType) {
if ( MultiTenantConnectionProvider.class.isAssignableFrom( unwrapType ) ) {
if ( unwrapType.isInstance( this ) ) {
return (T) this;
}
else if ( DataSource.class.isAssignableFrom( unwrapType ) ) {
else if ( unwrapType.isAssignableFrom( DataSource.class ) ) {
return (T) selectAnyDataSource();
}
else {
Expand Down
9 changes: 4 additions & 5 deletions ...java/org/hibernate/engine/jdbc/connections/spi/AbstractMultiTenantConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,17 @@ public boolean supportsAggressiveRelease() {

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

@Override
@SuppressWarnings("unchecked")
public <T> T unwrap(Class<T> unwrapType) {
if ( MultiTenantConnectionProvider.class.isAssignableFrom( unwrapType ) ) {
if ( unwrapType.isInstance( this ) ) {
return (T) this;
}
else if ( ConnectionProvider.class.isAssignableFrom( unwrapType ) ) {
else if ( unwrapType.isAssignableFrom( ConnectionProvider.class ) ) {
return (T) getAnyConnectionProvider();
}
else {
Expand Down
2 changes: 1 addition & 1 deletion ...bernate/engine/jdbc/connections/spi/DataSourceBasedMultiTenantConnectionProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private Map<T, DataSource> dataSourceMap() {

@Override
public void injectServices(ServiceRegistryImplementor serviceRegistry) {
final ConfigurationService configurationService = serviceRegistry.requireService( ConfigurationService.class );
final var configurationService = serviceRegistry.requireService( ConfigurationService.class );
final Object dataSourceConfigValue = configurationService.getSettings().get( DATASOURCE );
if ( !(dataSourceConfigValue instanceof String configuredJndiName) ) {
throw new HibernateException( "illegal value for configuration setting '" + DATASOURCE + "'" );
Expand Down
Loading