[Java] Change back PrimitiveValue.toString() to print the byte value for a single char rather than the char itself and fix ExampleTokenListener to support this.

Author: mjpt777

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleTokenListener.java

@@ -203,7 +203,22 @@ private static CharSequence readEncodingAsString(
  final PrimitiveValue constOrNotPresentValue = constOrNotPresentValue(typeToken, actingVersion);
  if (null != constOrNotPresentValue)
  {
- return constOrNotPresentValue.toString();
+ if (constOrNotPresentValue.size() == 1)
+ {
+ try
+ {
+ final byte[] bytes = { (byte)constOrNotPresentValue.longValue() };
+ return new String(bytes, constOrNotPresentValue.characterEncoding());
+ }
+ catch (final UnsupportedEncodingException ex)
+ {
+ throw new RuntimeException(ex);
+ }
+ }
+ else
+ {
+ return constOrNotPresentValue.toString();
+ }
  }
 
  final StringBuilder sb = new StringBuilder();

sbe-tool/src/main/java/uk/co/real_logic/sbe/PrimitiveValue.java

@@ -364,22 +364,7 @@ public String toString()
  switch (representation)
  {
  case LONG:
- if (null != characterEncoding)
- {
- try
- {
- final byte[] bytes = new byte[]{ (byte)longValue };
- return new String(bytes, characterEncoding);
- }
- catch (final UnsupportedEncodingException ex)
- {
- throw new IllegalStateException(ex);
- }
- }
- else
- {
- return Long.toString(longValue);
- }
+ return Long.toString(longValue);
 
  case DOUBLE:
  return Double.toString(doubleValue);

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java

@@ -1934,7 +1934,7 @@ private CharSequence generateConstPropertyMethods(
  "\n" +
  indent + " public byte %s()\n" +
  indent + " {\n" +
- indent + " return (byte)'%s';\n" +
+ indent + " return (byte)%s;\n" +
  indent + " }\n\n",
  propertyName,
  encoding.constValue()));