From 5a0171203dd0e5efea12a61849b874bcd2f5d940 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 4 Jul 2018 08:57:47 +0200 Subject: [PATCH] DATAMONGO-2005 - Polishing. Reformat code. Original pull request: #574. --- .../data/mongodb/core/ReactiveMongoTemplate.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 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 c306e6052..944deb706 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 @@ -519,10 +519,11 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati session.startTransaction(); } - return Flux.usingWhen(Mono.just(session), s -> ReactiveMongoTemplate.this.withSession(action, s), - ClientSession::commitTransaction, ClientSession::abortTransaction).doFinally(signalType -> { - doFinally.accept(session); - }); + return Flux.usingWhen(Mono.just(session), // + s -> ReactiveMongoTemplate.this.withSession(action, s), // + ClientSession::commitTransaction, // + ClientSession::abortTransaction) // + .doFinally(signalType -> doFinally.accept(session)); }); } }; @@ -530,7 +531,10 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati private Flux withSession(ReactiveSessionCallback action, ClientSession session) { - return Flux.from(action.doInSession(new ReactiveSessionBoundMongoTemplate(session, ReactiveMongoTemplate.this))) // + ReactiveSessionBoundMongoTemplate operations = new ReactiveSessionBoundMongoTemplate(session, + ReactiveMongoTemplate.this); + + return Flux.from(action.doInSession(operations)) // .subscriberContext(ctx -> ReactiveMongoContext.setSession(ctx, Mono.just(session))); }