[Java] Handle primitive arrays correctly in the generated DTO code.

Author: vyazelenko

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

@@ -1039,18 +1039,23 @@ private void generateArrayEncodeWith(
 
         if (primitiveType == PrimitiveType.CHAR)
         {
-            sb.append(indent).append("encoder.").append(toLowerFirstChar(propertyName)).append("(")
+            sb.append(indent).append("encoder.").append(formattedPropertyName).append("(")
                 .append("dto.").append(formattedPropertyName).append("());\n");
         }
         else
         {
             final String javaTypeName = javaTypeName(primitiveType);
             sb.append(indent).append(javaTypeName).append("[] ").append(formattedPropertyName).append(" = ")
                 .append("dto.").append(formattedPropertyName).append("();\n")
-                .append(indent).append("for (int i = 0; i < ").append(formattedPropertyName).append(".length; i++)\n")
+                .append(indent).append("if (null != ").append(formattedPropertyName).append(")\n")
                 .append(indent).append("{\n")
-                .append(indent).append(INDENT).append("encoder.").append(formattedPropertyName).append("(")
+                .append(indent).append(indent).append("for (int i = 0; i < ").append(formattedPropertyName)
+                .append(".length; i++)\n")
+                .append(indent).append(indent).append("{\n")
+                .append(indent).append(indent).append(INDENT).append("encoder.").append(formattedPropertyName)
+                .append("(")
                 .append("i, ").append(formattedPropertyName).append("[i]);\n")
+                .append(indent).append(indent).append("}\n")
                 .append(indent).append("}\n");
         }
     }

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

@@ -82,6 +82,8 @@ void dtoWithKeywords()
         dto.abstract$((byte)-81);
         dto.false$((byte)0);
         dto.falsE((byte)1);
+        dto.import$("char nine");
+        dto.void$(new int[] {1, 2, 3});
         final ExpandableArrayBuffer input = new ExpandableArrayBuffer();
         final KeywordsEncoder encoder = new KeywordsEncoder();
         encoder.wrap(input, 0);

sbe-tool/src/test/resources/dto-test-schema.xml

@@ -32,6 +32,8 @@
         <type name="someNumbers" primitiveType="uint32" length="5"/>
         <type name="Percentage" primitiveType="int8" minValue="0" maxValue="100"/>
         <type name="TwoBytes" primitiveType="int8" length="2" sinceVersion="2"/>
+        <type name="CharArray9" primitiveType="char" length="9" />
+        <type name="intArray" primitiveType="int32" length="5" />
         <composite name="Booster">
             <enum name="BoostType" encodingType="char">
                 <validValue name="TURBO">T</validValue>
@@ -133,7 +135,7 @@
         <field name="goto"         id="22" type="int8"/>
         <field name="if"           id="23" type="int8"/>
         <field name="implements"   id="24" type="int8"/>
-        <field name="import"       id="25" type="int8"/>
+        <field name="Import"       id="25" type="CharArray9"/>
         <field name="instanceof"   id="26" type="int8"/>
         <field name="int"          id="27" type="int8"/>
         <field name="interface"    id="28" type="int8"/>
@@ -147,7 +149,7 @@
         <field name="return"       id="36" type="int8"/>
         <field name="short"        id="37" type="int8"/>
         <field name="static"       id="38" type="int8"/>
-        <field name="strictfp"     id="39" type="int8"/>
+        <field name="strictfp"     id="39" type="CharArray9"/>
         <field name="super"        id="40" type="int8"/>
         <field name="switch"       id="41" type="int8"/>
         <field name="synchronized" id="42" type="int8"/>
@@ -156,7 +158,7 @@
         <field name="throws"       id="45" type="int8"/>
         <field name="transient"    id="46" type="int8"/>
         <field name="try"          id="47" type="int8"/>
-        <field name="void"         id="48" type="int8"/>
+        <field name="void"         id="48" type="intArray"/>
         <field name="volatile"     id="49" type="int8"/>
         <field name="while"        id="50" type="int8"/>
         <field name="null"         id="51" type="int8"/>