[Java] Names should be checked with consideration to group nesting. Issue aeron-io#470.

Author: mjpt777

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

@@ -56,7 +56,6 @@ public class Message
  private final String semanticType;
  private final int computedBlockLength;
  private final Map<String, Type> typeByNameMap;
- private final ObjectHashSet<String> names = new ObjectHashSet<>();
 
  /**
  * Construct a new message from XML Schema.
@@ -169,6 +168,7 @@ private List<Field> parseFieldsAndGroups(final Node node) throws XPathExpression
  final NodeList list = (NodeList)xPath.compile(FIELD_OR_GROUP_OR_DATA_EXPR).evaluate(node, NODESET);
  boolean groupEncountered = false, dataEncountered = false;
 
+ final ObjectHashSet<String> distinctNames = new ObjectHashSet<>();
  final List<Field> fieldList = new ArrayList<>();
 
  for (int i = 0, size = list.getLength(); i < size; i++)
@@ -206,7 +206,7 @@ private List<Field> parseFieldsAndGroups(final Node node) throws XPathExpression
  throw new IllegalStateException("Unknown node name: " + nodeName);
  }
 
- if (!names.add(field.name()))
+ if (!distinctNames.add(field.name()))
  {
  handleError(node, "duplicate name found: " + field.name());
  }

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

@@ -162,10 +162,10 @@ public static Map<Long, Message> findMessages(
  final Document document, final XPath xPath, final Map<String, Type> typeByNameMap) throws Exception
  {
  final Map<Long, Message> messageByIdMap = new HashMap<>();
- final ObjectHashSet<String> names = new ObjectHashSet<>();
+ final ObjectHashSet<String> distinctNames = new ObjectHashSet<>();
 
  forEach((NodeList)xPath.compile(MESSAGE_XPATH_EXPR).evaluate(document, XPathConstants.NODESET),
- (node) -> addMessageWithIdCheck(names, messageByIdMap, new Message(node, typeByNameMap), node));
+ (node) -> addMessageWithIdCheck(distinctNames, messageByIdMap, new Message(node, typeByNameMap), node));
 
  return messageByIdMap;
  }
@@ -337,7 +337,7 @@ private static void addTypeWithNameCheck(final Map<String, Type> typeByNameMap,
  }
 
  private static void addMessageWithIdCheck(
- final ObjectHashSet<String> names,
+ final ObjectHashSet<String> distinctNames,
  final Map<Long, Message> messageByIdMap,
  final Message message,
  final Node node)
@@ -347,7 +347,7 @@ private static void addMessageWithIdCheck(
  handleError(node, "message template id already exists: " + message.id());
  }
 
- if (!names.add(message.name()))
+ if (!distinctNames.add(message.name()))
  {
  handleError(node, "message name already exists: " + message.name());
  }