Fix metadata length calculation

Author: rdegnan

core/build.gradle

@@ -2,5 +2,5 @@ dependencies {
     compile project (':frames')
     compile 'io.rsocket:rsocket-core:0.10.1'
     compile 'io.rsocket:rsocket-transport-netty:0.10.1'
-    compile 'io.micrometer:micrometer-core:1.0.0-rc.5'
+    compile 'io.micrometer:micrometer-core:1.0.0-rc.6'
 }

frames/build.gradle

@@ -1,6 +1,3 @@
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
-
 dependencies {
     compile 'io.netty:netty-buffer:4.1.17.Final'
 }

frames/src/main/java/io/netifi/proteus/frames/ProteusMetadata.java

@@ -9,12 +9,13 @@ public class ProteusMetadata {
   private static final int METHOD_ID_SIZE = 4;
   private static final int METADATA_LENGTH_SIZE = 4;
 
-  public static int computeLength() {
+  public static int computeLength(ByteBuf metadata) {
     return VERSION_SIZE
         + NAMESPACE_ID_SIZE
         + SERVICE_ID_SIZE
         + METHOD_ID_SIZE
-        + METADATA_LENGTH_SIZE;
+        + METADATA_LENGTH_SIZE
+        + metadata.readableBytes();
   }
 
   public static int encode(

frames/src/test/java/io/netifi/proteus/frames/RoutingFlyweightTest.java

@@ -1,3 +1,3 @@
-package io.netifi.sdk.frames;
+package io.netifi.proteus.frames;
 
 public class RoutingFlyweightTest {}

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

@@ -589,7 +589,7 @@ static void PrintClient(const ServiceDescriptor* service,
       p->Indent();
       p->Print(
           *vars,
-          "final int length = $ProteusMetadata$.computeLength();\n"
+          "final int length = $ProteusMetadata$.computeLength(metadata);\n"
           "final $ByteBuf$ metadataBuf = $ByteBufAllocator$.DEFAULT.directBuffer(length);\n"
           "$ProteusMetadata$.encode(metadataBuf, $service_name$.$namespace_id_name$, $service_name$.$service_id_name$, $service_name$.$method_id_name$, metadata);\n"
           "return $ByteBufPayload$.create(data, metadataBuf);\n");
@@ -635,7 +635,7 @@ static void PrintClient(const ServiceDescriptor* service,
         p->Indent();
         p->Print(
             *vars,
-            "final int length = $ProteusMetadata$.computeLength();\n"
+            "final int length = $ProteusMetadata$.computeLength(metadata);\n"
             "$ByteBuf$ metadataBuf = $ByteBufAllocator$.DEFAULT.directBuffer(length);\n"
             "$ProteusMetadata$.encode(metadataBuf, $service_name$.$namespace_id_name$, $service_name$.$service_id_name$, $service_name$.$method_id_name$, metadata);\n"
             "$ByteBuf$ data = serialize(message);\n"
@@ -660,7 +660,7 @@ static void PrintClient(const ServiceDescriptor* service,
           p->Indent();
           p->Print(
               *vars,
-              "final int length = $ProteusMetadata$.computeLength();\n"
+              "final int length = $ProteusMetadata$.computeLength(metadata);\n"
               "$ByteBuf$ metadataBuf = $ByteBufAllocator$.DEFAULT.directBuffer(length);\n"
               "$ProteusMetadata$.encode(metadataBuf, $service_name$.$namespace_id_name$, $service_name$.$service_id_name$, $service_name$.$method_id_name$, metadata);\n"
               "$ByteBuf$ data = serialize(message);\n"
@@ -683,7 +683,7 @@ static void PrintClient(const ServiceDescriptor* service,
           p->Indent();
           p->Print(
               *vars,
-              "final int length = $ProteusMetadata$.computeLength();\n"
+              "final int length = $ProteusMetadata$.computeLength(metadata);\n"
               "$ByteBuf$ metadataBuf = $ByteBufAllocator$.DEFAULT.directBuffer(length);\n"
               "$ProteusMetadata$.encode(metadataBuf, $service_name$.$namespace_id_name$, $service_name$.$service_id_name$, $service_name$.$method_id_name$, metadata);\n"
               "$ByteBuf$ data = serialize(message);\n"