Switch to Reactor 2020.0.0 snapshots

See gh-890

Signed-off-by: Rossen Stoyanchev <[email protected]>

Author: rstoyanchev

build.gradle

@@ -27,7 +27,7 @@ subprojects {
     apply plugin: 'io.spring.dependency-management'
     apply plugin: 'com.github.sherter.google-java-format'
 
-    ext['reactor-bom.version'] = 'Dysprosium-BUILD-SNAPSHOT'
+    ext['reactor-bom.version'] = '2020.0.0-SNAPSHOT'
     ext['logback.version'] = '1.2.3'
     ext['findbugs.version'] = '3.0.2'
     ext['netty-bom.version'] = '4.1.50.Final'

rsocket-transport-netty/src/main/java/io/rsocket/transport/netty/server/CloseableChannel.java

@@ -29,7 +29,7 @@
  */
 public final class CloseableChannel implements Closeable {
 
-  /** For forward compatibility: remove when RSocket compiles against Reactor 1.0. */
+  /** For 1.0 and 1.1 compatibility: remove when RSocket requires Reactor Netty 1.0+. */
   private static final Method channelAddressMethod;
 
   static {
@@ -60,7 +60,7 @@ public final class CloseableChannel implements Closeable {
    */
   public InetSocketAddress address() {
     try {
-      return channel.address();
+      return (InetSocketAddress) channel.address();
     } catch (NoSuchMethodError e) {
       try {
         return (InetSocketAddress) channelAddressMethod.invoke(this.channel);

rsocket-transport-netty/src/test/java/io/rsocket/transport/netty/WebsocketSecureTransportTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 the original author or authors.
+ * Copyright 2015-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
 import reactor.core.Exceptions;
 import reactor.netty.http.client.HttpClient;
 import reactor.netty.http.server.HttpServer;
-import reactor.netty.tcp.TcpServer;
 
 final class WebsocketSecureTransportTest implements TransportTest {
 
@@ -51,14 +50,13 @@ final class WebsocketSecureTransportTest implements TransportTest {
             try {
               SelfSignedCertificate ssc = new SelfSignedCertificate();
               HttpServer server =
-                  HttpServer.from(
-                      TcpServer.create()
-                          .bindAddress(() -> address)
-                          .secure(
-                              ssl ->
-                                  ssl.sslContext(
-                                      SslContextBuilder.forServer(
-                                          ssc.certificate(), ssc.privateKey()))));
+                  HttpServer.create()
+                      .bindAddress(() -> address)
+                      .secure(
+                          ssl ->
+                              ssl.sslContext(
+                                  SslContextBuilder.forServer(
+                                      ssc.certificate(), ssc.privateKey())));
               return WebsocketServerTransport.create(server);
             } catch (CertificateException e) {
               throw Exceptions.propagate(e);

rsocket-transport-netty/src/test/java/io/rsocket/transport/netty/server/WebsocketServerTransportTest.java

@@ -19,6 +19,7 @@
 import static io.rsocket.frame.FrameLengthCodec.FRAME_LENGTH_MASK;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatNullPointerException;
+import static org.mockito.ArgumentMatchers.any;
 
 import java.net.InetSocketAddress;
 import java.util.Collections;
@@ -31,29 +32,35 @@
 import reactor.netty.http.server.HttpServer;
 import reactor.netty.http.server.HttpServerRequest;
 import reactor.netty.http.server.HttpServerResponse;
+import reactor.netty.http.server.WebsocketServerSpec;
 import reactor.test.StepVerifier;
 
 final class WebsocketServerTransportTest {
 
-  // @Test
+  @Test
   public void testThatSetupWithUnSpecifiedFrameSizeShouldSetMaxFrameSize() {
-    ArgumentCaptor<BiFunction> captor = ArgumentCaptor.forClass(BiFunction.class);
-    HttpServer httpServer = Mockito.spy(HttpServer.create());
-    Mockito.doAnswer(a -> httpServer).when(httpServer).handle(captor.capture());
-    Mockito.doAnswer(a -> Mono.empty()).when(httpServer).bind();
-
-    WebsocketServerTransport serverTransport = WebsocketServerTransport.create(httpServer);
+    ArgumentCaptor<BiFunction> httpHandlerCaptor = ArgumentCaptor.forClass(BiFunction.class);
+    HttpServer server = Mockito.spy(HttpServer.create());
+    Mockito.doAnswer(a -> server).when(server).handle(httpHandlerCaptor.capture());
+    Mockito.doAnswer(a -> server).when(server).tcpConfiguration(any());
+    Mockito.doAnswer(a -> Mono.empty()).when(server).bind();
 
+    WebsocketServerTransport serverTransport = WebsocketServerTransport.create(server);
     serverTransport.start(c -> Mono.empty()).subscribe();
 
     HttpServerRequest httpServerRequest = Mockito.mock(HttpServerRequest.class);
     HttpServerResponse httpServerResponse = Mockito.mock(HttpServerResponse.class);
 
-    captor.getValue().apply(httpServerRequest, httpServerResponse);
+    httpHandlerCaptor.getValue().apply(httpServerRequest, httpServerResponse);
+
+    ArgumentCaptor<BiFunction> handlerCaptor = ArgumentCaptor.forClass(BiFunction.class);
+    ArgumentCaptor<WebsocketServerSpec> specCaptor =
+        ArgumentCaptor.forClass(WebsocketServerSpec.class);
+
+    Mockito.verify(httpServerResponse).sendWebsocket(handlerCaptor.capture(), specCaptor.capture());
 
-    Mockito.verify(httpServerResponse)
-        .sendWebsocket(
-            Mockito.nullable(String.class), Mockito.eq(FRAME_LENGTH_MASK), Mockito.any());
+    WebsocketServerSpec spec = specCaptor.getValue();
+    assertThat(spec.maxFramePayloadLength()).isEqualTo(FRAME_LENGTH_MASK);
   }
 
   @DisplayName("creates server with BindAddress")