Wrap ConnectionException and add socketAddress to details (#451)

* Wrap connection exception and add socketAddress to details #450
* add test assertions, add getter for socketAddress
* Update and rename ConnectionException.java to ConnectException.java
* Moved common code out of if-block

Co-authored-by: Christoph John <christoph.john@macd.com>

Author: stasal

quickfixj-core/src/main/java/quickfix/mina/initiator/ConnectException.java

@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) quickfixengine.org  All rights reserved.
+ *
+ * This file is part of the QuickFIX FIX Engine
+ *
+ * This file may be distributed under the terms of the quickfixengine.org
+ * license as defined by quickfixengine.org and appearing in the file
+ * LICENSE included in the packaging of this file.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING
+ * THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE.
+ *
+ * See http://www.quickfixengine.org/LICENSE for licensing information.
+ *
+ * Contact ask@quickfixengine.org if any conditions of this licensing
+ * are not clear to you.
+ ******************************************************************************/
+
+package quickfix.mina.initiator;
+
+import java.io.IOException;
+import java.net.SocketAddress;
+
+public class ConnectException extends IOException {
+
+    private final SocketAddress socketAddress;
+
+    public ConnectException(SocketAddress socketAddress) {
+        this.socketAddress = socketAddress;
+    }
+
+    public ConnectException(String message, Throwable cause, SocketAddress socketAddress) {
+        super(message, cause);
+        this.socketAddress = socketAddress;
+    }
+
+    public ConnectException(String message, SocketAddress socketAddress) {
+        super(message);
+        this.socketAddress = socketAddress;
+    }
+
+    public ConnectException(Throwable cause, SocketAddress socketAddress) {
+        super(cause.getMessage(), cause);
+        this.socketAddress = socketAddress;
+    }
+
+    public SocketAddress getSocketAddress() {
+        return socketAddress;
+    }
+}

quickfixj-core/src/main/java/quickfix/mina/initiator/IoSessionInitiator.java

@@ -261,13 +261,13 @@ private void handleConnectException(Throwable e) {
                 e = e.getCause();
             }
             final String nextRetryMsg = " (Next retry in " + computeNextRetryConnectDelay() + " milliseconds)";
+            ConnectException wrappedException = new ConnectException(e, socketAddress);
             if (e instanceof IOException) {
                 fixSession.getLog().onErrorEvent(e.getClass().getName() + " during connection to " + socketAddress + ": " + e + nextRetryMsg);
-                fixSession.getStateListener().onConnectException(fixSession.getSessionID(), (IOException) e);
             } else {
                 LogUtil.logThrowable(fixSession.getLog(), "Exception during connection to " + socketAddress + nextRetryMsg, e);
-                fixSession.getStateListener().onConnectException(fixSession.getSessionID(), new Exception(e));
             }
+            fixSession.getStateListener().onConnectException(fixSession.getSessionID(), wrappedException);
             connectFuture = null;
         }
 

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

@@ -31,6 +31,7 @@
 import quickfix.field.MsgType;
 import quickfix.mina.ProtocolFactory;
 import quickfix.mina.SingleThreadedEventHandlingStrategy;
+import quickfix.mina.initiator.ConnectException;
 import quickfix.mina.ssl.SSLSupport;
 import quickfix.test.acceptance.ATServer;
 import quickfix.test.util.StackTraceUtil;
@@ -41,15 +42,18 @@
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
+import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.net.SocketAddress;
 import java.util.HashMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
 
 import static junit.framework.TestCase.assertNotNull;
@@ -233,22 +237,25 @@ public void testDoubleStartOfInitiator() throws Exception {
     }
 
     @Test
-    public void testInitiatorConnectionException() throws Exception {
+    public void testInitiatorConnectException() throws Exception {
         // use a free port to make sure nothing is listening
         int freePort = AvailablePortFinder.getNextAvailable();
         Initiator initiator = null;
+        String host = "localhost";
         AtomicBoolean onConnectExceptionWasCalled = new AtomicBoolean(false);
+        AtomicReference<SocketAddress> socketAddress = new AtomicReference<>(null);
         try {
             SessionID clientSessionID = new SessionID(FixVersions.BEGINSTRING_FIX42, "TW", "ISLD");
             SessionSettings settings = getClientSessionSettings(clientSessionID, freePort);
             settings.setString(clientSessionID, "ReconnectInterval", "1");
-            settings.setString(clientSessionID, "SocketConnectHost", "localhost");
-            settings.setString(clientSessionID, "SocketConnectProtocol", ProtocolFactory.getTypeString(ProtocolFactory.VM_PIPE));
+            settings.setString(clientSessionID, "SocketConnectHost", host);
+            settings.setString(clientSessionID, "SocketConnectProtocol", ProtocolFactory.getTypeString(ProtocolFactory.SOCKET));
 
             SessionStateListener sessionStateListener = new SessionStateListener() {
                 @Override
                 public void onConnectException(SessionID sessionID, Exception e) {
                     onConnectExceptionWasCalled.set(true);
+                    socketAddress.set(((ConnectException) e).getSocketAddress());
                 }
             };
             // add state listener on creation of Session
@@ -261,12 +268,16 @@ public void onCreate(SessionID sessionId) {
             DefaultSessionFactory sessionFactory = new DefaultSessionFactory(clientApplication, new MemoryStoreFactory(), new ScreenLogFactory(settings), new DefaultMessageFactory());
             initiator = new SocketInitiator(sessionFactory, settings, 10000);
             initiator.start();
-            Thread.sleep(3000); // make sure we try to connect
+            Thread.sleep(5000); // make sure we try to connect
         } finally {
             if (initiator != null) {
                 initiator.stop(true);
             }
             assertTrue(onConnectExceptionWasCalled.get());
+            InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress.get();
+            assertNotNull(inetSocketAddress);
+            assertEquals(host, inetSocketAddress.getHostName());
+            assertEquals(freePort, inetSocketAddress.getPort());
         }
     }