Merge pull request #693 from scalecube/update-rsocket-version

Update rsocket version
scalecube · Jan 16, 2020 · 79d9053 · 79d9053
2 parents dbac9c5 + 49b0df4
commit 79d9053
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 44 deletions.
diff --git a/pom.xml b/pom.xml
@@ -23,16 +23,16 @@
 
   <properties>
     <jackson.version>2.10.0.pr1</jackson.version>
-    <scalecube-cluster.version>2.4.9</scalecube-cluster.version>
+    <scalecube-cluster.version>2.4.10-RC1</scalecube-cluster.version>
     <scalecube-commons.version>1.0.1</scalecube-commons.version>
     <scalecube-benchmarks.version>1.2.2</scalecube-benchmarks.version>
     <scalecube-config.version>0.3.11</scalecube-config.version>
-    <reactor.version>Californium-SR8</reactor.version>
-    <rsocket.version>0.11.21</rsocket.version>
+    <reactor.version>Dysprosium-RELEASE</reactor.version>
+    <rsocket.version>1.0.0-RC5</rsocket.version>
     <metrics.version>3.1.2</metrics.version>
     <protostuff.version>1.6.0</protostuff.version>
-    <netty.version>4.1.36.Final</netty.version>
-    <reactor-netty.version>0.8.8.RELEASE</reactor-netty.version>
+    <netty.version>4.1.37.Final</netty.version>
+    <reactor-netty.version>0.9.0.RELEASE</reactor-netty.version>
     <slf4j.version>1.7.7</slf4j.version>
     <log4j.version>2.11.0</log4j.version>
     <disruptor.version>3.4.2</disruptor.version>
@@ -112,30 +112,19 @@
       <!-- RSocket -->
       <dependency>
         <groupId>io.rsocket</groupId>
-        <artifactId>rsocket-core</artifactId>
-        <version>${rsocket.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.rsocket</groupId>
-        <artifactId>rsocket-transport-netty</artifactId>
+        <artifactId>rsocket-bom</artifactId>
         <version>${rsocket.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
       <!-- Jackson -->
       <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-core</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.datatype</groupId>
-        <artifactId>jackson-datatype-jsr310</artifactId>
+        <groupId>com.fasterxml.jackson</groupId>
+        <artifactId>jackson-bom</artifactId>
         <version>${jackson.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
       <!-- Protostuff/Protobuf -->
@@ -161,20 +150,12 @@
       </dependency>
 
       <!-- Netty -->
-      <dependency>
-        <groupId>io.projectreactor.netty</groupId>
-        <artifactId>reactor-netty</artifactId>
-        <version>${reactor-netty.version}</version>
-      </dependency>
       <dependency>
         <groupId>io.netty</groupId>
-        <artifactId>netty-common</artifactId>
-        <version>${netty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-buffer</artifactId>
+        <artifactId>netty-bom</artifactId>
         <version>${netty.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
       <!-- Scalecube benchmarks -->

diff --git a/...rsocket/src/main/java/io/scalecube/services/transport/rsocket/RSocketClientTransport.java b/...rsocket/src/main/java/io/scalecube/services/transport/rsocket/RSocketClientTransport.java
@@ -2,8 +2,8 @@
 
 import io.rsocket.RSocket;
 import io.rsocket.RSocketFactory;
+import io.rsocket.frame.decoder.PayloadDecoder;
 import io.rsocket.transport.netty.client.TcpClientTransport;
-import io.rsocket.util.ByteBufPayload;
 import io.scalecube.net.Address;
 import io.scalecube.services.transport.api.ClientChannel;
 import io.scalecube.services.transport.api.ClientTransport;
@@ -49,10 +49,7 @@ private Mono<RSocket> connect(Address address, Map<Address, Mono<RSocket>> monoM
 
     Mono<RSocket> rsocketMono =
         RSocketFactory.connect()
-            .frameDecoder(
-                frame ->
-                    ByteBufPayload.create(
-                        frame.sliceData().retain(), frame.sliceMetadata().retain()))
+            .frameDecoder(PayloadDecoder.DEFAULT)
             .errorConsumer(
                 th -> LOGGER.warn("Exception occurred at rsocket client transport: " + th))
             .transport(() -> TcpClientTransport.create(tcpClient))

diff --git a/...rsocket/src/main/java/io/scalecube/services/transport/rsocket/RSocketServerTransport.java b/...rsocket/src/main/java/io/scalecube/services/transport/rsocket/RSocketServerTransport.java
@@ -1,9 +1,9 @@
 package io.scalecube.services.transport.rsocket;
 
 import io.rsocket.RSocketFactory;
+import io.rsocket.frame.decoder.PayloadDecoder;
 import io.rsocket.transport.netty.server.CloseableChannel;
 import io.rsocket.transport.netty.server.TcpServerTransport;
-import io.rsocket.util.ByteBufPayload;
 import io.scalecube.net.Address;
 import io.scalecube.services.methods.ServiceMethodRegistry;
 import io.scalecube.services.transport.api.ServerTransport;
@@ -54,10 +54,7 @@ public Mono<ServerTransport> bind(ServiceMethodRegistry methodRegistry) {
                   });
 
           return RSocketFactory.receive()
-              .frameDecoder(
-                  frame ->
-                      ByteBufPayload.create(
-                          frame.sliceData().retain(), frame.sliceMetadata().retain()))
+              .frameDecoder(PayloadDecoder.DEFAULT)
               .errorConsumer(
                   th -> LOGGER.warn("Exception occurred at rsocket server transport: " + th))
               .acceptor(new RSocketServiceAcceptor(codec, methodRegistry))