Merge pull request #546 from rsocket/0.11.9-plus-stream-fix

0.11.9 plus stream fix

Author: kbahr

build.gradle

@@ -28,7 +28,7 @@ plugins {
 subprojects {
     apply plugin: 'io.spring.dependency-management'
 
-    ext['reactor-bom.version'] = 'Californium-BUILD-SNAPSHOT'
+    ext['reactor-bom.version'] = 'Californium-SR1'
     ext['logback.version'] = '1.2.3'
     ext['findbugs.version'] = '3.0.2'
     ext['netty.version'] = '4.1.29.Final'

gradle.properties

@@ -11,4 +11,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-version=0.11.12.BUILD-SNAPSHOT
+
+version=0.11.12.BUILD-SNAPSHOT

rsocket-core/src/test/java/io/rsocket/RSocketClientTerminationTest.java

@@ -2,10 +2,6 @@
 
 import io.rsocket.RSocketClientTest.ClientSocketRule;
 import io.rsocket.util.EmptyPayload;
-import java.nio.channels.ClosedChannelException;
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.function.Function;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -15,10 +11,17 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+
+import java.nio.channels.ClosedChannelException;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.function.Function;
+
 @RunWith(Parameterized.class)
 public class RSocketClientTerminationTest {
 
-  @Rule public final ClientSocketRule rule = new ClientSocketRule();
+  @Rule
+  public final ClientSocketRule rule = new ClientSocketRule();
   private Function<RSocket, ? extends Publisher<?>> interaction;
 
   public RSocketClientTerminationTest(Function<RSocket, ? extends Publisher<?>> interaction) {
@@ -29,7 +32,9 @@ public RSocketClientTerminationTest(Function<RSocket, ? extends Publisher<?>> in
   public void testCurrentStreamIsTerminatedOnConnectionClose() {
     RSocketClient rSocket = rule.socket;
 
-    Mono.delay(Duration.ofSeconds(1)).doOnNext(v -> rule.connection.dispose()).subscribe();
+    Mono.delay(Duration.ofSeconds(1))
+        .doOnNext(v -> rule.connection.dispose())
+        .subscribe();
 
     StepVerifier.create(interaction.apply(rSocket))
         .expectError(ClosedChannelException.class)