QFJ-881: FieldType.MultipleValueString are not created from FIX5+ xml files

 - added FieldType.MultipleStringValue and treated it the same way as FieldType.MultipleValueString
  - this avoids changes to existing data dictionaries
 - this problem originated from the official FPL repository where FIX versions prior to FIX5.0 had data type
   MultipleValueString and starting from FIX5.0 had data type MultipleStringValue

Author: chrjohn

quickfixj-codegenerator/src/main/resources/org/quickfixj/codegenerator/Fields.xsl

@@ -108,6 +108,7 @@ public class <xsl:value-of select="@name"/> extends <xsl:call-template name="get
      <xsl:when test="@type='LENGTH'">int</xsl:when>
      <xsl:when test="@type='COUNTRY'">String</xsl:when>
      <xsl:when test="@type='MULTIPLESTRINGVALUE'">String</xsl:when>
+     <xsl:when test="@type='MULTIPLEVALUESTRING'">String</xsl:when>
      <xsl:otherwise>String</xsl:otherwise>
    </xsl:choose>
 </xsl:template>
@@ -134,6 +135,7 @@ public class <xsl:value-of select="@name"/> extends <xsl:call-template name="get
      <xsl:when test="@type='LENGTH'">Int</xsl:when>
      <xsl:when test="@type='COUNTRY'">String</xsl:when>
      <xsl:when test="@type='MULTIPLESTRINGVALUE'">String</xsl:when>
+     <xsl:when test="@type='MULTIPLEVALUESTRING'">String</xsl:when>
      <xsl:otherwise>String</xsl:otherwise>
    </xsl:choose>
 </xsl:template>
@@ -152,7 +154,9 @@ public class <xsl:value-of select="@name"/> extends <xsl:call-template name="get
 	</xsl:when>
 	<xsl:when test="../@type='MULTIPLESTRINGVALUE'">public static final String <xsl:value-of select="@description"/> = "<xsl:value-of select="@enum"/>";
 	</xsl:when>
-	<xsl:when test="../@type='BOOLEAN'">public static final boolean <xsl:value-of select="@description"/> = <xsl:call-template name="y-or-n-to-bool" />;
+	<xsl:when test="../@type='MULTIPLEVALUESTRING'">public static final String <xsl:value-of select="@description"/> = "<xsl:value-of select="@enum"/>";
+	</xsl:when>
+        <xsl:when test="../@type='BOOLEAN'">public static final boolean <xsl:value-of select="@description"/> = <xsl:call-template name="y-or-n-to-bool" />;
 	</xsl:when>
 	<xsl:when test="../@type='INT'">public static final int <xsl:value-of select="@description"/> = <xsl:value-of select="@enum"/>;
 	</xsl:when>

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

@@ -454,7 +454,8 @@ public boolean isDataField(int field) {
     }
 
     private boolean isMultipleValueStringField(int field) {
-        return fieldTypes.get(field) == FieldType.MultipleValueString;
+        return (fieldTypes.get(field) == FieldType.MultipleValueString)
+                || (fieldTypes.get(field) == FieldType.MultipleStringValue);
     }
 
     /**
@@ -728,6 +729,8 @@ private void checkValidFormat(StringField field) throws IncorrectDataFormat {
                 // String
             } else if (fieldType == FieldType.MultipleValueString) {
                 // String
+            } else if (fieldType == FieldType.MultipleStringValue) {
+                // String
             } else if (fieldType == FieldType.Exchange) {
                 // String
             } else if (fieldType == FieldType.Boolean) {

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

@@ -83,6 +83,7 @@ public String toString() {
     public final static FieldType Qty = new FieldType("QTY", Double.class);
     public final static FieldType Currency = new FieldType("CURRENCY");
     public final static FieldType MultipleValueString = new FieldType("MULTIPLEVALUESTRING");
+    public final static FieldType MultipleStringValue = new FieldType("MULTIPLESTRINGVALUE"); // QFJ-881
     public final static FieldType Exchange = new FieldType("EXCHANGE");
     public final static FieldType UtcTimeStamp = new FieldType("UTCTIMESTAMP", Date.class);
     public final static FieldType Boolean = new FieldType("BOOLEAN", Boolean.class);

quickfixj-core/src/test/java/quickfix/FieldTest.java

@@ -28,8 +28,11 @@
 import static junit.framework.Assert.assertEquals;
 import org.junit.Test;
 import org.quickfixj.CharsetSupport;
+import quickfix.field.MDUpdateAction;
 import quickfix.field.RawData;
 import quickfix.field.Side;
+import quickfix.field.TradeCondition;
+import quickfix.fix50.MarketDataIncrementalRefresh;
 
 public class FieldTest {
 
@@ -250,6 +253,23 @@ public void testFieldhashCode() throws Exception {
         assertEqualsAndHash(new UtcTimeStampField(11, date), new UtcTimeStampField(11, date));
     }
 
+    // QFJ-881
+    @Test
+    public void testMultipleStringValue() throws Exception {
+
+        assertEquals(FieldType.MultipleStringValue, FieldType.fromName("notused", "MULTIPLESTRINGVALUE"));
+        assertEquals(FieldType.MultipleValueString, FieldType.fromName("notused", "MULTIPLEVALUESTRING"));
+
+        MarketDataIncrementalRefresh md = new MarketDataIncrementalRefresh();
+        MarketDataIncrementalRefresh.NoMDEntries value = new MarketDataIncrementalRefresh.NoMDEntries();
+        value.set(new MDUpdateAction(MDUpdateAction.NEW));
+        value.set(new TradeCondition("A B"));
+        md.addGroup(value);
+
+        DataDictionary dd = new DataDictionary("FIX50.xml");
+        dd.validate(md);
+    }
+    
     private void assertEqualsAndHash(Field<?> field1, Field<?> field2) {
         assertEquals("fields not equal", field1, field2);
         assertEquals("fields hashcode not equal", field1.hashCode(), field2.hashCode());