Renaming of TransportConfig property, fixed childOptions settings at server sides

Author: artem-v

transport-parent/transport-api/src/main/java/io/scalecube/cluster/transport/api/TransportConfig.java

@@ -15,7 +15,7 @@ public final class TransportConfig implements Cloneable {
   public static final int DEFAULT_LOCAL_CONNECT_TIMEOUT = 1_000;
 
   private int port = 0;
-  private boolean isSecured = false; // is client secured
+  private boolean clientSecured = false; // client secured flag
   private int connectTimeout = DEFAULT_CONNECT_TIMEOUT;
   private MessageCodec messageCodec = MessageCodec.INSTANCE;
   private int maxFrameLength = 2 * 1024 * 1024; // 2 MB
@@ -70,19 +70,19 @@ public TransportConfig port(int port) {
     return t;
   }
 
-  public boolean isSecured() {
-    return isSecured;
+  public boolean isClientSecured() {
+    return clientSecured;
   }
 
   /**
    * Setter to denote whether client part of the transport is secured.
    *
-   * @param isSecured isSecured
+   * @param clientSecured clientSecured
    * @return new {@code TransportConfig} instance
    */
-  public TransportConfig secured(boolean isSecured) {
+  public TransportConfig clientSecured(boolean clientSecured) {
     TransportConfig t = clone();
-    t.isSecured = isSecured;
+    t.clientSecured = clientSecured;
     return t;
   }
 
@@ -163,7 +163,7 @@ public TransportConfig clone() {
   public String toString() {
     return new StringJoiner(", ", TransportConfig.class.getSimpleName() + "[", "]")
         .add("port=" + port)
-        .add("isSecured=" + isSecured)
+        .add("clientSecured=" + clientSecured)
         .add("connectTimeout=" + connectTimeout)
         .add("messageCodec=" + messageCodec)
         .add("maxFrameLength=" + maxFrameLength)

transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/tcp/TcpReceiver.java

@@ -38,9 +38,9 @@ private TcpServer newTcpServer(ReceiverContext context) {
     return TcpServer.create()
         .runOn(context.loopResources())
         .bindAddress(() -> new InetSocketAddress(config.port()))
-        .option(ChannelOption.TCP_NODELAY, true)
-        .option(ChannelOption.SO_KEEPALIVE, true)
-        .option(ChannelOption.SO_REUSEADDR, true)
+        .childOption(ChannelOption.TCP_NODELAY, true)
+        .childOption(ChannelOption.SO_KEEPALIVE, true)
+        .childOption(ChannelOption.SO_REUSEADDR, true)
         .doOnChannelInit(
             (connectionObserver, channel, remoteAddress) -> {
               new TcpChannelInitializer(config.maxFrameLength())

transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/tcp/TcpSender.java

@@ -53,6 +53,6 @@ private TcpClient newTcpClient(SenderContext context, Address address) {
                 (connectionObserver, channel, remoteAddress) ->
                     new TcpChannelInitializer(config.maxFrameLength())
                         .accept(connectionObserver, channel));
-    return config.isSecured() ? tcpClient.secure() : tcpClient;
+    return config.isClientSecured() ? tcpClient.secure() : tcpClient;
   }
 }

transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/websocket/WebsocketReceiver.java

@@ -35,14 +35,11 @@ public Mono<DisposableServer> bind() {
 
   private HttpServer newHttpServer(ReceiverContext context) {
     return HttpServer.create()
-        .tcpConfiguration(
-            tcpServer ->
-                tcpServer
-                    .runOn(context.loopResources())
-                    .bindAddress(() -> new InetSocketAddress(config.port()))
-                    .option(ChannelOption.TCP_NODELAY, true)
-                    .option(ChannelOption.SO_KEEPALIVE, true)
-                    .option(ChannelOption.SO_REUSEADDR, true));
+        .runOn(context.loopResources())
+        .bindAddress(() -> new InetSocketAddress(config.port()))
+        .childOption(ChannelOption.TCP_NODELAY, true)
+        .childOption(ChannelOption.SO_KEEPALIVE, true)
+        .childOption(ChannelOption.SO_REUSEADDR, true);
   }
 
   private Mono<Void> onMessage(

transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/websocket/WebsocketSender.java

@@ -11,7 +11,6 @@
 import reactor.netty.Connection;
 import reactor.netty.http.client.HttpClient;
 import reactor.netty.http.client.WebsocketClientSpec;
-import reactor.netty.tcp.TcpClient;
 
 final class WebsocketSender implements Sender {
 
@@ -46,21 +45,21 @@ public Mono<Void> send(Message message) {
   }
 
   private HttpClient.WebsocketSender newWebsocketSender(SenderContext context, Address address) {
-    return HttpClient.newConnection()
-        .tcpConfiguration(
-            tcpClient -> {
-              TcpClient tcpClient1 =
-                  tcpClient
-                      .runOn(context.loopResources())
-                      .host(address.host())
-                      .port(address.port())
-                      .option(ChannelOption.TCP_NODELAY, true)
-                      .option(ChannelOption.SO_KEEPALIVE, true)
-                      .option(ChannelOption.SO_REUSEADDR, true)
-                      .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, config.connectTimeout());
-              return config.isSecured() ? tcpClient1.secure() : tcpClient1;
-            })
-        .websocket(
-            WebsocketClientSpec.builder().maxFramePayloadLength(config.maxFrameLength()).build());
+    HttpClient httpClient =
+        HttpClient.newConnection()
+            .runOn(context.loopResources())
+            .host(address.host())
+            .port(address.port())
+            .option(ChannelOption.TCP_NODELAY, true)
+            .option(ChannelOption.SO_KEEPALIVE, true)
+            .option(ChannelOption.SO_REUSEADDR, true)
+            .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, config.connectTimeout());
+
+    if (config.isClientSecured()) {
+      httpClient = httpClient.secure();
+    }
+
+    return httpClient.websocket(
+        WebsocketClientSpec.builder().maxFramePayloadLength(config.maxFrameLength()).build());
   }
 }