[Java] Escape JSON strings in JsonTokenListener.

Author: mjpt777

sbe-tool/src/main/java/uk/co/real_logic/sbe/json/JsonTokenListener.java

@@ -184,7 +184,9 @@ public void onVarData(
 
             final byte[] tempBuffer = new byte[length];
             buffer.getBytes(bufferIndex, tempBuffer, 0, length);
-            output.append(new String(tempBuffer, 0, length, typeToken.encoding().characterEncoding()));
+            final String str = new String(tempBuffer, 0, length, typeToken.encoding().characterEncoding());
+
+            escape(str);
 
             doubleQuote();
             next();
@@ -223,13 +225,12 @@ private void appendEncodingAsString(
             if (encoding.primitiveType() == CHAR)
             {
                 doubleQuote();
+                output.append(constOrNotPresentValue.toString());
+                doubleQuote();
             }
-
-            output.append(constOrNotPresentValue.toString());
-
-            if (encoding.primitiveType() == CHAR)
+            else
             {
-                doubleQuote();
+                output.append(constOrNotPresentValue.toString());
             }
 
             return;
@@ -244,7 +245,7 @@ private void appendEncodingAsString(
 
             for (int i = 0; i < size; i++)
             {
-                output.append((char)buffer.getByte(index + (i * elementSize)));
+                escape((char)buffer.getByte(index + (i * elementSize)));
             }
 
             doubleQuote();
@@ -348,4 +349,22 @@ private static long readEncodingAsLong(
 
         return Types.getLong(buffer, bufferIndex, typeToken.encoding());
     }
+
+    private void escape(final String str)
+    {
+        for (int i = 0, length = str.length(); i < length; i++)
+        {
+            escape(str.charAt(i));
+        }
+    }
+
+    private void escape(final char c)
+    {
+        if ('"' == c || '\\' == c || '\b' == c || '\f' == c || '\n' == c || '\r' == c || '\t' == c)
+        {
+            output.append('\\');
+        }
+
+        output.append(c);
+    }
 }

sbe-tool/src/test/java/uk/co/real_logic/sbe/EncodedCarTestBase.java

@@ -37,7 +37,7 @@ public static void setupExampleData()
     {
         try
         {
-            vehicleCode = "abcdef".getBytes(CarEncoder.vehicleCodeCharacterEncoding());
+            vehicleCode = "ab\"def".getBytes(CarEncoder.vehicleCodeCharacterEncoding());
             manufacturerCode = "123".getBytes(EngineEncoder.manufacturerCodeCharacterEncoding());
             manufacturer = "Honda".getBytes(CarEncoder.manufacturerCharacterEncoding());
             model = "Civic VTi".getBytes(CarEncoder.modelCharacterEncoding());
@@ -108,6 +108,7 @@ protected static void encodeTestMessage(final ByteBuffer buffer)
 
         CAR.manufacturer(new String(manufacturer));
         CAR.putModel(model, srcOffset, model.length);
+        CAR.activationCode("315\\8");
 
         bufferOffset += CAR.encodedLength();
 

sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/java/ToStringTest.java

@@ -39,7 +39,7 @@ public void exampleMessagePrinted()
             "(sbeTemplateId=1|sbeSchemaId=1|sbeSchemaVersion=0|sbeBlockLength=45):" +
             "serialNumber=1234|modelYear=2013|available=T|code=A|" +
             "someNumbers=[0,1,2,3,4]|" +
-            "vehicleCode=abcdef|" +
+            "vehicleCode=ab\"def|" +
             "extras={sportsPack,cruiseControl}|" +
             "engine=(capacity=2000|numCylinders=4|manufacturerCode=123|)|" +
             "fuelFigures=[" +
@@ -49,7 +49,7 @@ public void exampleMessagePrinted()
             "performanceFigures=[" +
             "(octaneRating=95|acceleration=[(mph=30|seconds=4.0),(mph=60|seconds=7.5),(mph=100|seconds=12.2)])," +
             "(octaneRating=99|acceleration=[(mph=30|seconds=3.8),(mph=60|seconds=7.1),(mph=100|seconds=11.8)])]|" +
-            "manufacturer='Honda'|model='Civic VTi'|activationCode=''",
+            "manufacturer='Honda'|model='Civic VTi'|activationCode='315\\8'",
             result);
     }
 

sbe-tool/src/test/java/uk/co/real_logic/sbe/json/JsonPrinterTest.java

@@ -60,7 +60,7 @@ public void exampleMessagePrintedAsJson() throws Exception
             "    \"available\": \"T\",\n" +
             "    \"code\": \"A\",\n" +
             "    \"someNumbers\": [0, 1, 2, 3, 4],\n" +
-            "    \"vehicleCode\": \"abcdef\",\n" +
+            "    \"vehicleCode\": \"ab\\\"def\",\n" +
             "    \"extras\": { \"sunRoof\": false, \"sportsPack\": true, \"cruiseControl\": true },\n" +
             "    \"engine\": \n" +
             "    {\n" +
@@ -118,7 +118,7 @@ public void exampleMessagePrintedAsJson() throws Exception
             "    }],\n" +
             "    \"manufacturer\": \"Honda\",\n" +
             "    \"model\": \"Civic VTi\",\n" +
-            "    \"activationCode\": \"\"\n" +
+            "    \"activationCode\": \"315\\\\8\"\n" +
             "}",
             result);
     }