Skip to content

Commit 6989932

Browse files
committed
[hibernate#950] Remove ProxyConnection class
It's not necessary now that all the openSession methods return a Uni or CompletionStage
1 parent 0855351 commit 6989932

File tree

4 files changed

+5
-207
lines changed

4 files changed

+5
-207
lines changed

hibernate-reactive-core/src/main/java/org/hibernate/reactive/bulk/impl/ReactiveBulkIdStrategy.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
import org.hibernate.persister.collection.AbstractCollectionPersister;
4848
import org.hibernate.persister.entity.Queryable;
4949
import org.hibernate.reactive.bulk.StatementsWithParameters;
50-
import org.hibernate.reactive.pool.ReactiveConnection;
5150
import org.hibernate.reactive.pool.ReactiveConnectionPool;
5251
import org.hibernate.reactive.pool.impl.Parameters;
5352
import org.hibernate.reactive.session.ReactiveQueryExecutor;
@@ -130,11 +129,11 @@ public void release(JdbcServices jdbcServices, JdbcConnectionAccess connectionAc
130129
false
131130
);
132131
if ( dropIdTables ) {
133-
ReactiveConnection connection = serviceRegistry.getService( ReactiveConnectionPool.class )
134-
.getProxyConnection();
135-
loop( dropGlobalTemporaryTables, connection::execute )
136-
.whenComplete( (v, e) -> connection.close() )
137-
.handle( CompletionStages::ignoreErrors )
132+
serviceRegistry.getService( ReactiveConnectionPool.class ).getConnection()
133+
.thenCompose( connection ->
134+
loop( dropGlobalTemporaryTables, connection::execute )
135+
.whenComplete( (v, e) -> connection.close() )
136+
.handle( CompletionStages::ignoreErrors ) )
138137
.toCompletableFuture().join();
139138
}
140139
}

hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/ReactiveConnectionPool.java

-15
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,6 @@ public interface ReactiveConnectionPool extends Service {
4747
*/
4848
CompletionStage<ReactiveConnection> getConnection(String tenantId);
4949

50-
/**
51-
* Obtain a lazily-initializing reactive connection. The
52-
* actual connection might be made when the returned
53-
* instance if {@link ReactiveConnection} is first used.
54-
*/
55-
ReactiveConnection getProxyConnection();
56-
57-
/**
58-
* Obtain a lazily-initializing reactive connection for the
59-
* given tenant id. The actual connection might be made when
60-
* the returned instance if {@link ReactiveConnection} is
61-
* first used.
62-
*/
63-
ReactiveConnection getProxyConnection(String tenantId);
64-
6550
/**
6651
* The shutdown of the pool is actually asynchronous but the
6752
* core service registry won't return the {@link CompletionStage}.

hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/ProxyConnection.java

-175
This file was deleted.

hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/SqlClientPool.java

-11
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,4 @@ private CompletionStage<ReactiveConnection> getConnectionFromPool(Pool pool) {
7676
private SqlClientConnection newConnection(SqlConnection connection) {
7777
return new SqlClientConnection( connection, getPool(), getSqlStatementLogger() );
7878
}
79-
80-
@Override
81-
public ReactiveConnection getProxyConnection() {
82-
return new ProxyConnection( this );
83-
}
84-
85-
@Override
86-
public ReactiveConnection getProxyConnection(String tenantId) {
87-
return new ProxyConnection( this, tenantId );
88-
}
89-
9079
}

0 commit comments

Comments
 (0)