Merge branch 'master' into QFJ-845

Author: unknown

pom.xml

@@ -24,7 +24,7 @@
 	</licenses>
 
 	<prerequisites>
-		<maven>3.2.5</maven>
+		<maven>3.3.3</maven>
 	</prerequisites>
 
 	<modules>
@@ -56,7 +56,6 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.3</version>
 					<configuration>
-					    <fork>true</fork>
 						<meminitial>128m</meminitial>
 						<maxmem>756m</maxmem>
 						<source>${jdkLevel}</source>
@@ -105,7 +104,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
-					<version>2.5.2</version>
+					<version>2.5.4</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>

quickfixj-codegenerator/pom.xml

@@ -25,7 +25,7 @@
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-plugin-api</artifactId>
-			<version>3.2.5</version>
+			<version>3.3.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>

quickfixj-core/pom.xml

@@ -323,7 +323,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.1</version>
+				<version>2.10.3</version>
 			</plugin>
 			<plugin>
 				<artifactId>maven-jxr-plugin</artifactId>

quickfixj-core/src/main/doc/usermanual/usage/user_defined_fields.html

@@ -17,7 +17,7 @@ <H2>User Defined Fields</H2>
     be used to set and get user defined fields? Well one answer would be to use the non-type safe
     set and get fields like so:
   </p>
-  <pre class="code">message.setField(new StringField(6123), "value");
+  <pre class="code">message.setField(new StringField(6123, "value"));
 StringField field = message.getField(new StringField(6123));
   </pre>
 

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

@@ -474,6 +474,18 @@ public boolean isCheckUnorderedGroupFields() {
         return checkUnorderedGroupFields;
     }
 
+    public boolean isCheckFieldsHaveValues() {
+        return checkFieldsHaveValues;
+    }
+
+    public boolean isCheckUserDefinedFields() {
+        return checkUserDefinedFields;
+    }
+
+    public boolean isAllowUnknownMessageFields() {
+        return allowUnknownMessageFields;
+    }
+
     /**
      * Controls whether group fields are in the same order
      *
@@ -523,6 +535,8 @@ private void copyFrom(DataDictionary rhs) {
         checkFieldsOutOfOrder = rhs.checkFieldsOutOfOrder;
         checkFieldsHaveValues = rhs.checkFieldsHaveValues;
         checkUserDefinedFields = rhs.checkUserDefinedFields;
+        checkUnorderedGroupFields = rhs.checkUnorderedGroupFields;
+        allowUnknownMessageFields = rhs.allowUnknownMessageFields;
 
         copyMap(messageFields, rhs.messageFields);
         copyMap(requiredFields, rhs.requiredFields);
@@ -997,6 +1011,10 @@ private void load(InputStream inputStream) throws ConfigError {
         }
     }
 
+    public int getNumMessageCategories() {
+        return messageCategory.size();
+    }
+
     private void load(Document document, String msgtype, Node node) throws ConfigError {
         String name;
         final NodeList fieldNodes = node.getChildNodes();

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

@@ -196,6 +196,9 @@ public void testHeaderTrailerRequired() throws Exception {
         data += "</fix>";
 
         DataDictionary dd = new DataDictionary(new ByteArrayInputStream(data.getBytes()));
+        assertEquals(1, dd.getNumMessageCategories());
+        assertEquals("0", dd.getMsgType("Heartbeat"));
+
         assertTrue("BeginString should be required", dd.isRequiredHeaderField(8));
         assertFalse("OnBehalfOfCompID should not be required", dd.isRequiredHeaderField(115));
         assertTrue("Checksum should be required", dd.isRequiredTrailerField(10));
@@ -428,6 +431,25 @@ public void testNewOrderSingleWithMisplacedTag50() throws Exception {
         assertTrue(nos4.getHeader().isSetField(new SenderSubID()));
     }
 
+    public void testCopy() throws Exception {
+        final DataDictionary dataDictionary = new DataDictionary(getDictionary());
+
+        dataDictionary.setAllowUnknownMessageFields(true);
+        dataDictionary.setCheckFieldsHaveValues(false);
+        dataDictionary.setCheckFieldsOutOfOrder(false);
+        dataDictionary.setCheckUnorderedGroupFields(false);
+        dataDictionary.setCheckUserDefinedFields(false);
+
+        DataDictionary ddCopy = new DataDictionary(dataDictionary);
+
+        assertEquals(ddCopy.isAllowUnknownMessageFields(),dataDictionary.isAllowUnknownMessageFields());
+        assertEquals(ddCopy.isCheckFieldsHaveValues(),dataDictionary.isCheckFieldsHaveValues());
+        assertEquals(ddCopy.isCheckFieldsOutOfOrder(),dataDictionary.isCheckFieldsOutOfOrder());
+        assertEquals(ddCopy.isCheckUnorderedGroupFields(),dataDictionary.isCheckUnorderedGroupFields());
+        assertEquals(ddCopy.isCheckUserDefinedFields(),dataDictionary.isCheckUserDefinedFields());
+
+    }
+
     //
     // Group Validation Tests in RepeatingGroupTest
     //

quickfixj-distribution/pom.xml

@@ -128,7 +128,7 @@
 			<!-- generate javadocs into apidocs folder -->
 			<plugin>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.10.1</version>
+				<version>2.10.3</version>
 				<executions>
 					<execution>
 						<id>javadoc-jar</id>