Merge branch 'master' into dependabot/maven/org.apache.maven.shared-maven-shared-utils-3.4.2

Author: chrjohn

.github/workflows/maven.yml

@@ -58,4 +58,4 @@ jobs:
       - name: Test with Maven on Windows
         env:
           MAVEN_OPTS: "-Xms3g -Xmx5g -Djdk.xml.xpathExprGrpLimit=500 -Djdk.xml.xpathExprOpLimit=500"
-        run: mvn 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: mvn 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"

pom.xml

@@ -77,7 +77,7 @@
 		<mainClass/>
 		<maven.version>3.8.7</maven.version>
 		<maven-libs-version>3.9.6</maven-libs-version>
-		<maven-plugin-api-version>3.9.5</maven-plugin-api-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.11.0</maven-compiler-plugin-version>
 		<maven-jar-plugin-version>3.3.0</maven-jar-plugin-version>
@@ -104,7 +104,7 @@
 		<docgen.version>1.6.8</docgen.version>
 		<jaxb.version>4.0.1</jaxb.version>
 		<apache.mina.version>2.2.3</apache.mina.version>
-		<commons.io.version>2.11.0</commons.io.version>
+		<commons.io.version>2.15.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>
@@ -229,7 +229,7 @@
 			<dependency>
 				<groupId>org.codehaus.plexus</groupId>
 				<artifactId>plexus-xml</artifactId>
-				<version>4.0.0</version>
+				<version>4.0.2</version>
 			</dependency>
 			<dependency>
 				<groupId>com.sleepycat</groupId>
@@ -463,7 +463,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-invoker-plugin</artifactId>
-					<version>3.2.2</version>
+					<version>3.6.0</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-plugin-plugin</artifactId>

quickfixj-codegenerator/pom.xml

@@ -40,7 +40,7 @@
 		<dependency>
 		    <groupId>net.sf.saxon</groupId>
 		    <artifactId>Saxon-HE</artifactId>
-		    <version>12.3</version>
+		    <version>12.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.vintage</groupId>

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

@@ -46,6 +46,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import quickfix.test.util.StackTraceUtil;
 
 /**
  * QFJ-643: Unable to restart a stopped acceptor (SocketAcceptor)
@@ -326,7 +327,11 @@ public void waitForLogon() {
 
         public void waitForLogout() {
             try {
-                assertTrue("Logout timed out", logoutLatch.await(10, TimeUnit.SECONDS));
+                final boolean await = logoutLatch.await(10, TimeUnit.SECONDS);
+                if (!await) {
+                    StackTraceUtil.dumpStackTraces(log);
+                }
+                assertTrue("Logout timed out", await);
             } catch (InterruptedException e) {
                 fail(e.getMessage());
             }

quickfixj-core/src/test/java/quickfix/test/acceptance/ATApplication.java

@@ -19,6 +19,7 @@
 
 package quickfix.test.acceptance;
 
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.Assert;
 
 import quickfix.Application;
@@ -36,17 +37,19 @@
 public class ATApplication implements Application {
     private final ATMessageCracker inboundCracker = new ATMessageCracker();
     private final MessageCracker outboundCracker = new MessageCracker(new Object());
-    private boolean isLoggedOn;
+    private final AtomicBoolean isLoggedOn = new AtomicBoolean(false);
 
+    @Override
     public void onCreate(SessionID sessionID) {
         assertNoSessionLock(sessionID);
         Session.lookupSession(sessionID).reset();
     }
 
-    public synchronized void onLogon(SessionID sessionID) {
+    @Override
+    public void onLogon(SessionID sessionID) {
         assertNoSessionLock(sessionID);
-        Assert.assertFalse("Already logged on", isLoggedOn);
-        isLoggedOn = true;
+        Assert.assertFalse("Already logged on", isLoggedOn.get());
+        isLoggedOn.set(true);
     }
 
     private void assertNoSessionLock(SessionID sessionID) {
@@ -56,17 +59,20 @@ private void assertNoSessionLock(SessionID sessionID) {
                 Thread.holdsLock(session));
     }
 
-    public synchronized void onLogout(SessionID sessionID) {
+    @Override
+    public void onLogout(SessionID sessionID) {
         assertNoSessionLock(sessionID);
         inboundCracker.reset();
-        Assert.assertTrue("No logged on when logout is received", isLoggedOn);
-        isLoggedOn = false;
+        Assert.assertTrue("Not logged on when logout is received", isLoggedOn.get());
+        isLoggedOn.set(false);
     }
 
+    @Override
     public void toAdmin(Message message, SessionID sessionID) {
         assertNoSessionLock(sessionID);
     }
 
+    @Override
     public void toApp(Message message, SessionID sessionID) throws DoNotSend {
         assertNoSessionLock(sessionID);
         try {
@@ -78,11 +84,13 @@ public void toApp(Message message, SessionID sessionID) throws DoNotSend {
         }
     }
 
+    @Override
     public void fromAdmin(Message message, SessionID sessionID) throws FieldNotFound,
             IncorrectDataFormat, IncorrectTagValue, RejectLogon {
         assertNoSessionLock(sessionID);
     }
 
+    @Override
     public void fromApp(Message message, SessionID sessionID) throws FieldNotFound,
             IncorrectDataFormat, IncorrectTagValue, UnsupportedMessageType {
         assertNoSessionLock(sessionID);

quickfixj-core/src/test/java/quickfix/test/acceptance/ATServer.java

@@ -29,7 +29,6 @@
 import quickfix.FixVersions;
 import quickfix.MemoryStoreFactory;
 import quickfix.MessageStoreFactory;
-import quickfix.RuntimeError;
 import quickfix.SLF4JLogFactory;
 import quickfix.SessionID;
 import quickfix.SessionSettings;
@@ -43,7 +42,6 @@
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
-import java.net.BindException;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -116,6 +114,7 @@ public void run() {
             defaults.put("SocketTcpNoDelay", "Y");
             defaults.put("StartTime", "00:00:00");
             defaults.put("EndTime", "00:00:00");
+            defaults.put("NonStopSession", "Y");
             defaults.put("SenderCompID", "ISLD");
             defaults.put("TargetCompID", "TW");
             defaults.put("JdbcDriver", "com.mysql.jdbc.Driver");
@@ -189,19 +188,12 @@ public void run() {
             assertSessionIds();
 
             acceptor.setIoFilterChainBuilder(ioFilterChainBuilder);
-            try {
-                acceptor.start();
-            } catch (RuntimeError e) {
-                if (e.getCause() instanceof BindException) {
-                    log.warn("Acceptor port {} is still bound! Waiting 60 seconds and trying again...", port);
-                    Thread.sleep(60000);
-                    acceptor.start();
-                }
-            }
+            acceptor.start();
 
             assertSessionIds();
 
             initializationLatch.countDown();
+            
             CountDownLatch shutdownLatch = new CountDownLatch(1);
             try {
                 // running all acceptance tests should hopefully not take longer than 30 mins

quickfixj-core/src/test/java/quickfix/test/acceptance/AcceptanceTestSuite.java

@@ -38,7 +38,7 @@ public class AcceptanceTestSuite extends TestSuite {
     private static final String acceptanceTestBaseDir = AcceptanceTestSuite.class.getClassLoader().getResource(acceptanceTestResourcePath).getPath();
 
     private static int transportType = ProtocolFactory.SOCKET;
-    private static int port = 9887;
+    private static int port = AvailablePortFinder.getNextAvailable();
 
     private final boolean skipSlowTests;
     private final boolean multithreaded;
@@ -111,9 +111,7 @@ protected void printDatabasePoolingStatistics() {
         private List<TestStep> load(String filename) throws IOException {
             ArrayList<TestStep> steps = new ArrayList<>();
             log.info("load test: " + filename);
-            BufferedReader in = null;
-            try {
-                in = new BufferedReader(new InputStreamReader(new FileInputStream(filename), "ISO8859_1"));
+            try (BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(filename), "ISO8859_1"))) {
                 String line = in.readLine();
                 while (line != null) {
                     if (line.matches("^[ \t]*#.*")) {
@@ -131,14 +129,6 @@ private List<TestStep> load(String filename) throws IOException {
                     }
                     line = in.readLine();
                 }
-            } finally {
-                if (in != null) {
-                    try {
-                        in.close();
-                    } catch (IOException e1) {
-                        e1.printStackTrace();
-                    }
-                }
             }
             return steps;
         }
@@ -220,7 +210,6 @@ private boolean isTestSkipped(File file) {
     private static final class AcceptanceTestServerSetUp extends TestSetup {
         private final boolean threaded;
         private final Map<Object, Object> overridenProperties;
-//        private Thread serverThread;
         private final ExecutorService executor = Executors.newSingleThreadExecutor();
 
         private ATServer server;
@@ -249,7 +238,6 @@ protected void tearDown() throws Exception {
 
     public static Test suite() {
         transportType = ProtocolFactory.getTransportType(System.getProperty(ATEST_TRANSPORT_KEY, ProtocolFactory.getTypeString(ProtocolFactory.SOCKET)));
-        port = AvailablePortFinder.getNextAvailable(port);
         TestSuite acceptanceTests = new TestSuite(AcceptanceTestSuite.class.getSimpleName());
         // default server
         acceptanceTests.addTest(new AcceptanceTestServerSetUp(new AcceptanceTestSuite("server", false)));

quickfixj-core/src/test/java/quickfix/test/acceptance/TestConnection.java

@@ -44,26 +44,27 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 import quickfix.mina.SessionConnector;
 
 public class TestConnection {
-    private static final HashMap<String, IoConnector> connectors = new HashMap<>();
+    private static final Map<Integer, IoConnector> connectors = new HashMap<>();
+    private final ConcurrentMap<Integer, TestIoHandler> ioHandlers = new ConcurrentHashMap<>();
     private final Logger log = LoggerFactory.getLogger(getClass());
-    private final HashMap<Integer, TestIoHandler> ioHandlers = new HashMap<>();
 
     public void sendMessage(int clientId, String message) throws IOException {
         TestIoHandler handler = getIoHandler(clientId);
         handler.getSession().write(message);
     }
 
     private TestIoHandler getIoHandler(int clientId) {
-        synchronized (ioHandlers) {
-            return ioHandlers.get(clientId);
-        }
+        return ioHandlers.get(clientId);
     }
 
     public void tearDown() {
@@ -87,7 +88,7 @@ public void waitForClientDisconnect(int clientId) throws IOException, Interrupte
 
     public void connect(int clientId, int transportType, int port)
             throws IOException {
-        IoConnector connector = connectors.get(Integer.toString(clientId));
+        IoConnector connector = connectors.get(clientId);
         if (connector != null) {
             SessionConnector.closeManagedSessionsAndDispose(connector, true, log);
         }
@@ -102,16 +103,16 @@ public void connect(int clientId, int transportType, int port)
         } else {
             throw new RuntimeException("Unsupported transport type: " + transportType);
         }
-        connectors.put(Integer.toString(clientId), connector);
+        connectors.put(clientId, connector);
 
         TestIoHandler testIoHandler = new TestIoHandler();
-        synchronized (ioHandlers) {
-            ioHandlers.put(clientId, testIoHandler);
-            connector.setHandler(testIoHandler);
-            ConnectFuture future = connector.connect(address);
-            future.awaitUninterruptibly(5000L);
-            Assert.assertTrue("connection to server failed", future.isConnected());
-        }
+        ioHandlers.put(clientId, testIoHandler);
+        connector.setHandler(testIoHandler);
+        ConnectFuture future = connector.connect(address);
+        future.awaitUninterruptibly(5000L);
+        Throwable exception = future.getException();
+        String failedMessage = "connection to server failed: " + (exception != null ? exception.getMessage() : "");
+        Assert.assertTrue(failedMessage, future.isConnected());
     }
 
     private class TestIoHandler extends IoHandlerAdapter {
@@ -144,7 +145,7 @@ public void messageReceived(IoSession session, Object message) throws Exception
 
         public IoSession getSession() {
             try {
-                boolean await = sessionCreatedLatch.await(70, TimeUnit.SECONDS); // 10 seconds more than retry time in ATServer.run()
+                boolean await = sessionCreatedLatch.await(5, TimeUnit.SECONDS);
                 if (!await) {
                     log.error("sessionCreatedLatch timed out. Dumping threads...");
                     StackTraceUtil.dumpStackTraces(log);
@@ -179,7 +180,10 @@ public String getNextMessage(long timeout) throws InterruptedException {
         }
 
         public void waitForDisconnect() throws InterruptedException {
-            if (!disconnectLatch.await(500000L, TimeUnit.MILLISECONDS)) {
+            /*  Please note that this timeout should not be too little because
+                there is at least one acceptance test (6_SendTestRequest) expecting
+                the connection to timeout after a TestRequest. */
+            if (!disconnectLatch.await(20000, TimeUnit.MILLISECONDS)) {
                 Assert.fail("client not disconnected");
             }
         }

quickfixj-core/src/test/resources/quickfix/test/acceptance/definitions/validateChecksum/fix50/QFJ973-ProcessMessageWithInvalidChecksum.def

@@ -10,5 +10,11 @@ I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME>
56=ISLD
10=256

 I8=FIXT.1.1
35=0
34=3
49=TW
52=<TIME>
56=ISLD

 # Incorrect checksum
 I8=FIXT.1.1
35=D
34=4
49=TW
52=<TIME>
56=ISLD
60=<TIME>
11=ID
21=3
40=1
54=1
55=INTC
10=256

+E8=FIXT.1.1
35=D
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
60=00000000-00:00:00.000
11=ID
21=3
40=1
54=1
55=INTC
10=0

 # correct checksum
 I8=FIXT.1.1
35=0
34=5
49=TW
52=<TIME>
56=ISLD

+
+# logout message and response
+I8=FIXT.1.1
35=5
34=6
49=TW
52=<TIME>
56=ISLD

+E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

+eDISCONNECT