Add property to set repeating group delimiter from first tag in group

Author: andreydp

quickfixj-core/src/main/java/quickfix/DataDictionary.java

@@ -93,6 +93,7 @@ private static Supplier<DocumentBuilderFactory> createDocumentBuilderFactorySupp
     private boolean checkUserDefinedFields = true;
     private boolean checkUnorderedGroupFields = true;
     private boolean allowUnknownMessageFields = false;
+    private boolean firstFieldInGroupIsDelimiter = false;
     private String beginString;
     private String fullVersion;
     private String majorVersion;
@@ -561,6 +562,24 @@ public boolean isAllowUnknownMessageFields() {
         return allowUnknownMessageFields;
     }
 
+    public boolean isFirstFieldInGroupIsDelimiter() {
+        return firstFieldInGroupIsDelimiter;
+    }
+    /**
+     * Controls whether any field which is
+     * first in the group would be used as delimiter
+     *
+     * @param flag true = use first field from message, false = follow data dictionary
+     */
+    public void setFirstFieldInGroupIsDelimiter(boolean flag) {
+        firstFieldInGroupIsDelimiter = flag;
+        for (Map<Integer, GroupInfo> gm : groups.values()) {
+            for (GroupInfo gi : gm.values()) {
+                gi.getDataDictionary().setFirstFieldInGroupIsDelimiter(flag);
+            }
+        }
+    }
+
     /**
      * Controls whether group fields are in the same order
      *

quickfixj-core/src/main/java/quickfix/Message.java

@@ -723,7 +723,7 @@ private void parseGroup(String msgType, StringField field, DataDictionary dd, Da
             throw MessageUtils.newInvalidMessageException("Repeating group count requires an Integer but found '" + field.getValue() + "' in " + messageData, this);
         }
         parent.setField(groupCountTag, field);
-        final int firstField = rg.getDelimiterField();
+        int firstField = groupDataDictionary.isFirstFieldInGroupIsDelimiter() ? -1 : rg.getDelimiterField();
         Group group = null;
         boolean inGroupParse = true;
         while (inGroupParse) {
@@ -733,7 +733,9 @@ private void parseGroup(String msgType, StringField field, DataDictionary dd, Da
                 break;
             }
             int tag = field.getTag();
-            if (tag == firstField) {
+            boolean shouldCreateNewGroup = tag == firstField || (groupDataDictionary.isFirstFieldInGroupIsDelimiter() && firstField < 0);
+            if (shouldCreateNewGroup) {
+                firstField = tag;
                 addGroupRefToParent(group, parent);
                 group = new Group(groupCountTag, firstField, groupDataDictionary.getOrderedFields());
                 group.setField(field);