Merge pull request #14 from netifi-proteus/migrate-to-rsocket-rpc

Migrate to rsocket rpc

Author: kbahr

build.gradle

@@ -46,37 +46,16 @@ project(':broker-mgmt-idl') {
     apply from: file('../gradle/java.gradle')
 }
 
-project(':client') {
-    description = 'Netifi Proteus Client'
-    ext.artifactName = 'client'
-
-    apply from: file('../gradle/java.gradle')
-}
-
-project(':core') {
-    description = 'Netifi Core Library'
-    ext.artifactName = 'core'
-
-    apply from: file('../gradle/java.gradle')
-}
-
-project(':core-idl') {
-    description = 'Netifi Core IDL'
-    ext.artifactName = 'core-idl'
-
-    apply from: file('../gradle/java.gradle')
-}
-
 project(':frames') {
     description = 'Netifi Proteus Frames'
     ext.artifactName = 'frames'
 
     apply from: file('../gradle/java.gradle')
 }
 
-project(':metrics-idl') {
-    description = 'Netifi Proteus Metrics IDL'
-    ext.artifactName = 'metrics-idl'
+project(':client') {
+    description = 'Netifi Proteus Client'
+    ext.artifactName = 'client'
 
     apply from: file('../gradle/java.gradle')
 }
@@ -95,13 +74,6 @@ project(':metrics-prometheus') {
     apply from: file('../gradle/java.gradle')
 }
 
-project(':protobuf-rpc') {
-    description = 'Netifi Proteus RPC'
-    ext.artifactName = 'protobuf-rpc'
-
-    //apply from: file('../gradle/java.gradle')
-}
-
 project(':tracing-openzipkin') {
     description = 'Netifi Proteus Openzipkin Integration'
     ext.artifactName = 'tracing-openzipkin'

client/build.gradle

@@ -8,42 +8,45 @@ targetCompatibility = 1.8
 dependencies {
     protobuf project (':broker-info-idl')
 
-    compile project (':core')
+    compile 'io.rsocket.rpc:core:0.1.2'
+    compile 'io.rsocket.rpc:frames:0.1.2'
     compile project (':auth')
+    compile project (':frames')
 
     compile 'com.typesafe:config:1.3.2'
     compile 'com.google.guava:guava:22.0'
     compile 'io.netty:netty-tcnative:2.0.12.Final:linux-x86_64'
 
-    testProtobuf project (':core-idl')
-    testProtobuf project (':protobuf-rpc')
     testCompile 'io.micrometer:micrometer-registry-atlas:1.0.3'
+    testProtobuf 'io.rsocket.rpc:core-idl:0.1.2'
+    testCompile 'io.rsocket.rpc:core:0.1.2'
+    testCompile project(':tracing-openzipkin')
+    testCompile project(':metrics-micrometer')
+    testCompile 'javax.inject:javax.inject:1'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.apache.logging.log4j:log4j-api:2.9.0'
+    testCompile 'org.apache.logging.log4j:log4j-core:2.9.0'
+    testCompile 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.0'
 }
 
-def protocPluginBaseName = "proteus-java-${osdetector.os}-${osdetector.arch}"
-def javaPluginPath = "$rootDir/protobuf-rpc/build/exe/java_plugin/$protocPluginBaseName"
-
 protobuf {
     generatedFilesBaseDir = "${projectDir}/src/generated"
 
     protoc {
         artifact = 'com.google.protobuf:protoc:3.6.0'
     }
     plugins {
-        proteus {
-            path = javaPluginPath
+        rsocketRpc {
+            artifact = 'io.rsocket.rpc:protobuf-rpc:0.1.2'
         }
     }
     generateProtoTasks {
         all().each { task ->
-            task.dependsOn ':protobuf-rpc:java_pluginExecutable'
-            // Recompile protos when the codegen has been changed
-            task.inputs.file javaPluginPath
             // Recompile protos when build.gradle has been changed, because
             // it's possible the version of protoc has been changed.
             task.inputs.file "${rootProject.projectDir}/build.gradle"
             task.plugins {
-                proteus {}
+                rsocketRpc {}
             }
         }
     }

client/src/main/java/io/netifi/proteus/DefaultProteusBrokerService.java

@@ -12,8 +12,8 @@
 import io.netifi.proteus.presence.PresenceNotifier;
 import io.netifi.proteus.rsocket.*;
 import io.netifi.proteus.rsocket.transport.WeightedClientTransportSupplier;
-import io.netifi.proteus.stats.FrugalQuantile;
-import io.netifi.proteus.stats.Quantile;
+import io.rsocket.rpc.stats.FrugalQuantile;
+import io.rsocket.rpc.stats.Quantile;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
 import io.netty.buffer.Unpooled;
@@ -29,11 +29,13 @@
 import reactor.core.publisher.Mono;
 import reactor.core.publisher.MonoProcessor;
 
+import io.rsocket.rpc.rsocket.RequestHandlingRSocket;
+import io.netifi.proteus.rsocket.UnwrappingRSocket;
+
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.time.Duration;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 
 public class DefaultProteusBrokerService implements ProteusBrokerService, Disposable {

client/src/main/java/io/netifi/proteus/Proteus.java

@@ -1,7 +1,8 @@
 package io.netifi.proteus;
 
 import io.netifi.proteus.rsocket.ProteusSocket;
-import io.netifi.proteus.rsocket.RequestHandlingRSocket;
+import io.rsocket.rpc.rsocket.RequestHandlingRSocket;
+import io.rsocket.rpc.RSocketRpcService;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.ssl.OpenSsl;
@@ -100,7 +101,7 @@ public Mono<Void> onClose() {
     return onClose;
   }
 
-  public Proteus addService(ProteusService service) {
+  public Proteus addService(RSocketRpcService service) {
     requestHandlingRSocket.addService(service);
     return this;
   }

…i/proteus/rsocket/UnwrappingRSocket.java …i/proteus/rsocket/UnwrappingRSocket.javacore/src/main/java/io/netifi/proteus/rsocket/UnwrappingRSocket.java renamed to client/src/main/java/io/netifi/proteus/rsocket/UnwrappingRSocket.java core/src/main/java/io/netifi/proteus/rsocket/UnwrappingRSocket.java renamed to client/src/main/java/io/netifi/proteus/rsocket/UnwrappingRSocket.java

@@ -1,16 +1,16 @@
 package io.netifi.proteus.rsocket;
 
-import io.netifi.proteus.frames.*;
 import io.netty.buffer.ByteBuf;
 import io.rsocket.Payload;
 import io.rsocket.RSocket;
+import io.netifi.proteus.frames.*;
 import io.rsocket.util.ByteBufPayload;
 import io.rsocket.util.RSocketProxy;
 import org.reactivestreams.Publisher;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-// Need to unwrap Proteus Messages
+// Need to unwrap RSocketRpc Messages
 public class UnwrappingRSocket extends RSocketProxy {
 
   public UnwrappingRSocket(RSocket source) {

client/src/main/java/io/netifi/proteus/rsocket/WeightedReconnectingRSocket.java

@@ -1,11 +1,11 @@
 package io.netifi.proteus.rsocket;
 
 import io.netifi.proteus.DestinationNameFactory;
-import io.netifi.proteus.exception.TimeoutException;
+import io.rsocket.rpc.exception.TimeoutException;
 import io.netifi.proteus.rsocket.transport.WeightedClientTransportSupplier;
-import io.netifi.proteus.stats.Ewma;
-import io.netifi.proteus.stats.Median;
-import io.netifi.proteus.stats.Quantile;
+import io.rsocket.rpc.stats.Ewma;
+import io.rsocket.rpc.stats.Median;
+import io.rsocket.rpc.stats.Quantile;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufUtil;
 import io.rsocket.*;

client/src/main/java/io/netifi/proteus/rsocket/transport/WeightedClientTransportSupplier.java

@@ -1,7 +1,7 @@
 package io.netifi.proteus.rsocket.transport;
 
 import io.netifi.proteus.rsocket.WeightedRSocket;
-import io.netifi.proteus.stats.Ewma;
+import io.rsocket.rpc.stats.Ewma;
 import io.rsocket.Closeable;
 import io.rsocket.transport.ClientTransport;
 import io.rsocket.util.Clock;

client/src/test/java/io/netifi/proteus/integration/ProteusIntegrationTest.java

@@ -24,9 +24,9 @@
 @Ignore
 public class ProteusIntegrationTest {
 
-  private static final long accessKey = 3855261330795754807L;
+  private static final long accessKey = 9007199254740991L;
   private static final String accessToken = "kTBDVtfRBO4tHOnZzSyY5ym2kfY=";
-  private static final String host = "localhost";
+  private static final String host = "edge.netifi.io";
   private static final int port = 8001;
   private static final int server_port = 8001;
   private static Proteus server;

client/src/test/java/io/netifi/proteus/metrics/ProteusMeterRegistryTest.java

@@ -56,7 +56,7 @@ public boolean enabled() {
               }
             });
 
-    ProteusMetricsExporter exporter = new ProteusMetricsExporter(client, registry);
+    MetricsExporter exporter = new MetricsExporter(client, registry);
     exporter.run();
 
     Counter test = registry.counter("test");

client/src/test/java/io/netifi/proteus/rsocket/WeightedReconnectingRSocketTest.java

@@ -1,7 +1,7 @@
 package io.netifi.proteus.rsocket;
 
 import io.netifi.proteus.DestinationNameFactory;
-import io.netifi.proteus.stats.FrugalQuantile;
+import io.rsocket.rpc.stats.FrugalQuantile;
 import io.netty.buffer.Unpooled;
 import io.rsocket.RSocket;
 import org.junit.Test;