Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Add author and since tags. Wrap connection allocation with fromSupplier(…). Move connection proxy decoration into doInConnection(…) as connection decoration isn't directly related to connection creation.

See #2145
Original pull request: #2162.
This commit is contained in:
Mark Paluch
2021-09-13 15:01:43 +02:00
parent aaf7818427
commit 7735a039fe
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/org/springframework/data/redis/core/ReactiveRedisTemplate.java
View File

@@ -58,6 +58,7 @@ import org.springframework.util.ClassUtils;
*
* @author Mark Paluch
* @author Christoph Strobl
* @author Petromir Dzhunev
* @since 2.0
* @param <K> the Redis key type against which the template works (usually a String)
* @param <V> the Redis value type against which the template works
@@ -232,7 +233,14 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
Assert.notNull(action, "Callback object must not be null");
return Flux.usingWhen(getConnection(exposeConnection), conn -> {
Mono<ReactiveRedisConnection> connection = getConnection();
if (!exposeConnection) {
connection = connection.map(this::createRedisConnectionProxy);
}
return Flux.usingWhen(connection, conn -> {
Publisher<T> result = action.doInRedis(conn);
return postProcessResult(result, conn, false);
@@ -241,18 +249,16 @@ public class ReactiveRedisTemplate<K, V> implements ReactiveRedisOperations<K, V
}
/**
* Creates a Mono which generates a new connection. The successors of {@link ReactiveRedisTemplate} might override
* the default behaviour.
* Creates a {@link Mono} which emits a new {@link ReactiveRedisConnection}. Can be overridden in subclasses to
* provide a different mechanism for connection allocation for the given method.
*
* @param exposeConnection whether to enforce exposure of the native Redis Connection to callback code
* return a {@link Mono} wrapping the {@link ReactiveRedisConnection}.
* @since 2.5.5
*/
protected Mono<ReactiveRedisConnection> getConnection(boolean exposeConnection) {
ReactiveRedisConnectionFactory factory = getConnectionFactory();
ReactiveRedisConnection conn = factory.getReactiveConnection();
ReactiveRedisConnection connToUse = preProcessConnection(conn, false);
protected Mono<ReactiveRedisConnection> getConnection() {
return Mono.just(exposeConnection ? connToUse : createRedisConnectionProxy(connToUse));
ReactiveRedisConnectionFactory factory = getConnectionFactory();
return Mono.fromSupplier(() -> preProcessConnection(factory.getReactiveConnection(), false));
}
/*