[Java] Allow uint32 for blockLength with warning. Issue #609.

Author: mjpt777

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

@@ -354,7 +354,7 @@ private void generateGroupDecoderClassHeader(
             indent + "        this.parentMessage = parentMessage;\n" +
             indent + "        this.buffer = buffer;\n" +
             indent + "        dimensions.wrap(buffer, parentMessage.limit());\n" +
-            indent + "        blockLength = dimensions.blockLength();\n" +
+            indent + "        blockLength = (int)dimensions.blockLength();\n" +
             indent + "        count = (int)dimensions.numInGroup();\n" +
             indent + "        index = -1;\n" +
             indent + "        parentMessage.limit(parentMessage.limit() + HEADER_SIZE);\n" +

sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/CompositeType.java

@@ -167,6 +167,16 @@ else if (!isUnsigned(blockLengthType.primitiveType()))
         {
             XmlSchemaParser.handleError(node, "\"blockLength\" must be unsigned type");
         }
+        else
+        {
+            if (blockLengthType.primitiveType() != UINT8 && blockLengthType.primitiveType() != UINT16)
+            {
+                XmlSchemaParser.handleWarning(node, "\"blockLength\" should be UINT8 or UINT16");
+            }
+
+            final PrimitiveValue blockLengthTypeMaxValue = blockLengthType.maxValue();
+            validateMaxValue(node, blockLengthType.primitiveType(), blockLengthTypeMaxValue);
+        }
 
         if (numInGroupType == null)
         {
@@ -176,25 +186,26 @@ else if (!isUnsigned(numInGroupType.primitiveType()))
         {
             XmlSchemaParser.handleError(node, "\"numInGroup\" must be unsigned type");
         }
-        else if (numInGroupType.primitiveType() != UINT8 && numInGroupType.primitiveType() != UINT16)
-        {
-            XmlSchemaParser.handleWarning(node, "\"numInGroup\" should be UINT8 or UINT16");
-        }
         else
         {
-            final PrimitiveValue maxValue = numInGroupType.maxValue();
-            validateMaxValue(node, numInGroupType.primitiveType(), maxValue);
+            if (numInGroupType.primitiveType() != UINT8 && numInGroupType.primitiveType() != UINT16)
+            {
+                XmlSchemaParser.handleWarning(node, "\"numInGroup\" should be UINT8 or UINT16");
+            }
+
+            final PrimitiveValue numInGroupMaxValue = numInGroupType.maxValue();
+            validateMaxValue(node, numInGroupType.primitiveType(), numInGroupMaxValue);
 
-            final PrimitiveValue minValue = numInGroupType.minValue();
-            if (null != minValue)
+            final PrimitiveValue numInGroupMinValue = numInGroupType.minValue();
+            if (null != numInGroupMinValue)
             {
-                final long max = maxValue != null ?
-                    maxValue.longValue() : numInGroupType.primitiveType().maxValue().longValue();
+                final long max = numInGroupMaxValue != null ?
+                    numInGroupMaxValue.longValue() : numInGroupType.primitiveType().maxValue().longValue();
 
-                if (minValue.longValue() > max)
+                if (numInGroupMinValue.longValue() > max)
                 {
                     XmlSchemaParser.handleError(node, String.format(
-                        "\"numInGroup\" minValue=%s greater than maxValue=%d", minValue, max));
+                        "\"numInGroup\" minValue=%s greater than maxValue=%d", numInGroupMinValue, max));
                 }
             }
         }