native: add unescapedValue node to StringLiteral

Now native Java AST contains both
 - escapedValue
 - unescapedValue
obtained from JDT parser.

That is similar to what javasript driver does and
allows to avoid having language-spacific escape
sequence handling on the Go side that can be
different from Go one.

See #111 (comment)
for details.

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

Author: bzz

native/src/main/java/bblfsh/CompilationUnitSerializer.java

@@ -6,6 +6,7 @@
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.Comment;
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.StringLiteral;
 import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
 
 import java.io.IOException;
@@ -50,6 +51,11 @@ private void serializeAll(CompilationUnit cu, ASTNode node, JsonGenerator jG, Se
         jG.writeFieldName("@type");
         jG.writeString(ClassName);
 
+        if (node instanceof StringLiteral) { // add un-quoted & un-escaped StringLiteral
+            jG.writeFieldName("unescapedValue");
+            jG.writeString(((StringLiteral) node).getLiteralValue());
+        }
+
         for (StructuralPropertyDescriptor descriptor : descriptorList) {
             Object child = node.getStructuralProperty(descriptor);
             if (child instanceof List) {

native/src/main/java/bblfsh/Driver.java

@@ -11,7 +11,7 @@
 public class Driver {
 
     private final RequestReader reader;
-    private final ResponseWriter writer;
+    final ResponseWriter writer;
     private final EclipseParser parser;
 
     public Driver(final RequestReader reader, final ResponseWriter writer) {

native/src/main/java/bblfsh/ResponseWriter.java

@@ -13,7 +13,7 @@
 
 public class ResponseWriter {
 
-    private final OutputStream out;
+    final OutputStream out;
     private final ObjectMapper mapper;
     private String content;
     private CompilationUnitSerializer cu;

native/src/test/java/bblfsh/DriverTest.java

@@ -4,8 +4,14 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import static org.fest.assertions.Assertions.*;
 
 public class DriverTest {
@@ -75,14 +81,37 @@ public void processInvalid() throws DriverException, CloseException {
     @Test
     public void processComment() throws DriverException, CloseException {
         final String input = "{\"content\":\"class EOF_Test { public void method() {\\r\\n   /*\\r\\n*/ } }\"}";
+        final Driver driver = process(input);
+        driver.processOne();
+        // TODO: check output
+    }
+
+    @Test
+    public void processStringLiteral() throws DriverException, IOException {
+        // give
+        final String input = "{\"content\":\"class String_Test { String s = \\\"b\\\\nc\\\\41\\\"; \\r\\n }\"}";
+        final Driver driver = process(input);
+
+        // when
+        driver.processOne();
+
+        // then check a new node is present \w normalized value
+        String json = driver.writer.out.toString();
+        final ObjectNode node = new ObjectMapper().readValue(json, ObjectNode.class);
+        JsonNode newNode = node.findPath("unescapedValue");
+
+        assertThat(newNode.isMissingNode()).isFalse();
+        assertThat(newNode.asText()).isEqualTo("b\nc!");
+    }
+
+    public Driver process(String input) {
         final InputStream in = new ByteArrayInputStream(input.getBytes());
         final RequestReader reader = new RequestReader(in);
 
         final ByteArrayOutputStream out = new ByteArrayOutputStream();
         final ResponseWriter writer = new ResponseWriter(out);
 
-        final Driver driver = new Driver(reader, writer);
-        driver.processOne();
-        // TODO: check output
+        return new Driver(reader, writer);
     }
+
 }