[Java] Fix validation of valueRef in fields which use a primitive encoded type. Issue #529.

Author: mjpt777

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

@@ -18,6 +18,7 @@
 import org.w3c.dom.Node;
 
 import java.util.List;
+import java.util.Map;
 
 import static uk.co.real_logic.sbe.xml.XmlSchemaParser.*;
 
@@ -84,7 +85,7 @@ public Field(
         this.timeUnit = timeUnit;
     }
 
-    public void validate(final Node node)
+    public void validate(final Node node, final Map<String, Type> typeByNameMap)
     {
         if (type != null &&
             semanticType != null &&
@@ -96,34 +97,43 @@ public void validate(final Node node)
 
         checkForValidName(node, name);
 
+        if (null != valueRef)
+        {
+            validateValueRef(node, typeByNameMap);
+        }
+
         if (type instanceof EnumType && presence == Presence.CONSTANT)
         {
             if (null == valueRef)
             {
                 handleError(node, "valueRef not set for constant enum");
             }
-            else
+        }
+
+        if (null != valueRef && presence == Presence.CONSTANT)
+        {
+            final String valueRefType = valueRef.substring(0, valueRef.indexOf('.'));
+
+            if (!(type instanceof EnumType))
             {
-                final int periodIndex = valueRef.indexOf('.');
-                if (periodIndex < 1 || periodIndex == (valueRef.length() - 1))
+                if (type instanceof EncodedDataType)
                 {
-                    handleError(
-                        node, "valueRef format not valid for constant (enum-name.valid-value-name): " + valueRef);
-                }
+                    final EnumType enumType = (EnumType)typeByNameMap.get(valueRefType);
 
-                final String valueRefType = valueRef.substring(0, periodIndex);
-                if (!valueRefType.equals(type.name()))
-                {
-                    handleError(node, "valueRef for enum name not found: " + valueRefType);
+                    if (((EncodedDataType)type).primitiveType() != enumType.encodingType())
+                    {
+                        handleError(node, "valueRef does not match field type: " + valueRef);
+                    }
                 }
-
-                final String validValueName = valueRef.substring(periodIndex + 1);
-                final EnumType enumType = (EnumType)type;
-                if (null == enumType.getValidValue(validValueName))
+                else
                 {
-                    handleError(node, "valueRef for validValue name not found: " + validValueName);
+                    handleError(node, "valueRef does not match field type: " + valueRef);
                 }
             }
+            else if (!valueRefType.equals(type.name()))
+            {
+                handleError(node, "valueRef for enum name not found: " + valueRefType);
+            }
         }
     }
 
@@ -255,6 +265,38 @@ public String toString()
             '}';
     }
 
+    private void validateValueRef(final Node node, final Map<String, Type> typeByNameMap)
+    {
+        final int periodIndex = valueRef.indexOf('.');
+        if (periodIndex < 1 || periodIndex == (valueRef.length() - 1))
+        {
+            handleError(
+                node, "valueRef format not valid for constant (enum-name.valid-value-name): " + valueRef);
+        }
+
+        final String valueRefType = valueRef.substring(0, periodIndex);
+        final Type valueType = typeByNameMap.get(valueRefType);
+        if (null == valueType)
+        {
+            handleError(node, "valueRef for enum name not found: " + valueRefType);
+        }
+
+        if (valueType instanceof EnumType)
+        {
+            final EnumType enumType = (EnumType)valueType;
+            final String validValueName = valueRef.substring(periodIndex + 1);
+
+            if (null == enumType.getValidValue(validValueName))
+            {
+                handleError(node, "valueRef for validValue name not found: " + validValueName);
+            }
+        }
+        else
+        {
+            handleError(node, "valueRef for is not of type enum: " + valueRefType);
+        }
+    }
+
     public static class Builder
     {
         private String name;

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

@@ -278,7 +278,7 @@ private Field parseField(final NodeList nodeList, final int nodeIndex)
             .type(fieldType)
             .build();
 
-        field.validate(node);
+        field.validate(node, typeByNameMap);
 
         return field;
     }
@@ -338,7 +338,7 @@ else if (!(fieldType instanceof CompositeType))
             .variableLength(true)
             .build();
 
-        field.validate(node);
+        field.validate(node, typeByNameMap);
 
         return field;
     }