From c23c5ae6c6e9db4423f27cb0dd82d10ee52bd67f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 4 Sep 2019 09:37:59 +0200 Subject: [PATCH] DATAMONGO-2356 - Move off deprecated Flux/Mono.usingWhen to their replacement overrides. --- .../data/mongodb/core/ReactiveMongoTemplate.java | 3 ++- .../data/mongodb/gridfs/DataBufferPublisherAdapter.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java index a2763d032..1e4760951 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java @@ -573,7 +573,8 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati return Flux.usingWhen(Mono.just(session), // s -> ReactiveMongoTemplate.this.withSession(action, s), // ClientSession::commitTransaction, // - ClientSession::abortTransaction) // + (sess, err) -> sess.abortTransaction(), // + ClientSession::commitTransaction) // .doFinally(signalType -> doFinally.accept(session)); }); } diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapter.java index fa279931b..dfeb1411d 100644 --- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapter.java +++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapter.java @@ -68,7 +68,7 @@ class DataBufferPublisherAdapter { state.request(sink, n); }); }); - }, AsyncInputStream::close, AsyncInputStream::close, AsyncInputStream::close) // + }, AsyncInputStream::close, (it, err) -> it.close(), AsyncInputStream::close) // .concatMap(Flux::just, 1); }