Merge branch 'master' into use-session-log

Author: chrjohn

.github/workflows/maven.yml

@@ -28,7 +28,7 @@ jobs:
           java-version: ${{ matrix.java }}
           cache: 'maven'
       - name: Test with Maven
-        run: ./mvnw install -B -V -Pminimal-fix-latest -D"java.util.logging.config.file"="logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
+        run: ./mvnw install -B -V -Pminimal-fix-latest -D"java.util.logging.config.file"="./quickfixj-core/src/test/resources/logging.properties" -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
 
   test-windows:
     runs-on: ${{ matrix.os }}
@@ -55,4 +55,4 @@ jobs:
           java-version: ${{ matrix.java }}
           cache: 'maven'
       - name: Test with Maven on Windows
-        run: ./mvnw.cmd install -B -V  -D"maven.javadoc.skip"="true" -P"skipBundlePlugin,minimal-fix-latest" -D"java.util.logging.config.file"="logging.properties"  -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"
+        run: ./mvnw.cmd install -B -V  -D"maven.javadoc.skip"="true" -P"skipBundlePlugin,minimal-fix-latest" -D"java.util.logging.config.file"="./quickfixj-core/src/test/resources/logging.properties"  -D"http.keepAlive"="false" -D"maven.wagon.http.pool"="false" -D"maven.wagon.httpconnectionManager.ttlSeconds"="120"

pom.xml

@@ -68,7 +68,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<jdkLevel>1.8</jdkLevel>
-		<slf4j.version>2.0.12</slf4j.version>
+		<slf4j.version>2.0.13</slf4j.version>
 		<mockito-core.version>4.11.0</mockito-core.version>
 		<hamcrest.version>2.2</hamcrest.version>
 		<junit.jupiter.version>5.10.2</junit.jupiter.version>
@@ -79,32 +79,32 @@
 		<maven-libs-version>3.9.6</maven-libs-version>
 		<maven-plugin-api-version>3.9.6</maven-plugin-api-version>
 		<maven-resources-plugin-version>3.3.1</maven-resources-plugin-version>
-		<maven-compiler-plugin-version>3.12.1</maven-compiler-plugin-version>
-		<maven-jar-plugin-version>3.3.0</maven-jar-plugin-version>
+		<maven-compiler-plugin-version>3.13.0</maven-compiler-plugin-version>
+		<maven-jar-plugin-version>3.4.0</maven-jar-plugin-version>
 		<maven-surefire-plugin-version>3.2.5</maven-surefire-plugin-version>
 		<maven-pmd-plugin-version>3.21.2</maven-pmd-plugin-version>
-		<maven-source-plugin-version>3.3.0</maven-source-plugin-version>
+		<maven-source-plugin-version>3.3.1</maven-source-plugin-version>
 		<maven-javadoc-plugin-version>3.6.3</maven-javadoc-plugin-version>
-		<maven-shade-plugin-version>3.5.1</maven-shade-plugin-version>
-		<maven-assembly-plugin-version>3.6.0</maven-assembly-plugin-version>
+		<maven-shade-plugin-version>3.5.2</maven-shade-plugin-version>
+		<maven-assembly-plugin-version>3.7.1</maven-assembly-plugin-version>
 		<maven-bundle-plugin-version>5.1.9</maven-bundle-plugin-version>
-		<maven-gpg-plugin-version>3.1.0</maven-gpg-plugin-version>
+		<maven-gpg-plugin-version>3.2.3</maven-gpg-plugin-version>
 		<maven-deploy-plugin-version>3.1.1</maven-deploy-plugin-version>
 		<nexus-staging-maven-plugin-version>1.6.13</nexus-staging-maven-plugin-version>
 		<build-helper-maven-plugin-version>3.5.0</build-helper-maven-plugin-version>
 		<maven-shared-utils.version>3.4.2</maven-shared-utils.version>
 		<file-management.version>3.0.0</file-management.version>
-		<maven-plugin-annotations.version>3.11.0</maven-plugin-annotations.version>
+		<maven-plugin-annotations.version>3.12.0</maven-plugin-annotations.version>
 		<maven-plugin-testing-harness.version>3.3.0</maven-plugin-testing-harness.version>
 		<plantuml-maven-plugin-version>1.2</plantuml-maven-plugin-version>
 		<plantuml-version>8059</plantuml-version>
 		<xml-maven-plugin-version>1.1.0</xml-maven-plugin-version>
 		<fix-orchestra.standard.version>1.5.4</fix-orchestra.standard.version>
 		<fix-orchestra.repository.version>1.7.3</fix-orchestra.repository.version>
 		<docgen.version>1.6.8</docgen.version>
-		<jaxb.version>4.0.1</jaxb.version>
+		<jaxb.version>4.0.2</jaxb.version>
 		<apache.mina.version>2.2.3</apache.mina.version>
-		<commons.io.version>2.15.1</commons.io.version>
+		<commons.io.version>2.16.1</commons.io.version>
 		<orchestra.file>OrchestraFIXLatest.xml</orchestra.file>
 		<org.quickfixj.orchestra.tools.version>1.0.2</org.quickfixj.orchestra.tools.version>
 		<proxool.version>0.9.1</proxool.version>
@@ -224,7 +224,7 @@
 			<dependency>
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-utils</artifactId>
-				<version>4.0.0</version>
+				<version>4.0.1</version>
 			</dependency>
 			<dependency>
 				<groupId>org.codehaus.plexus</groupId>
@@ -463,11 +463,11 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-invoker-plugin</artifactId>
-					<version>3.6.0</version>
+					<version>3.6.1</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-plugin-plugin</artifactId>
-					<version>3.11.0</version>
+					<version>3.12.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-install-plugin</artifactId>

quickfixj-base/src/main/java/quickfix/FixVersions.java

@@ -30,7 +30,7 @@ public interface FixVersions {
     String BEGINSTRING_FIX44 = "FIX.4.4";
 
     /*
-     * FIX 5.0+ does not have a begin string.
+     * FIX 5.0+ does not have a BeginString.
      */
     String FIX50 = "FIX.5.0";
     String FIX50SP1 = "FIX.5.0SP1";

quickfixj-base/src/main/java/quickfix/InvalidMessage.java

@@ -19,8 +19,8 @@
 
 package quickfix;
 
-/*
- * An exception when a message is not valid according to the
+/**
+ * Thrown when a message is not valid according to the
  * basic message validation or the data dictionary.
  */
 public class InvalidMessage extends Exception {

quickfixj-base/src/main/java/quickfix/MessageUtils.java

@@ -101,6 +101,7 @@ public static Message parse(MessageFactory messageFactory, DataDictionary dataDi
      * @param messageFactory
      * @param dataDictionary
      * @param messageString
+     * @param validateChecksum
      * @return the parsed message
      * @throws InvalidMessage
      */
@@ -129,6 +130,10 @@ public static boolean isLogon(String message) {
         return isMessageType(message, MsgType.LOGON);
     }
 
+    public static boolean isLogonMsgType(String msgType) {
+        return MsgType.LOGON.equals(msgType);
+    }
+
     private static boolean isMessageType(String message, String msgType) {
         try {
             return msgType.equals(getMessageType(message));
@@ -208,10 +213,10 @@ public static String getStringField(String messageString, int tag) {
     };
 
     /**
-     * Convert an ApplVerID to a "begin string"
+     * Convert an ApplVerID to a BeginString.
      *
      * @param applVerID
-     * @return the begin string for the specified ApplVerID.
+     * @return the BeginString for the specified ApplVerID.
      * @throws QFJException if conversion fails.
      * @see ApplVerID
      */
@@ -239,10 +244,10 @@ public static String toBeginString(ApplVerID applVerID) throws QFJException {
     };
 
     /**
-     * Convert a begin string to an ApplVerID
+     * Convert a BeginString to an ApplVerID.
      *
      * @param beginString
-     * @return the ApplVerID for the specified begin string.
+     * @return the ApplVerID for the specified BeginString.
      * @throws QFJException if conversion fails.
      * @see FixVersions
      */

quickfixj-codegenerator/pom.xml

@@ -78,7 +78,7 @@
 			</plugin>
                         <plugin>
                                 <artifactId>maven-plugin-plugin</artifactId>
-                                <version>3.11.0</version>
+                                <version>3.12.0</version>
                                 <configuration>
                                     <goalPrefix>quickfixj-codegenerator</goalPrefix>
                                 </configuration>

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

@@ -162,6 +162,14 @@ public Date getCreationTime() throws IOException {
         return cache.getCreationTime();
     }
 
+    /*
+     * (non-Javadoc)
+     * @see quickfix.MessageStore#getCreationTimeCalendar()
+     */
+    public Calendar getCreationTimeCalendar() throws IOException {
+        return cache.getCreationTimeCalendar();
+    }
+
     private void initializeSequenceNumbers() throws IOException {
         sequenceNumberFile.seek(0);
         if (sequenceNumberFile.length() > 0) {

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

@@ -41,10 +41,17 @@ public class DefaultSessionSchedule implements SessionSchedule {
     private final int[] weekdayOffsets;
     protected static final Logger LOG = LoggerFactory.getLogger(DefaultSessionSchedule.class);
 
+    //Cache recent time data to reduce creation of calendar objects
+    private final ThreadLocal<Calendar> threadLocalCalendar;
+    private final ThreadLocal<TimeInterval> threadLocalRecentTimeInterval;
+
     public DefaultSessionSchedule(SessionSettings settings, SessionID sessionID) throws ConfigError,
             FieldConvertError {
+        threadLocalCalendar = ThreadLocal.withInitial(SystemTime::getUtcCalendar);
+        threadLocalRecentTimeInterval = new ThreadLocal<>();
+        isNonStopSession = settings.isSetting(sessionID, Session.SETTING_NON_STOP_SESSION)
+            && settings.getBool(sessionID, Session.SETTING_NON_STOP_SESSION);
 
-        isNonStopSession = settings.isSetting(sessionID, Session.SETTING_NON_STOP_SESSION) && settings.getBool(sessionID, Session.SETTING_NON_STOP_SESSION);
         TimeZone defaultTimeZone = getDefaultTimeZone(settings, sessionID);
         if (isNonStopSession) {
             isWeekdaySession = false;
@@ -104,7 +111,7 @@ private TimeEndPoint getTimeEndPoint(SessionSettings settings, SessionID session
     }
 
     private TimeZone getDefaultTimeZone(SessionSettings settings, SessionID sessionID)
-            throws ConfigError, FieldConvertError {
+            throws ConfigError {
         TimeZone sessionTimeZone;
         if (settings.isSetting(sessionID, Session.SETTING_TIMEZONE)) {
             String sessionTimeZoneID = settings.getString(sessionID, Session.SETTING_TIMEZONE);
@@ -300,9 +307,16 @@ public boolean isSessionTime() {
         if(isNonStopSession()) {
             return true;
         }
-        Calendar now = SystemTime.getUtcCalendar();
-        TimeInterval interval = theMostRecentIntervalBefore(now);
-        return interval.isContainingTime(now);
+        Calendar now = threadLocalCalendar.get();
+        now.setTimeInMillis(SystemTime.currentTimeMillis());
+        TimeInterval mostRecentInterval = threadLocalRecentTimeInterval.get();
+        if (mostRecentInterval != null && mostRecentInterval.isContainingTime(now)) {
+            return true;
+        }
+        mostRecentInterval = theMostRecentIntervalBefore(now);
+        boolean result = mostRecentInterval.isContainingTime(now);
+        threadLocalRecentTimeInterval.set(mostRecentInterval);
+        return result;
     }
 
     public String toString() {

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

@@ -152,6 +152,14 @@ public Date getCreationTime() throws IOException {
         return cache.getCreationTime();
     }
 
+    /* (non-Javadoc)
+     * @see quickfix.MessageStore#getCreationTimeCalendar()
+     */
+    @Override
+    public Calendar getCreationTimeCalendar() throws IOException {
+        return cache.getCreationTimeCalendar();
+    }
+
     private void initializeSequenceNumbers() throws IOException {
         senderSequenceNumberFile.seek(0);
         if (senderSequenceNumberFile.length() > 0) {

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

@@ -159,6 +159,10 @@ public Date getCreationTime() throws IOException {
         return cache.getCreationTime();
     }
 
+    public Calendar getCreationTimeCalendar() throws IOException {
+        return cache.getCreationTimeCalendar();
+    }
+
     public int getNextSenderMsgSeqNum() throws IOException {
         return cache.getNextSenderMsgSeqNum();
     }