Message generation length & checksum optimization

.travis.yml

@@ -0,0 +1,10 @@
+language: java
+sudo: false
+jdk:
+  - oraclejdk8
+before_script:
+  - ulimit -n 4096
+before_install:
+  - echo "MAVEN_OPTS='-Xms2g -Xmx3g'" > ~/.mavenrc
+script:
+  - travis_wait 30 mvn test -B -V -Djava.util.logging.config.file=logging.properties

README.md

@@ -1,6 +1,9 @@
 QuickFIX/J
 ==========
 
+[![Build Status](https://travis-ci.org/quickfix-j/quickfixj.svg?branch=master)](https://travis-ci.org/quickfix-j/quickfixj)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.quickfixj/quickfixj-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.quickfixj/quickfixj-core)
+
 This is the official QuickFIX/J project repository.
 
 The Financial Information eXchange (FIX) protocol is a messaging standard developed

pom.xml

@@ -3,7 +3,7 @@
 
 	<groupId>org.quickfixj</groupId>
 	<artifactId>quickfixj-parent</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>QuickFIX/J Parent</name>
@@ -52,7 +52,7 @@
 	</issueManagement>
 
 	<prerequisites>
-		<maven>3.3.9</maven>
+		<maven>3.5.0</maven>
 	</prerequisites>
 
 	<modules>
@@ -68,25 +68,25 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<jdkLevel>1.7</jdkLevel>
-		<slf4j.version>1.7.21</slf4j.version>
+		<jdkLevel>1.8</jdkLevel>
+		<slf4j.version>1.7.25</slf4j.version>
 		<junit.version>4.12</junit.version>
-		<mainClass/>
+		<mainClass />
 
-		<maven-resources-plugin-version>3.0.1</maven-resources-plugin-version>
-		<maven-compiler-plugin-version>3.5.1</maven-compiler-plugin-version>
+		<maven-resources-plugin-version>3.0.2</maven-resources-plugin-version>
+		<maven-compiler-plugin-version>3.7.0</maven-compiler-plugin-version>
 		<maven-jar-plugin-version>3.0.2</maven-jar-plugin-version>
-		<maven-surefire-plugin-version>2.19.1</maven-surefire-plugin-version>
-		<maven-pmd-plugin-version>3.7</maven-pmd-plugin-version>
+		<maven-surefire-plugin-version>2.20.1</maven-surefire-plugin-version>
+		<maven-pmd-plugin-version>3.8</maven-pmd-plugin-version>
 		<maven-source-plugin-version>3.0.1</maven-source-plugin-version>
 		<maven-javadoc-plugin-version>2.10.4</maven-javadoc-plugin-version>
-		<maven-shade-plugin-version>2.4.3</maven-shade-plugin-version>
-		<maven-assembly-plugin-version>2.6</maven-assembly-plugin-version>
-		<maven-bundle-plugin-version>3.2.0</maven-bundle-plugin-version>
+		<maven-shade-plugin-version>3.1.0</maven-shade-plugin-version>
+		<maven-assembly-plugin-version>3.1.0</maven-assembly-plugin-version>
+		<maven-bundle-plugin-version>3.3.0</maven-bundle-plugin-version>
 		<maven-gpg-plugin-version>1.6</maven-gpg-plugin-version>
 		<maven-deploy-plugin-version>2.8.2</maven-deploy-plugin-version>
-		<nexus-staging-maven-plugin-version>1.6.7</nexus-staging-maven-plugin-version>
-		<build-helper-maven-plugin-version>1.12</build-helper-maven-plugin-version>
+		<nexus-staging-maven-plugin-version>1.6.8</nexus-staging-maven-plugin-version>
+		<build-helper-maven-plugin-version>3.0.0</build-helper-maven-plugin-version>
 	</properties>
 
 	<build>
@@ -106,9 +106,12 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>${maven-compiler-plugin-version}</version>
+					<inherited>true</inherited>
 					<configuration>
 						<source>${jdkLevel}</source>
 						<target>${jdkLevel}</target>
+						<meminitial>2g</meminitial>
+						<maxmem>4g</maxmem>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -155,9 +158,6 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
 					<version>${maven-javadoc-plugin-version}</version>
-					<configuration>
-						<excludePackageNames>quickfix.fix*</excludePackageNames>
-					</configuration>
 					<executions>
 						<execution>
 							<id>attach-javadocs</id>
@@ -166,6 +166,7 @@
 							</goals>
 							<configuration>
 								<additionalparam>-Xdoclint:none</additionalparam>
+							    <maxmemory>3g</maxmemory>
 							</configuration>
 						</execution>
 					</executions>

quickfixj-all/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.quickfixj</groupId>
 		<artifactId>quickfixj-parent</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>quickfixj-all</artifactId>

quickfixj-codegenerator/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.quickfixj</groupId>
 		<artifactId>quickfixj-parent</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>quickfixj-codegenerator</artifactId>
@@ -25,13 +25,18 @@
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-plugin-api</artifactId>
-			<version>3.3.9</version>
+			<version>3.5.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven</groupId>
 			<artifactId>maven-project</artifactId>
 			<version>2.2.1</version>
 		</dependency>
+		<dependency>
+		    <groupId>net.sf.saxon</groupId>
+		    <artifactId>Saxon-HE</artifactId>
+		    <version>9.8.0-4</version>
+		</dependency>
 	</dependencies>
 
 	<build>

quickfixj-codegenerator/src/main/java/org/quickfixj/codegenerator/GenerateMojo.java

@@ -19,12 +19,13 @@
 
 package org.quickfixj.codegenerator;
 
-import java.io.File;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.util.FileUtils;
 
+import java.io.File;
+
 /**
  * A mojo that uses the quickfix code generator to generate
  * Java source files from a QuickFIX Dictionary.
@@ -137,8 +138,6 @@ public void execute() throws MojoExecutionException {
             task.setOrderedFields(orderedFields);
             task.setDecimalGenerated(decimal);
             generator.generate(task);
-        } catch (Exception e) {
-            throw new MojoExecutionException("QuickFIX code generator execution failed", e);
         } catch (Throwable t) {
             throw new MojoExecutionException("QuickFIX code generator execution failed", t);
         }

quickfixj-codegenerator/src/main/java/org/quickfixj/codegenerator/MessageCodeGenerator.java

@@ -19,17 +19,10 @@
 
 package org.quickfixj.codegenerator;
 
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.SAXException;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -42,11 +35,17 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Generates Message and Field related code for the various FIX versions.
@@ -84,7 +83,7 @@ private void generateMessageBaseClass(Task task) throws
             ParserConfigurationException, SAXException, IOException,
             TransformerFactoryConfigurationError, TransformerException {
         logInfo(task.getName() + ": generating message base class");
-        Map<String, String> parameters = new HashMap<String, String>();
+        Map<String, String> parameters = new HashMap<>();
         parameters.put(XSLPARAM_SERIAL_UID, SERIAL_UID_STR);
         generateClassCode(task, "Message", parameters);
     }
@@ -107,7 +106,7 @@ private void generateClassCode(Task task, String className, Map<String, String>
             TransformerException {
         logDebug("generating " + className + " for " + task.getName());
         if (parameters == null) {
-            parameters = new HashMap<String, String>();
+            parameters = new HashMap<>();
         }
         parameters.put("messagePackage", task.getMessagePackage());
         parameters.put("fieldPackage", task.getFieldPackage());
@@ -131,7 +130,7 @@ private void generateFieldClasses(Task task) throws ParserConfigurationException
                 String outputFile = outputDirectory + fieldName + ".java";
                 if (!new File(outputFile).exists()) {
                     logDebug("field: " + fieldName);
-                    Map<String, String> parameters = new HashMap<String, String>();
+                    Map<String, String> parameters = new HashMap<>();
                     parameters.put("fieldName", fieldName);
                     parameters.put("fieldPackage", task.getFieldPackage());
                     if (task.isDecimalGenerated()) {
@@ -159,7 +158,7 @@ private void generateMessageSubclasses(Task task) throws ParserConfigurationExce
         Transformer transformer = createTransformer(task, "MessageSubclass.xsl");
         for (String messageName : messageNames) {
             logDebug("generating message class: " + messageName);
-            Map<String, String> parameters = new HashMap<String, String>();
+            Map<String, String> parameters = new HashMap<>();
             parameters.put("itemName", messageName);
             parameters.put(XSLPARAM_SERIAL_UID, SERIAL_UID_STR);
             parameters.put("orderedFields", Boolean.toString(task.isOrderedFields()));
@@ -185,7 +184,7 @@ private void generateComponentClasses(Task task) throws ParserConfigurationExcep
         Transformer transformer = createTransformer(task, "MessageSubclass.xsl");
         for (String componentName : componentNames) {
             logDebug("generating component class: " + componentName);
-            Map<String, String> parameters = new HashMap<String, String>();
+            Map<String, String> parameters = new HashMap<>();
             parameters.put("itemName", componentName);
             parameters.put("baseClass", "quickfix.MessageComponent");
             parameters.put("subpackage", ".component");
@@ -208,11 +207,11 @@ private Transformer createTransformer(Task task, String xsltFile)
             logInfo("Loading predefined xslt file:" + xsltFile);
             styleSource = new StreamSource(this.getClass().getResourceAsStream(xsltFile));
         }
-        TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        TransformerFactory transformerFactory = new net.sf.saxon.TransformerFactoryImpl();
         return transformerFactory.newTransformer(styleSource);
     }
 
-    private final Map<String, Document> specificationCache = new HashMap<String, Document>();
+    private final Map<String, Document> specificationCache = new HashMap<>();
 
     private Document getSpecification(Task task) throws ParserConfigurationException, SAXException,
             IOException {
@@ -242,7 +241,7 @@ private void writePackageDocumentation(String outputDirectory, String descriptio
     }
 
     private List<String> getNames(Element element, String path) {
-        return getNames(element, path, new ArrayList<String>());
+        return getNames(element, path, new ArrayList<>());
     }
 
     private List<String> getNames(Element element, String path, List<String> names) {

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

@@ -18,7 +18,7 @@
 *****************************************************************************
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:qf="http://www.quickfixj.org" version="2.0">
  <xsl:output method="text" encoding="UTF-8"/>
  <xsl:param name="fieldName"/>
  <xsl:param name="fieldPackage"/>
@@ -60,8 +60,12 @@
 package <xsl:value-of select="$fieldPackage"/>;
 
 import quickfix.<xsl:call-template name="get-field-type"/>Field;
-<xsl:if test="@type='UTCTIMESTAMP' or @type='UTCTIMEONLY' or @type='UTCDATE' or @type='UTCDATEONLY'">
-import java.util.Date;</xsl:if>
+<xsl:if test="@type='UTCTIMESTAMP'">
+import java.time.LocalDateTime;</xsl:if>
+<xsl:if test="@type='UTCDATE' or @type='UTCDATEONLY'">
+import java.time.LocalDate;</xsl:if>
+<xsl:if test="@type='UTCTIMEONLY'">
+import java.time.LocalTime;</xsl:if>
 
 public class <xsl:value-of select="@name"/> extends <xsl:call-template name="get-field-type"/>Field {
 
@@ -95,10 +99,10 @@ public class <xsl:value-of select="@name"/> extends <xsl:call-template name="get
      <xsl:when test="@type='AMT'"><xsl:value-of select="$decimalType"/></xsl:when>
      <xsl:when test="@type='QTY'"><xsl:value-of select="$decimalType"/></xsl:when>
      <xsl:when test="@type='CURRENCY'">String</xsl:when>
-     <xsl:when test="@type='UTCTIMESTAMP'">Date</xsl:when>
-     <xsl:when test="@type='UTCTIMEONLY'">Date</xsl:when>
-     <xsl:when test="@type='UTCDATE'">Date</xsl:when>
-     <xsl:when test="@type='UTCDATEONLY'">Date</xsl:when>
+     <xsl:when test="@type='UTCTIMESTAMP'">LocalDateTime</xsl:when>
+     <xsl:when test="@type='UTCTIMEONLY'">LocalTime</xsl:when>
+     <xsl:when test="@type='UTCDATE'">LocalDate</xsl:when>
+     <xsl:when test="@type='UTCDATEONLY'">LocalDate</xsl:when>
      <xsl:when test="@type='BOOLEAN'">boolean</xsl:when>
      <xsl:when test="@type='FLOAT'">double</xsl:when>
      <xsl:when test="@type='PRICEOFFSET'"><xsl:value-of select="$decimalType"/></xsl:when>
@@ -147,26 +151,39 @@ public class <xsl:value-of select="@name"/> extends <xsl:call-template name="get
  </xsl:choose>
 </xsl:template>
 
+<xsl:function name="qf:sanitiseDescription">
+    <xsl:param name="text" />
+    <xsl:if test="contains('0123456789', substring($text, 1, 1))">
+        <xsl:text>N_</xsl:text>
+    </xsl:if>
+    <xsl:variable name="toReplace">.,+-=:()/&amp;&quot;&apos;&lt;&gt;</xsl:variable>
+    <xsl:for-each select="tokenize(translate($text,$toReplace,''),' ')">
+        <xsl:value-of select="upper-case(substring(.,1,1))" />
+        <xsl:value-of select="substring(.,2)" />
+    </xsl:for-each>
+</xsl:function>
+
 <xsl:template name="values">
 <xsl:for-each select="value">
+<xsl:variable name="description" select="string-join(qf:sanitiseDescription(@description),'')"/>
 <xsl:choose>
-	<xsl:when test="../@type='STRING'">public static final String <xsl:value-of select="@description"/> = "<xsl:value-of select="@enum"/>";
+	<xsl:when test="../@type='STRING'">public static final String <xsl:value-of select="$description"/> = "<xsl:value-of select="@enum"/>";
 	</xsl:when>
-	<xsl:when test="../@type='MULTIPLESTRINGVALUE'">public static final String <xsl:value-of select="@description"/> = "<xsl:value-of select="@enum"/>";
+	<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='MULTIPLEVALUESTRING'">public static final String <xsl:value-of select="@description"/> = "<xsl:value-of select="@enum"/>";
+	<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 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 test="../@type='INT'">public static final int <xsl:value-of select="$description"/> = <xsl:value-of select="@enum"/>;
 	</xsl:when>
-	<xsl:when test="../@type='NUMINGROUP'">public static final int <xsl:value-of select="@description"/> = <xsl:value-of select="@enum"/>;
+	<xsl:when test="../@type='NUMINGROUP'">public static final int <xsl:value-of select="$description"/> = <xsl:value-of select="@enum"/>;
 	</xsl:when>
-	<xsl:when test="../@type='EXCHANGE'">public static final String <xsl:value-of select="@description"/> = "<xsl:value-of select="@enum"/>";
+	<xsl:when test="../@type='EXCHANGE'">public static final String <xsl:value-of select="$description"/> = "<xsl:value-of select="@enum"/>";
 	</xsl:when>
-	<xsl:when test="../@type='MONTHYEAR'">public static final String <xsl:value-of select="@description"/> = "<xsl:value-of select="@enum"/>";
+	<xsl:when test="../@type='MONTHYEAR'">public static final String <xsl:value-of select="$description"/> = "<xsl:value-of select="@enum"/>";
 	</xsl:when>
-	<xsl:otherwise>public static final char <xsl:value-of select="@description"/> = '<xsl:value-of select="@enum"/>';
+	<xsl:otherwise>public static final char <xsl:value-of select="$description"/> = '<xsl:value-of select="@enum"/>';
 	</xsl:otherwise>
 </xsl:choose>
 </xsl:for-each>

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

@@ -18,7 +18,7 @@
 *****************************************************************************
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
  <xsl:output method="text" encoding="UTF-8"/>
  <xsl:param name="serialVersionUID"/>
  <xsl:param name="messagePackage"/>

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

@@ -18,7 +18,7 @@
 *****************************************************************************
 -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
  <xsl:output method="text" encoding="UTF-8"/>
  <xsl:param name="fieldPackage"/>
  <xsl:param name="messagePackage"/>