[Java] Generalise description and sinceVersion on types when parsing XML. Issue aeron-io#415.

Author: mjpt777

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

@@ -45,7 +45,6 @@ public class CompositeType extends Type
 
  private final List<String> compositesPath = new ArrayList<>();
  private final Map<String, Type> containedTypeByNameMap = new LinkedHashMap<>();
- private final int sinceVersion;
 
  public CompositeType(final Node node) throws XPathExpressionException
  {
@@ -68,7 +67,6 @@ public CompositeType(final Node node, final String givenName, final List<String>
  this.compositesPath.addAll(compositesPath);
  this.compositesPath.add(getAttributeValue(node, "name"));
 
- sinceVersion = Integer.parseInt(XmlSchemaParser.getAttributeValue(node, "sinceVersion", "0"));
  final XPath xPath = XPathFactory.newInstance().newXPath();
  final NodeList list = (NodeList)xPath.compile(SUB_TYPES_EXP).evaluate(node, NODESET);
 
@@ -121,16 +119,6 @@ public int encodedLength()
  return offset;
  }
 
- /**
- * Return the sinceVersion value of the {@link CompositeType}
- *
- * @return the sinceVersion of the {@link CompositeType}
- */
- public int sinceVersion()
- {
- return sinceVersion;
- }
-
  /**
  * Return list of the Type that compose this composite
  *

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

@@ -41,7 +41,6 @@ public class EncodedDataType extends Type
  private final PrimitiveValue maxValue;
  private final PrimitiveValue nullValue;
  private final String characterEncoding;
- private final int sinceVersion;
  private boolean varLen;
 
  /**
@@ -68,7 +67,6 @@ public EncodedDataType(final Node node, final String givenName)
  length = Integer.parseInt(getAttributeValue(node, "length", "1"));
  varLen = Boolean.parseBoolean(getAttributeValue(node, "variableLength", "false"));
  characterEncoding = getAttributeValue(node, "characterEncoding", "UTF-8");
- sinceVersion = Integer.parseInt(getAttributeValue(node, "sinceVersion", "0"));
 
  if (presence() == CONSTANT)
  {
@@ -144,7 +142,7 @@ public EncodedDataType(
  final int length,
  final boolean varLen)
  {
- super(name, presence, description, semanticType);
+ super(name, presence, description, 0, semanticType);
 
  this.primitiveType = primitiveType;
  this.length = length;
@@ -154,7 +152,6 @@ public EncodedDataType(
  this.maxValue = null;
  this.nullValue = null;
  characterEncoding = null;
- sinceVersion = 0;
  }
 
  /**
@@ -267,14 +264,4 @@ public String characterEncoding()
  {
  return characterEncoding;
  }
-
- /**
- * Return the sinceVersion of the {@link EncodedDataType}
- *
- * @return the sinceVersion value of the {@link EncodedDataType}
- */
- public int sinceVersion()
- {
- return sinceVersion;
- }
 }

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

@@ -28,6 +28,7 @@ public abstract class Type
  private final String name;
  private final Presence presence;
  private final String description;
+ private final int sinceVersion;
  private final String semanticType;
 
  private int offsetAttribute;
@@ -48,8 +49,10 @@ public Type(final Node node, final String givenName)
  {
  name = givenName;
  }
+
  presence = Presence.get(getAttributeValue(node, "presence", "required"));
  description = getAttributeValueOrNull(node, "description");
+ sinceVersion = Integer.parseInt(getAttributeValue(node, "sinceVersion", "0"));
  semanticType = getAttributeValueOrNull(node, "semanticType");
  offsetAttribute = Integer.parseInt(getAttributeValue(node, "offset", "-1"));
  }
@@ -60,13 +63,20 @@ public Type(final Node node, final String givenName)
  * @param name of the type
  * @param presence of the type
  * @param description of the type or null
+ * @param sinceVersion for the type
  * @param semanticType of the type or null
  */
- public Type(final String name, final Presence presence, final String description, final String semanticType)
+ public Type(
+ final String name,
+ final Presence presence,
+ final String description,
+ final int sinceVersion,
+ final String semanticType)
  {
  this.name = name;
  this.presence = presence;
  this.description = description;
+ this.sinceVersion = sinceVersion;
  this.semanticType = semanticType;
  this.offsetAttribute = -1;
  }
@@ -110,6 +120,16 @@ public String description()
  return description;
  }
 
+ /**
+ * The version since this was added to the template.
+ *
+ * @return version since this was added to the template.
+ */
+ public int sinceVersion()
+ {
+ return sinceVersion;
+ }
+
  /**
  * The semanticType of the Type
  *

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

@@ -351,6 +351,7 @@ private static String formatLocationInfo(final Node node)
  ">" : (" name=\"" + getAttributeValueOrNull(node, "name") + "\"> "));
  }
 
+ @FunctionalInterface
  interface NodeFunction
  {
  void execute(Node node) throws XPathExpressionException;