Merge pull request #4 from netifi/dependencies-upgrade

Dependencies upgrade

Author: OlegDokuka

gradle.properties

@@ -1,2 +1,2 @@
 group=io.rsocket.rpc
-version=0.2.2
+version=0.2.3

rsocket-rpc-core/build.gradle

@@ -10,8 +10,8 @@ dependencies {
     compile 'io.opentracing:opentracing-api:0.31.0'
     compile 'javax.inject:javax.inject:1'
     compile 'com.google.protobuf:protobuf-java:3.6.1'
-    compile 'io.rsocket:rsocket-core:0.11.7'
-    compile 'io.rsocket:rsocket-transport-netty:0.11.7'
+    compile 'io.rsocket:rsocket-core:0.11.8'
+    compile 'io.rsocket:rsocket-transport-netty:0.11.8'
     compile 'io.micrometer:micrometer-core:1.0.6'
 
     protobuf project(':rsocket-rpc-metrics-idl')

rsocket-rpc-core/src/main/java/io/rsocket/rpc/rsocket/RequestHandlingRSocket.java

@@ -4,7 +4,7 @@
 import io.netty.util.ReferenceCountUtil;
 import io.rsocket.AbstractRSocket;
 import io.rsocket.Payload;
-import io.rsocket.internal.SwitchTransform;
+import io.rsocket.internal.SwitchTransformFlux;
 import io.rsocket.rpc.RSocketRpcService;
 import io.rsocket.rpc.exception.ServiceNotFound;
 import io.rsocket.rpc.frames.Metadata;
@@ -92,7 +92,7 @@ public Flux<Payload> requestStream(Payload payload) {
 
   @Override
   public Flux<Payload> requestChannel(Publisher<Payload> payloads) {
-    return new SwitchTransform<>(
+    return new SwitchTransformFlux<>(
         payloads,
         (payload, flux) -> {
           try {

rsocket-rpc-protobuf/build.gradle

@@ -54,7 +54,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 dependencies {
-    compileOnly 'io.projectreactor:reactor-core:3.1.9.RELEASE'
+    compileOnly 'io.projectreactor:reactor-core:3.2.0.RELEASE'
     compileOnly 'com.google.protobuf:protobuf-java:3.6.1'
     compileOnly 'javax.inject:javax.inject:1'
 }

rsocket-rpc-protobuf/src/java_plugin/cpp/blocking_java_generator.cpp

@@ -1006,7 +1006,7 @@ static void PrintServer(const ServiceDescriptor* service,
   } else {
     p->Print(
         *vars,
-        "return new $SwitchTransform$<$Payload$, $Payload$>(payloads, new $BiFunction$<$Payload$, $Flux$<$Payload$>, $Publisher$<? extends $Payload$>>() {\n");
+        "return new $SwitchTransformFlux$<$Payload$, $Payload$>(payloads, new $BiFunction$<$Payload$, $Flux$<$Payload$>, $Publisher$<? extends $Payload$>>() {\n");
     p->Indent();
     p->Print(
         *vars,
@@ -1212,7 +1212,7 @@ void GenerateServer(const ServiceDescriptor* service,
   vars["RSocket"] = "io.rsocket.RSocket";
   vars["Payload"] = "io.rsocket.Payload";
   vars["ByteBufPayload"] = "io.rsocket.util.ByteBufPayload";
-  vars["SwitchTransform"] = "io.rsocket.internal.SwitchTransform";
+  vars["SwitchTransformFlux"] = "io.rsocket.internal.SwitchTransformFlux";
   vars["AbstractRSocketService"] = "io.rsocket.rpc.AbstractRSocketService";
   vars["RSocketRpcMetadata"] = "io.rsocket.rpc.frames.Metadata";
   vars["RSocketRpcMetrics"] = "io.rsocket.rpc.metrics.Metrics";

rsocket-rpc-protobuf/src/java_plugin/cpp/java_generator.cpp

@@ -1394,7 +1394,7 @@ static void PrintServer(const ServiceDescriptor* service,
   } else {
     p->Print(
         *vars,
-        "return new $SwitchTransform$<$Payload$, $Payload$>(payloads, new $BiFunction$<$Payload$, $Flux$<$Payload$>, $Publisher$<? extends $Payload$>>() {\n");
+        "return new $SwitchTransformFlux$<$Payload$, $Payload$>(payloads, new $BiFunction$<$Payload$, $Flux$<$Payload$>, $Publisher$<? extends $Payload$>>() {\n");
     p->Indent();
     p->Print(
         *vars,
@@ -1603,7 +1603,7 @@ void GenerateServer(const ServiceDescriptor* service,
   vars["RSocket"] = "io.rsocket.RSocket";
   vars["Payload"] = "io.rsocket.Payload";
   vars["ByteBufPayload"] = "io.rsocket.util.ByteBufPayload";
-  vars["SwitchTransform"] = "io.rsocket.internal.SwitchTransform";
+  vars["SwitchTransformFlux"] = "io.rsocket.internal.SwitchTransformFlux";
   vars["AbstractRSocketService"] = "io.rsocket.rpc.AbstractRSocketService";
   vars["RSocketRpcMetadata"] = "io.rsocket.rpc.frames.Metadata";
   vars["RSocketRpcMetrics"] = "io.rsocket.rpc.metrics.Metrics";