Cosmetic changes

Author: artem-v

services-gateway/src/main/java/io/scalecube/services/gateway/http/HttpGateway.java

@@ -65,20 +65,21 @@ public Gateway start(ServiceCall call, ServiceRegistry serviceRegistry) {
         LoopResources.create(id + ":" + port, LoopResources.DEFAULT_IO_WORKER_COUNT, true);
 
     try {
-      HttpServer.create()
-          .runOn(loopResources)
-          .bindAddress(() -> new InetSocketAddress(port))
-          .doOnConnection(
-              connection -> {
-                if (corsEnabled) {
-                  connection.addHandlerLast(new CorsHandler(corsConfigBuilder.build()));
-                }
-              })
-          .handle(new HttpGatewayAcceptor(callFactory.apply(call), serviceRegistry, errorMapper))
-          .bind()
-          .doOnSuccess(server -> this.server = server)
-          .toFuture()
-          .get();
+      server =
+          HttpServer.create()
+              .runOn(loopResources)
+              .bindAddress(() -> new InetSocketAddress(port))
+              .doOnConnection(
+                  connection -> {
+                    if (corsEnabled) {
+                      connection.addHandlerLast(new CorsHandler(corsConfigBuilder.build()));
+                    }
+                  })
+              .handle(
+                  new HttpGatewayAcceptor(callFactory.apply(call), serviceRegistry, errorMapper))
+              .bind()
+              .toFuture()
+              .get();
     } catch (Exception e) {
       throw new RuntimeException(e);
     }

services-gateway/src/main/java/io/scalecube/services/gateway/websocket/WebsocketGateway.java

@@ -64,17 +64,17 @@ public Gateway start(ServiceCall call, ServiceRegistry serviceRegistry) {
     }
 
     try {
-      HttpServer.create()
-          .runOn(loopResources)
-          .bindAddress(() -> new InetSocketAddress(port))
-          .doOnConnection(this::setupKeepAlive)
-          .handle(
-              new WebsocketGatewayAcceptor(callFactory.apply(call), gatewayHandler, errorMapper))
-          .bind()
-          .doOnSuccess(server -> this.server = server)
-          .thenReturn(this)
-          .toFuture()
-          .get();
+      server =
+          HttpServer.create()
+              .runOn(loopResources)
+              .bindAddress(() -> new InetSocketAddress(port))
+              .doOnConnection(this::setupKeepAlive)
+              .handle(
+                  new WebsocketGatewayAcceptor(
+                      callFactory.apply(call), gatewayHandler, errorMapper))
+              .bind()
+              .toFuture()
+              .get();
     } catch (Exception e) {
       throw new RuntimeException(e);
     }

services-transport-parent/services-transport-rsocket/src/main/java/io/scalecube/services/transport/rsocket/RSocketServerTransport.java

@@ -56,13 +56,14 @@ public Address address() {
   @Override
   public ServerTransport bind() {
     try {
-      RSocketServer.create()
-          .acceptor(
-              new RSocketServiceAcceptor(headersCodec, dataCodecs, authenticator, serviceRegistry))
-          .bind(serverTransportFactory.serverTransport())
-          .doOnSuccess(channel -> serverChannel = channel)
-          .toFuture()
-          .get();
+      serverChannel =
+          RSocketServer.create()
+              .acceptor(
+                  new RSocketServiceAcceptor(
+                      headersCodec, dataCodecs, authenticator, serviceRegistry))
+              .bind(serverTransportFactory.serverTransport())
+              .toFuture()
+              .get();
       return this;
     } catch (Exception e) {
       throw new RuntimeException(e);