Merge pull request #150 from scalecube/update-services

Update services to -RC3
scalecube · Jun 15, 2020 · 7ff31a2 · 7ff31a2
2 parents 01b9a3e + 5649934
commit 7ff31a2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 21 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
 
   <properties>
     <scalecube-commons.version>1.0.4</scalecube-commons.version>
-    <scalecube-services.version>2.10.0-RC2</scalecube-services.version>
+    <scalecube-services.version>2.10.0-RC3</scalecube-services.version>
     <scalecube-benchmarks.version>1.2.2</scalecube-benchmarks.version>
     <scalecube-config.version>0.4.3</scalecube-config.version>
     <reactor.version>Dysprosium-SR8</reactor.version>

diff --git a/...nsport/src/main/java/io/scalecube/services/gateway/transport/GatewayClientTransports.java b/...nsport/src/main/java/io/scalecube/services/gateway/transport/GatewayClientTransports.java
@@ -2,7 +2,6 @@
 
 import io.netty.buffer.ByteBuf;
 import io.rsocket.Payload;
-import io.scalecube.services.api.ServiceMessage;
 import io.scalecube.services.gateway.transport.http.HttpGatewayClient;
 import io.scalecube.services.gateway.transport.http.HttpGatewayClientCodec;
 import io.scalecube.services.gateway.transport.rsocket.RSocketGatewayClient;
@@ -12,22 +11,13 @@
 import io.scalecube.services.transport.api.ClientTransport;
 import io.scalecube.services.transport.api.DataCodec;
 import io.scalecube.services.transport.api.HeadersCodec;
-import io.scalecube.services.transport.api.ReferenceCountUtil;
 import java.util.function.Function;
-import reactor.core.publisher.Hooks;
 
 public class GatewayClientTransports {
 
   private static final String CONTENT_TYPE = "application/json";
   private static final HeadersCodec HEADERS_CODEC = HeadersCodec.getInstance(CONTENT_TYPE);
 
-  static {
-    Hooks.onNextDropped(
-        obj ->
-            ReferenceCountUtil.safestRelease(
-                obj instanceof ServiceMessage ? ((ServiceMessage) obj).data() : obj));
-  }
-
   public static final GatewayClientCodec<ByteBuf> WEBSOCKET_CLIENT_CODEC =
       new WebsocketGatewayClientCodec(DataCodec.getInstance(CONTENT_TYPE));
   public static final GatewayClientCodec<Payload> RSOCKET_CLIENT_CODEC =

diff --git a/services-gateway-netty/src/main/java/io/scalecube/services/gateway/GatewayTemplate.java b/services-gateway-netty/src/main/java/io/scalecube/services/gateway/GatewayTemplate.java
@@ -1,10 +1,8 @@
 package io.scalecube.services.gateway;
 
-import io.scalecube.services.api.ServiceMessage;
 import java.net.InetSocketAddress;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import reactor.core.publisher.Hooks;
 import reactor.core.publisher.Mono;
 import reactor.netty.DisposableServer;
 import reactor.netty.http.server.HttpServer;
@@ -14,14 +12,6 @@ public abstract class GatewayTemplate implements Gateway {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(GatewayTemplate.class);
 
-  static {
-    Hooks.onNextDropped(
-        obj -> {
-          ReferenceCountUtil.safestRelease(
-              obj instanceof ServiceMessage ? ((ServiceMessage) obj).data() : obj);
-        });
-  }
-
   protected final GatewayOptions options;
 
   protected GatewayTemplate(GatewayOptions options) {

diff --git a/.../src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientConnectionTest.java b/.../src/test/java/io/scalecube/services/gateway/websocket/WebsocketClientConnectionTest.java
@@ -190,6 +190,7 @@ void testKeepalive()
           @Override
           public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
             if (msg instanceof PongWebSocketFrame) {
+              ((PongWebSocketFrame) msg).release();
               keepaliveLatch.countDown();
             } else {
               super.channelRead(ctx, msg);