[Java] Quote character constants in JSON output and deal with any size string.

Author: mjpt777

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

@@ -29,7 +29,6 @@
 
 public class JsonTokenListener implements TokenListener
 {
- private final byte[] tempBuffer = new byte[1024];
  private final StringBuilder output;
  private int indentation = 0;
 
@@ -125,6 +124,7 @@ public void onVarData(
  property(fieldToken);
  doubleQuote();
 
+ final byte[] tempBuffer = new byte[length];
  buffer.getBytes(bufferIndex, tempBuffer, 0, length);
  output.append(new String(tempBuffer, 0, length, typeToken.encoding().characterEncoding()));
 
@@ -158,14 +158,25 @@ private void property(final Token token)
  private void appendEncodingAsString(
  final DirectBuffer buffer, final int index, final Token typeToken, final int actingVersion)
  {
+ final Encoding encoding = typeToken.encoding();
  final PrimitiveValue constOrNotPresentValue = constOrNotPresentValue(typeToken, actingVersion);
  if (null != constOrNotPresentValue)
  {
+ if (encoding.primitiveType() == CHAR)
+ {
+ doubleQuote();
+ }
+
  output.append(constOrNotPresentValue.toString());
+
+ if (encoding.primitiveType() == CHAR)
+ {
+ doubleQuote();
+ }
+
  return;
  }
 
- final Encoding encoding = typeToken.encoding();
  final int elementSize = encoding.primitiveType().size();
 
  final int size = typeToken.arrayLength();

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

@@ -63,7 +63,7 @@ public void exampleMessagePrintedAsJson() throws Exception
  " \"numCylinders\": 4,\n" +
  " \"maxRpm\": 9000,\n" +
  " \"manufacturerCode\": \"123\",\n" +
- " \"fuel\": Petrol,\n" +
+ " \"fuel\": \"Petrol\",\n" +
  " \"fuelFigures\": [\n" +
  " {\n" +
  " \"speed\": 30,\n" +