v2: add .encode()

Signed-off-by: Alexander Bezzubov <[email protected]>

Author: bzz

.travis.yml

@@ -43,6 +43,7 @@ jobs:
         - ./sbt "testOnly org.bblfsh.client.v2.BblfshClientParseTest -- -z \"Parsed UAST for .java file\""
         - ./sbt "testOnly org.bblfsh.client.v2.BblfshClientParseTest -- -z \"Decoded UAST after parsing\""
         - ./sbt "testOnly org.bblfsh.client.v2.BblfshClientParseTest -- -z \"Decoded UAST RootNode\""
+        - ./sbt "testOnly org.bblfsh.client.v2.BblfshClientParseTest -- -z \"Encoding back the RootNode of decoded UAST\""
 
       after_failure: *failure_logs_anchor
 

src/main/native/org_bblfsh_client_v2_Context.h

@@ -93,7 +93,7 @@ class ContextExt {
     return toJ(root);
   }
 
-  // Encode serializes existing-on-guest-side UAST.
+  // Encode serializes external UAST.
   // Borrows the reference.
   jobject Encode(jobject node, UastFormat format) {
     NodeHandle h = toHandle(node);
@@ -149,6 +149,15 @@ JNIEXPORT jobject JNICALL Java_org_bblfsh_client_v2_Context_root(JNIEnv *env,
   return p->RootNode();
 }
 
+JNIEXPORT jobject JNICALL Java_org_bblfsh_client_v2_Context_encode(
+    JNIEnv *env, jobject self, jobject node) {
+  UastFormat fmt = UAST_BINARY;  // TODO(bzz): make it argument & enum
+
+  ContextExt *p = getHandle<ContextExt>(env, self, "nativeContext");
+  return p->Encode(node, fmt);
+  return nullptr;
+}
+
 JNIEXPORT void JNICALL Java_org_bblfsh_client_v2_Context_dispose(JNIEnv *env,
                                                                  jobject self) {
   ContextExt *p = getHandle<ContextExt>(env, self, "nativeContext");

src/main/native/org_bblfsh_client_v2_libuast_Libuast.cc

@@ -4,7 +4,7 @@ import java.nio.ByteBuffer
 
 case class Context(nativeContext: Long) {
     @native def root(): Node
-    @native def encode(n: Node, format: Int): ByteBuffer
+    @native def encode(n: Node): ByteBuffer
     @native def dispose()
 
     @native def filter()

src/main/scala/org/bblfsh/client/v2/Context.scala

@@ -55,11 +55,11 @@ class BblfshClientParseTest extends FlatSpec
   }
 
   "Encoding back the RootNode of decoded UAST" should "produce same bytes" in {
-    val uast = resp.uast.decode()
-    val rootNode: Node = uast.root()
+    val uastCtx: Context = resp.uast.decode()
+    val rootNode: Node = uastCtx.root()
     println(s"Root node: $rootNode")
 
-    val encodedBytes: ByteBuffer = uast.encode(rootNode, 0)
+    val encodedBytes: ByteBuffer = uastCtx.encode(rootNode)
 
     encodedBytes.capacity should be (resp.uast.asReadOnlyByteBuffer.capacity)
     encodedBytes shouldEqual resp.uast.asReadOnlyByteBuffer