[Java]: Corrected serialization of IR to use schema defined character encoding.

Author: mjpt777

main/java/uk/co/real_logic/sbe/ir/Deserializer.java

@@ -78,10 +78,7 @@ public IntermediateRepresentation deserialize()
  final List<Token> tokens = new ArrayList<>();
  while (offset < size)
  {
- final Token token = deserializeToken();
-
- // System.out.println(token.toString());
- tokens.add(token);
+ tokens.add(deserializeToken());
  }
 
  int i = 0, size = tokens.size();
@@ -146,7 +143,7 @@ private void deserializeFrame()
 
  if (serializedFrame.sbeIrVersion() != 0)
  {
- // TODO: throw exception since we don't know how to handle this
+ throw new IllegalStateException("Unknown SBE version: " + serializedFrame.sbeIrVersion());
  }
 
  final byte[] byteArray = new byte[1024];
@@ -159,38 +156,38 @@ private void deserializeFrame()
  }
 
  private Token deserializeToken()
+ throws UnsupportedEncodingException
  {
- final Token.Builder builder = new Token.Builder();
+ final Token.Builder tokenBuilder = new Token.Builder();
  final Encoding.Builder encBuilder = new Encoding.Builder();
 
  final byte[] byteArray = new byte[1024];
 
  serializedToken.wrapForDecode(directBuffer, offset, serializedToken.blockLength(), 0);
 
- builder.offset(serializedToken.tokenOffset())
- .size(serializedToken.tokenSize())
- .schemaId(serializedToken.schemaID())
- .version(serializedToken.tokenVersion())
- .signal(SerializationUtils.signal(serializedToken.signal()));
+ tokenBuilder.offset(serializedToken.tokenOffset())
+  .size(serializedToken.tokenSize())
+  .schemaId(serializedToken.schemaID())
+  .version(serializedToken.tokenVersion())
+  .signal(SerializationUtils.signal(serializedToken.signal()));
 
  final PrimitiveType type = SerializationUtils.primitiveType(serializedToken.primitiveType());
 
  encBuilder.primitiveType(type)
  .byteOrder(SerializationUtils.byteOrder(serializedToken.byteOrder()));
 
- // must deserialize vardata in order
-
- builder.name(new String(byteArray, 0, serializedToken.getName(byteArray, 0, byteArray.length)));
+ tokenBuilder.name(new String(byteArray, 0, serializedToken.getName(byteArray, 0, byteArray.length)));
 
  encBuilder.constVal(SerializationUtils.getVal(valBuffer, type, serializedToken.getConstVal(valArray, 0, valArray.length)));
  encBuilder.minVal(SerializationUtils.getVal(valBuffer, type, serializedToken.getMinVal(valArray, 0, valArray.length)));
  encBuilder.maxVal(SerializationUtils.getVal(valBuffer, type, serializedToken.getMaxVal(valArray, 0, valArray.length)));
  encBuilder.nullVal(SerializationUtils.getVal(valBuffer, type, serializedToken.getNullVal(valArray, 0, valArray.length)));
 
- encBuilder.characterEncoding(new String(byteArray, 0, serializedToken.getCharacterEncoding(byteArray, 0, byteArray.length)));
+ final int charEncodingSize = serializedToken.getCharacterEncoding(byteArray, 0, byteArray.length);
+ encBuilder.characterEncoding(new String(byteArray, 0, charEncodingSize, SerializedToken.characterEncodingCharacterEncoding()));
 
  offset += serializedToken.size();
 
- return builder.encoding(encBuilder.build()).build();
+ return tokenBuilder.encoding(encBuilder.build()).build();
  }
 }

main/java/uk/co/real_logic/sbe/ir/Serializer.java

@@ -21,10 +21,7 @@
 import uk.co.real_logic.sbe.ir.generated.SerializedToken;
 import uk.co.real_logic.sbe.util.Verify;
 
-import java.io.Closeable;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import java.io.*;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.List;
@@ -128,6 +125,7 @@ private int serializeFrame()
  }
 
  private int serializeToken(final Token token)
+ throws UnsupportedEncodingException
  {
  final PrimitiveType type = token.encoding().primitiveType();
 
@@ -147,8 +145,10 @@ private int serializeToken(final Token token)
  serializedToken.putMaxVal(valArray, 0, SerializationUtils.putVal(valBuffer, token.encoding().maxVal(), type));
  serializedToken.putNullVal(valArray, 0, SerializationUtils.putVal(valBuffer, token.encoding().nullVal(), type));
 
- serializedToken.putCharacterEncoding(token.encoding().characterEncoding().getBytes(), 0,
- token.encoding().characterEncoding().getBytes().length);
+ final String charEncodingCharEncoding = SerializedToken.characterEncodingCharacterEncoding();
+ final String charEncoding = token.encoding().characterEncoding();
+ final byte[] charBytes = charEncoding.getBytes(charEncodingCharEncoding);
+ serializedToken.putCharacterEncoding(charBytes, 0, charBytes.length);
 
  return serializedToken.size();
  }