DATAREDIS-1053 - Polishing.

Use early return and fix issue reference in tests. Original Pull Request: spring-projects#488

Author: christophstrobl

src/main/java/org/springframework/data/redis/listener/ReactiveRedisMessageListenerContainer.java

@@ -101,31 +101,30 @@ public Mono<Void> destroyLater() {
 
 private Mono<Void> doDestroy() {
 
-ReactiveRedisConnection connection = this.connection;
+if (this.connection == null) {
+return Mono.empty();
+}
 
-if (connection != null) {
+ReactiveRedisConnection connection = this.connection;
 
-Flux<Void> terminationSignals = null;
-while (!subscriptions.isEmpty()) {
+Flux<Void> terminationSignals = null;
+while (!subscriptions.isEmpty()) {
 
-Map<ReactiveSubscription, Subscribers> local = new HashMap<>(subscriptions);
-List<Mono<Void>> monos = local.keySet().stream() //
-.peek(subscriptions::remove) //
-.map(ReactiveSubscription::cancel) //
-.collect(Collectors.toList());
+Map<ReactiveSubscription, Subscribers> local = new HashMap<>(subscriptions);
+List<Mono<Void>> monos = local.keySet().stream() //
+.peek(subscriptions::remove) //
+.map(ReactiveSubscription::cancel) //
+.collect(Collectors.toList());
 
-if (terminationSignals == null) {
-terminationSignals = Flux.concat(monos);
-} else {
-terminationSignals = terminationSignals.mergeWith(Flux.concat(monos));
-}
+if (terminationSignals == null) {
+terminationSignals = Flux.concat(monos);
+} else {
+terminationSignals = terminationSignals.mergeWith(Flux.concat(monos));
 }
-
-this.connection = null;
-return terminationSignals != null ? terminationSignals.then(connection.closeLater()) : connection.closeLater();
 }
 
-return Mono.empty();
+this.connection = null;
+return terminationSignals != null ? terminationSignals.then(connection.closeLater()) : connection.closeLater();
 }
 
 /**

src/test/java/org/springframework/data/redis/core/ReactiveRedisTemplateUnitTests.java

@@ -25,7 +25,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Test;
-
 import org.springframework.data.redis.connection.ReactivePubSubCommands;
 import org.springframework.data.redis.connection.ReactiveRedisConnection;
 import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
@@ -59,7 +58,7 @@ public void closeShouldUseAsyncRelease() {
 verifyNoMoreInteractions(connectionMock);
 }
 
-@Test // DATAREDIS-999
+@Test // DATAREDIS-1053
 public void listenToShouldSubscribeToChannel() {
 
 AtomicBoolean closed = new AtomicBoolean();