[Java] Fix issue with encoding IR containing char constants of length 1. Issue #469.

Author: mjpt777

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

@@ -30,8 +30,19 @@ public class PrimitiveValue
 {
     public enum Representation
     {
+        /**
+         * Value is stored in a long value.
+         */
         LONG,
+
+        /**
+         * Value is stored in a double value.
+         */
         DOUBLE,
+
+        /**
+         * Value is stored in a byte[].
+         */
         BYTE_ARRAY
     }
 
@@ -154,6 +165,16 @@ public PrimitiveValue(final byte[] value, final String characterEncoding, final
         this.size = size;
     }
 
+    /**
+     * Get the {@link Representation} of the value.
+     *
+     * @return the {@link Representation} of the value.
+     */
+    public Representation representation()
+    {
+        return representation;
+    }
+
     /**
      * Parse constant value string and set representation based on type
      *
@@ -274,7 +295,8 @@ public long longValue()
     {
         if (representation != Representation.LONG)
         {
-            throw new IllegalStateException("PrimitiveValue is not a long representation");
+            throw new IllegalStateException(
+                "Not a long representation: representation=" + representation + " value=" + toString());
         }
 
         return longValue;
@@ -290,7 +312,8 @@ public double doubleValue()
     {
         if (representation != Representation.DOUBLE)
         {
-            throw new IllegalStateException("PrimitiveValue is not a double representation");
+            throw new IllegalStateException(
+                "Not a double representation: representation=" + representation + " value=" + toString());
         }
 
         return doubleValue;
@@ -306,7 +329,8 @@ public byte[] byteArrayValue()
     {
         if (representation != Representation.BYTE_ARRAY)
         {
-            throw new IllegalStateException("PrimitiveValue is not a byte[] representation");
+            throw new IllegalStateException(
+                "Not a byte[] representation: representation=" + representation + " value=" + toString());
         }
 
         return byteArrayValue;

sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/IrUtil.java

@@ -273,7 +273,14 @@ public static int put(final MutableDirectBuffer buffer, final PrimitiveValue val
             case CHAR:
                 if (value.size() == 1)
                 {
-                    buffer.putByte(0, (byte)value.longValue());
+                    if (value.representation() == PrimitiveValue.Representation.LONG)
+                    {
+                        buffer.putByte(0, (byte)value.longValue());
+                    }
+                    else
+                    {
+                        buffer.putByte(0, value.byteArrayValue()[0]);
+                    }
                     return 1;
                 }
                 else

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

@@ -23,12 +23,16 @@
 import uk.co.real_logic.sbe.SbeTool;
 import uk.co.real_logic.sbe.TestUtil;
 import uk.co.real_logic.sbe.ir.Ir;
+import uk.co.real_logic.sbe.ir.IrDecoder;
+import uk.co.real_logic.sbe.ir.IrEncoder;
 import uk.co.real_logic.sbe.xml.IrGenerator;
 import uk.co.real_logic.sbe.xml.MessageSchema;
 import uk.co.real_logic.sbe.xml.ParserOptions;
 
+import java.nio.ByteBuffer;
 import java.util.Map;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static uk.co.real_logic.sbe.xml.XmlSchemaParser.parse;
 
@@ -66,4 +70,31 @@ public void shouldGenerateValidJava() throws Exception
 
         assertNotNull(aClass);
     }
+
+    @Test
+    public void shouldGenerateAndEncodeIr() throws Exception
+    {
+        System.setProperty(SbeTool.KEYWORD_APPEND_TOKEN, "_");
+
+        final ParserOptions options = ParserOptions.builder().stopOnError(true).build();
+        final MessageSchema schema = parse(TestUtil.getLocalResource("FixBinary.xml"), options);
+        final IrGenerator irg = new IrGenerator();
+        final Ir ir = irg.generate(schema);
+        final ByteBuffer buffer = ByteBuffer.allocate(1024 * 1024);
+
+        final IrEncoder irEncoder = new IrEncoder(buffer, ir);
+        irEncoder.encode();
+
+        buffer.flip();
+        final IrDecoder irDecoder = new IrDecoder(buffer);
+        final Ir decodedIr = irDecoder.decode();
+
+        assertEquals(ir.id(), decodedIr.id());
+        assertEquals(ir.version(), decodedIr.version());
+        assertEquals(ir.byteOrder(), decodedIr.byteOrder());
+        assertEquals(ir.applicableNamespace(), decodedIr.applicableNamespace());
+        assertEquals(ir.packageName(), decodedIr.packageName());
+        assertEquals(ir.types().size(), decodedIr.types().size());
+        assertEquals(ir.messages().size(), decodedIr.messages().size());
+    }
 }