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

DATAREDIS-1053 - Subscribe to cleanup publishers when canceling a listenTo() stream.

Browse Source 
Cleanup publishers are now subscribed to instead of setting the subscribeOn Scheduler to ensure connections get closed after canceling the stream.

Original Pull Request: #488
This commit is contained in:
Mark Paluch
2019-10-28 14:25:40 +01:00
committed by Christoph Strobl
parent f2bdeff048
commit 6851186cf2
3 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/test/java/org/springframework/data/redis/core/ReactiveRedisTemplateUnitTests.java
View File

@@ -15,15 +15,21 @@
*/
package org.springframework.data.redis.core;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
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;
import org.springframework.data.redis.connection.ReactiveSubscription;
import org.springframework.data.redis.serializer.RedisSerializationContext;
/**
@@ -52,4 +58,31 @@ public class ReactiveRedisTemplateUnitTests {
verify(connectionMock).closeLater();
verifyNoMoreInteractions(connectionMock);
}
@Test // DATAREDIS-999
public void listenToShouldSubscribeToChannel() {
AtomicBoolean closed = new AtomicBoolean();
when(connectionFactoryMock.getReactiveConnection()).thenReturn(connectionMock);
when(connectionMock.closeLater()).thenReturn(Mono.<Void> empty().doOnSubscribe(ignore -> closed.set(true)));
ReactivePubSubCommands pubSubCommands = mock(ReactivePubSubCommands.class);
ReactiveSubscription subscription = mock(ReactiveSubscription.class);
when(connectionMock.pubSubCommands()).thenReturn(pubSubCommands);
when(pubSubCommands.subscribe(any())).thenReturn(Mono.empty());
when(pubSubCommands.createSubscription()).thenReturn(Mono.just(subscription));
when(subscription.receive()).thenReturn(Flux.create(sink -> {}));
ReactiveRedisTemplate<String, String> template = new ReactiveRedisTemplate<>(connectionFactoryMock,
RedisSerializationContext.string());
template.listenToChannel("channel") //
.as(StepVerifier::create) //
.thenAwait() //
.thenCancel() //
.verify();
assertThat(closed).isTrue();
}
}