Skip to content

Commit e874a1e

Browse files
committed
HHH-19702 rename back to DriverManagerConnectionProvider/DataSourceConnectionProvider
1 parent bcec20f commit e874a1e

File tree

35 files changed

+129
-130
lines changed

35 files changed

+129
-130
lines changed

documentation/src/main/asciidoc/topical/registries/ServiceRegistries.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ service is defined by the interface (service role) +org.hibernate.engine.jdbc.co
2828
which declares methods for obtaining and releasing the Connections. There are then multiple implementations of that
2929
service contract, varying in how they actually manage the Connections:
3030

31-
* +org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl+ for using a +javax.sql.DataSource+
31+
* +org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider+ for using a +javax.sql.DataSource+
3232
* +org.hibernate.c3p0.internal.C3P0ConnectionProvider+ for using a C3P0 Connection pool
3333
* etc.
3434

hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,12 @@ public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSett
246246
* automatically:
247247
* <ul>
248248
* <li>if {@link #JAKARTA_JTA_DATASOURCE} or {@link #JAKARTA_NON_JTA_DATASOURCE}
249-
* is set, {@linkplain org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl
249+
* is set, {@linkplain org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider
250250
* a datasource-based implementation} is used;
251251
* <li>otherwise, a {@code ConnectionProvider} is loaded automatically as a
252252
* {@linkplain java.util.ServiceLoader Java service};
253253
* <li>but if no service is found, or if more than one service is available,
254-
* {@linkplain org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl
254+
* {@linkplain org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProvider
255255
* a default implementation} is used as a fallback.
256256
* </ul>
257257
* <p>
@@ -266,7 +266,7 @@ public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSett
266266
* Specifies the maximum number of inactive connections for any
267267
* {@linkplain ConnectionProvider connection pool} which respects this
268268
* setting, including every built-in implementation except for
269-
* {@link org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl}.
269+
* {@link org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider}.
270270
* <p>
271271
* The default pool size depends on the connection provider.
272272
*/
@@ -276,7 +276,7 @@ public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSett
276276
* Specifies the JDBC transaction isolation level for connections obtained
277277
* from any {@link ConnectionProvider} implementation which respects this
278278
* setting, including every built-in implementation except for
279-
* {@link org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl}.
279+
* {@link org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider}.
280280
* <p>
281281
* Possible values are enumerated by {@link java.sql.Connection}:
282282
* {@code READ_UNCOMMITTED}, {@code READ_COMMITTED},
@@ -293,7 +293,7 @@ public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSett
293293
* Controls the autocommit mode of JDBC connections obtained from any
294294
* {@link ConnectionProvider} implementation which respects this setting,
295295
* including every built-in implementation except for
296-
* {@link org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl}.
296+
* {@link org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider}.
297297
*
298298
* @see java.sql.Connection#setAutoCommit(boolean)
299299
*
@@ -329,7 +329,7 @@ public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSett
329329
* append {@code foo=bar} to the JDBC connection URL.
330330
*
331331
* @deprecated This setting is only supported by {@code C3P0ConnectionProvider}
332-
* and {@link org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl}.
332+
* and {@link org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProvider}.
333333
*/
334334
@Deprecated(since="7")
335335
String CONNECTION_PREFIX = "hibernate.connection";

hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private ConnectionProvider instantiateNamedConnectionProvider(
140140
private ConnectionProvider instantiateConnectionProvider(
141141
Map<String, Object> configurationValues, StrategySelector strategySelector, BeanContainer beanContainer) {
142142
if ( configurationValues.containsKey( DATASOURCE ) ) {
143-
return new DatasourceConnectionProviderImpl();
143+
return new DataSourceConnectionProvider();
144144
}
145145

146146
final Class<? extends ConnectionProvider> singleRegisteredProvider =
@@ -163,7 +163,7 @@ else if ( hasConfiguration( configurationValues, AGROAL_CONFIG_PREFIX ) ) {
163163
return instantiateProvider( strategySelector, AGROAL_STRATEGY );
164164
}
165165
else if ( configurationValues.containsKey( URL ) ) {
166-
return new DriverManagerConnectionProviderImpl();
166+
return new DriverManagerConnectionProvider();
167167
}
168168
else {
169169
if ( beanContainer != null ) {
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* @author Gavin King
4141
* @author Steve Ebersole
4242
*/
43-
public class DatasourceConnectionProviderImpl
43+
public class DataSourceConnectionProvider
4444
implements ConnectionProvider, Configurable, Stoppable {
4545

4646
private DataSource dataSource;
@@ -68,14 +68,14 @@ public void setJndiService(JndiService jndiService) {
6868

6969
@Override
7070
public boolean isUnwrappableAs(Class<?> unwrapType) {
71-
return unwrapType.isAssignableFrom( DatasourceConnectionProviderImpl.class )
71+
return unwrapType.isAssignableFrom( DataSourceConnectionProvider.class )
7272
|| unwrapType.isAssignableFrom( DataSource.class);
7373
}
7474

7575
@Override
7676
@SuppressWarnings("unchecked")
7777
public <T> T unwrap(Class<T> unwrapType) {
78-
if ( unwrapType.isAssignableFrom( DatasourceConnectionProviderImpl.class ) ) {
78+
if ( unwrapType.isAssignableFrom( DataSourceConnectionProvider.class ) ) {
7979
return (T) this;
8080
}
8181
else if ( unwrapType.isAssignableFrom( DataSource.class) ) {
@@ -111,11 +111,11 @@ else if ( dataSourceSetting instanceof String jndiName ) {
111111

112112
if ( configuration.containsKey( JdbcSettings.AUTOCOMMIT ) ) {
113113
ConnectionInfoLogger.INSTANCE.ignoredSetting( JdbcSettings.AUTOCOMMIT,
114-
DatasourceConnectionProviderImpl.class );
114+
DataSourceConnectionProvider.class );
115115
}
116116
if ( configuration.containsKey( JdbcSettings.ISOLATION ) ) {
117117
ConnectionInfoLogger.INSTANCE.ignoredSetting( JdbcSettings.ISOLATION,
118-
DatasourceConnectionProviderImpl.class );
118+
DataSourceConnectionProvider.class );
119119
}
120120

121121
user = (String) configuration.get( JdbcSettings.USER );
@@ -156,7 +156,7 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
156156
@Override
157157
public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect, ExtractedDatabaseMetaData metaData) {
158158
return new DatabaseConnectionInfoImpl(
159-
DatasourceConnectionProviderImpl.class,
159+
DataSourceConnectionProvider.class,
160160
metaData == null ? null : metaData.getUrl(),
161161
metaData == null ? null : metaData.getDriver(),
162162
dialect.getClass(),
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* @author Gavin King
5858
* @author Steve Ebersole
5959
*/
60-
public class DriverManagerConnectionProviderImpl
60+
public class DriverManagerConnectionProvider
6161
implements ConnectionProvider, Configurable, Stoppable, ServiceRegistryAwareService, ConnectionValidator {
6262

6363
public static final String MIN_SIZE = "hibernate.connection.min_pool_size";
@@ -123,7 +123,7 @@ private PooledConnections buildPool(Map<String,Object> configuration, ServiceReg
123123

124124
try ( var connection = connectionCreator.createConnection() ) {
125125
dbInfo = new DatabaseConnectionInfoImpl(
126-
DriverManagerConnectionProviderImpl.class,
126+
DriverManagerConnectionProvider.class,
127127
url,
128128
getDriverName( connection ),
129129
null,
@@ -299,7 +299,7 @@ public boolean supportsAggressiveRelease() {
299299
@Override
300300
public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
301301
return new DatabaseConnectionInfoImpl(
302-
DriverManagerConnectionProviderImpl.class,
302+
DriverManagerConnectionProvider.class,
303303
dbInfo.getJdbcUrl(),
304304
dbInfo.getJdbcDriver(),
305305
dialect.getClass(),
@@ -318,13 +318,13 @@ public DatabaseConnectionInfo getDatabaseConnectionInfo(Dialect dialect) {
318318

319319
@Override
320320
public boolean isUnwrappableAs(Class<?> unwrapType) {
321-
return unwrapType.isAssignableFrom( DriverManagerConnectionProviderImpl.class );
321+
return unwrapType.isAssignableFrom( DriverManagerConnectionProvider.class );
322322
}
323323

324324
@Override
325325
@SuppressWarnings( {"unchecked"})
326326
public <T> T unwrap(Class<T> unwrapType) {
327-
if ( unwrapType.isAssignableFrom( DriverManagerConnectionProviderImpl.class ) ) {
327+
if ( unwrapType.isAssignableFrom( DriverManagerConnectionProvider.class ) ) {
328328
return (T) this;
329329
}
330330
else {

hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitInfoTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import org.hibernate.cfg.AvailableSettings;
1414
import org.hibernate.dialect.H2Dialect;
15-
import org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl;
15+
import org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider;
1616
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
1717
import org.hibernate.engine.spi.SessionFactoryImplementor;
1818
import org.hibernate.jpa.HibernatePersistenceProvider;
@@ -58,8 +58,8 @@ public DataSource getNonJtaDataSource() {
5858
final ConnectionProvider connectionProvider = emf.unwrap( SessionFactoryImplementor.class )
5959
.getServiceRegistry()
6060
.getService( ConnectionProvider.class );
61-
assertThat( connectionProvider, instanceOf( DatasourceConnectionProviderImpl.class ) );
62-
final DatasourceConnectionProviderImpl dsCp = (DatasourceConnectionProviderImpl) connectionProvider;
61+
assertThat( connectionProvider, instanceOf( DataSourceConnectionProvider.class ) );
62+
final DataSourceConnectionProvider dsCp = (DataSourceConnectionProvider) connectionProvider;
6363
assertThat( dsCp.getDataSource(), is( puDataSource ) );
6464

6565
// now let's check that it is exposed via the EMF properties
@@ -92,8 +92,8 @@ public DataSource getJtaDataSource() {
9292
final ConnectionProvider connectionProvider = emf.unwrap( SessionFactoryImplementor.class )
9393
.getServiceRegistry()
9494
.getService( ConnectionProvider.class );
95-
assertThat( connectionProvider, instanceOf( DatasourceConnectionProviderImpl.class ) );
96-
final DatasourceConnectionProviderImpl dsCp = (DatasourceConnectionProviderImpl) connectionProvider;
95+
assertThat( connectionProvider, instanceOf( DataSourceConnectionProvider.class ) );
96+
final DataSourceConnectionProvider dsCp = (DataSourceConnectionProvider) connectionProvider;
9797
assertThat( dsCp.getDataSource(), is( puDataSource ) );
9898

9999
// now let's check that it is exposed via the EMF properties

hibernate-core/src/test/java/org/hibernate/orm/test/bootstrap/jpa/PersistenceUnitOverridesTests.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import org.hibernate.dialect.Dialect;
1717
import org.hibernate.dialect.H2Dialect;
1818
import org.hibernate.dialect.SimpleDatabaseVersion;
19-
import org.hibernate.engine.jdbc.connections.internal.DatasourceConnectionProviderImpl;
20-
import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
19+
import org.hibernate.engine.jdbc.connections.internal.DataSourceConnectionProvider;
20+
import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProvider;
2121
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
2222
import org.hibernate.engine.spi.SessionFactoryImplementor;
2323
import org.hibernate.jpa.HibernatePersistenceProvider;
@@ -106,8 +106,8 @@ public void testPassingIntegrationJtaDataSourceOverrideForJpaJdbcSettings() {
106106
final ConnectionProvider connectionProvider = emf.unwrap( SessionFactoryImplementor.class )
107107
.getServiceRegistry()
108108
.getService( ConnectionProvider.class );
109-
assertThat( connectionProvider, instanceOf( DatasourceConnectionProviderImpl.class ) );
110-
final DatasourceConnectionProviderImpl dsCp = (DatasourceConnectionProviderImpl) connectionProvider;
109+
assertThat( connectionProvider, instanceOf( DataSourceConnectionProvider.class ) );
110+
final DataSourceConnectionProvider dsCp = (DataSourceConnectionProvider) connectionProvider;
111111
assertThat( dsCp.getDataSource(), is( integrationDataSource ) );
112112

113113
// now let's check that it is exposed via the EMF properties
@@ -190,7 +190,7 @@ public Properties getProperties() {
190190
final ConnectionProvider connectionProvider = emf.unwrap( SessionFactoryImplementor.class )
191191
.getServiceRegistry()
192192
.getService( ConnectionProvider.class );
193-
assertThat( connectionProvider, instanceOf( DriverManagerConnectionProviderImpl.class ) );
193+
assertThat( connectionProvider, instanceOf( DriverManagerConnectionProvider.class ) );
194194
}
195195
finally {
196196
emf.close();
@@ -243,7 +243,7 @@ public DataSource getJtaDataSource() {
243243
final ConnectionProvider connectionProvider = emf.unwrap( SessionFactoryImplementor.class )
244244
.getServiceRegistry()
245245
.getService( ConnectionProvider.class );
246-
assertThat( connectionProvider, instanceOf( DriverManagerConnectionProviderImpl.class ) );
246+
assertThat( connectionProvider, instanceOf( DriverManagerConnectionProvider.class ) );
247247
}
248248
finally {
249249
emf.close();
@@ -298,9 +298,9 @@ public DataSource getJtaDataSource() {
298298
final ConnectionProvider connectionProvider = emf.unwrap( SessionFactoryImplementor.class )
299299
.getServiceRegistry()
300300
.getService( ConnectionProvider.class );
301-
assertThat( connectionProvider, instanceOf( DatasourceConnectionProviderImpl.class ) );
301+
assertThat( connectionProvider, instanceOf( DataSourceConnectionProvider.class ) );
302302

303-
final DatasourceConnectionProviderImpl datasourceConnectionProvider = (DatasourceConnectionProviderImpl) connectionProvider;
303+
final DataSourceConnectionProvider datasourceConnectionProvider = (DataSourceConnectionProvider) connectionProvider;
304304
assertThat( datasourceConnectionProvider.getDataSource(), is( integrationDataSource ) );
305305
}
306306
finally {
@@ -345,9 +345,9 @@ public DataSource getNonJtaDataSource() {
345345

346346
final SessionFactoryImplementor sessionFactory = emf.unwrap( SessionFactoryImplementor.class );
347347
final ConnectionProvider connectionProvider = sessionFactory.getServiceRegistry().getService( ConnectionProvider.class );
348-
assertThat( connectionProvider, instanceOf( DatasourceConnectionProviderImpl.class ) );
348+
assertThat( connectionProvider, instanceOf( DataSourceConnectionProvider.class ) );
349349

350-
final DatasourceConnectionProviderImpl dsProvider = (DatasourceConnectionProviderImpl) connectionProvider;
350+
final DataSourceConnectionProvider dsProvider = (DataSourceConnectionProvider) connectionProvider;
351351
assertThat( dsProvider.getDataSource(), is( override ) );
352352
}
353353
finally {
@@ -374,7 +374,7 @@ public DataSource getNonJtaDataSource() {
374374
integrationSettings.put( AvailableSettings.JPA_JDBC_URL, ConnectionProviderBuilder.URL );
375375
integrationSettings.put( AvailableSettings.JPA_JDBC_USER, ConnectionProviderBuilder.USER );
376376
integrationSettings.put( AvailableSettings.JPA_JDBC_PASSWORD, ConnectionProviderBuilder.PASS );
377-
integrationSettings.put( DriverManagerConnectionProviderImpl.INIT_SQL, "" );
377+
integrationSettings.put( DriverManagerConnectionProvider.INIT_SQL, "" );
378378

379379
final PersistenceProvider provider = new HibernatePersistenceProvider();
380380

@@ -387,7 +387,7 @@ public DataSource getNonJtaDataSource() {
387387
final SessionFactoryImplementor sessionFactory = emf.unwrap( SessionFactoryImplementor.class );
388388
final ConnectionProvider connectionProvider = sessionFactory.getServiceRegistry().getService(
389389
ConnectionProvider.class );
390-
assertThat( connectionProvider, instanceOf( DriverManagerConnectionProviderImpl.class ) );
390+
assertThat( connectionProvider, instanceOf( DriverManagerConnectionProvider.class ) );
391391
}
392392
finally {
393393
emf.close();
@@ -413,7 +413,7 @@ public DataSource getNonJtaDataSource() {
413413
integrationSettings.put( AvailableSettings.JAKARTA_JDBC_URL, ConnectionProviderBuilder.URL );
414414
integrationSettings.put( AvailableSettings.JAKARTA_JDBC_USER, ConnectionProviderBuilder.USER );
415415
integrationSettings.put( AvailableSettings.JAKARTA_JDBC_PASSWORD, ConnectionProviderBuilder.PASS );
416-
integrationSettings.put( DriverManagerConnectionProviderImpl.INIT_SQL, "" );
416+
integrationSettings.put( DriverManagerConnectionProvider.INIT_SQL, "" );
417417

418418
final PersistenceProvider provider = new HibernatePersistenceProvider();
419419

@@ -426,7 +426,7 @@ public DataSource getNonJtaDataSource() {
426426
final SessionFactoryImplementor sessionFactory = emf.unwrap( SessionFactoryImplementor.class );
427427
final ConnectionProvider connectionProvider = sessionFactory.getServiceRegistry().getService(
428428
ConnectionProvider.class );
429-
assertThat( connectionProvider, instanceOf( DriverManagerConnectionProviderImpl.class ) );
429+
assertThat( connectionProvider, instanceOf( DriverManagerConnectionProvider.class ) );
430430
}
431431
finally {
432432
emf.close();

hibernate-core/src/test/java/org/hibernate/orm/test/cache/SingleRegisteredProviderTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import org.hibernate.cache.internal.NoCachingRegionFactory;
1414
import org.hibernate.cache.spi.RegionFactory;
1515
import org.hibernate.cfg.AvailableSettings;
16-
import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
16+
import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProvider;
1717
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
1818

1919
import org.hibernate.testing.junit4.BaseUnitTestCase;
@@ -91,14 +91,14 @@ public void testConnectionsRegistered() {
9191
bsr.getService( StrategySelector.class ).registerStrategyImplementor(
9292
ConnectionProvider.class,
9393
"testing",
94-
DriverManagerConnectionProviderImpl.class
94+
DriverManagerConnectionProvider.class
9595
);
9696

9797
final StandardServiceRegistry ssr = ServiceRegistryUtil.serviceRegistryBuilder( bsr ).build();
9898

9999
final ConnectionProvider configuredProvider = ssr.getService( ConnectionProvider.class );
100100

101-
assertThat( configuredProvider, instanceOf( DriverManagerConnectionProviderImpl.class ) );
101+
assertThat( configuredProvider, instanceOf( DriverManagerConnectionProvider.class ) );
102102
}
103103
}
104104
}

hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderTransactionIsolationConfigTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*/
55
package org.hibernate.orm.test.connection;
66

7-
import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
7+
import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProvider;
88
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
99

1010
import org.hibernate.testing.common.connections.BaseTransactionIsolationConfigTest;
@@ -21,6 +21,6 @@
2121
public class DriverManagerConnectionProviderTransactionIsolationConfigTest extends BaseTransactionIsolationConfigTest {
2222
@Override
2323
protected ConnectionProvider getConnectionProviderUnderTest() {
24-
return new DriverManagerConnectionProviderImpl();
24+
return new DriverManagerConnectionProvider();
2525
}
2626
}

hibernate-core/src/test/java/org/hibernate/orm/test/connection/DriverManagerConnectionProviderValidationConfigTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import jakarta.persistence.Id;
1010

1111
import org.hibernate.cfg.AvailableSettings;
12-
import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl;
12+
import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProvider;
1313

1414
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
1515
import org.hibernate.testing.orm.junit.Jpa;
@@ -27,7 +27,7 @@
2727
integrationSettings = {
2828
// Force a non-shared connection provider to avoid re-creation of the shared pool
2929
@Setting(name = AvailableSettings.CONNECTION_PROVIDER, value = ""),
30-
@Setting(name = DriverManagerConnectionProviderImpl.VALIDATION_INTERVAL, value = "1")
30+
@Setting(name = DriverManagerConnectionProvider.VALIDATION_INTERVAL, value = "1")
3131
}
3232
)
3333
public class DriverManagerConnectionProviderValidationConfigTest {

0 commit comments

Comments
 (0)