Most deprecated API calls fixed.

Author: Guido Medina

quickfixj-core/src/main/java/quickfix/mina/AbstractIoHandler.java

@@ -79,7 +79,7 @@ public void exceptionCaught(IoSession ioSession, Throwable cause) throws Excepti
                 quickFixSession.disconnect(reason, true);
             } else {
                 log.error(reason, cause);
-                ioSession.close(true);
+                ioSession.closeNow();
             }
         } else {
             log.error(reason, cause);
@@ -100,9 +100,9 @@ public void sessionClosed(IoSession ioSession) throws Exception {
                 eventHandlingStrategy.onMessage(quickFixSession, EventHandlingStrategy.END_OF_STREAM );
                 ioSession.removeAttribute(SessionConnector.QF_SESSION);
             }
-            ioSession.close(true);
+            ioSession.closeNow();
         } catch (Exception e) {
-            ioSession.close(true);
+            ioSession.closeNow();
             throw e;
         }
     }
@@ -120,14 +120,14 @@ public void messageReceived(IoSession ioSession, Object message) throws Exceptio
             } catch (InvalidMessage e) {
                 if (MsgType.LOGON.equals(MessageUtils.getMessageType(messageString))) {
                     log.error("Invalid LOGON message, disconnecting: " + e.getMessage());
-                    ioSession.close(true);
+                    ioSession.closeNow();
                 } else {
                     log.error("Invalid message: " + e.getMessage());
                 }
             }
         } else {
             log.error("Disconnecting; received message for unknown session: " + messageString);
-            ioSession.close(true);
+            ioSession.closeNow();
         }
     }
 

quickfixj-core/src/main/java/quickfix/mina/IoSessionResponder.java

@@ -84,7 +84,7 @@ public void disconnect() {
         // threading model and calling join will prevent the
         // close event from being processed by this thread (if
         // this thread is the MINA IO processor thread.
-        ioSession.close(true);
+        ioSession.closeNow();
     }
 
     private void waitForScheduleMessagesToBeWritten() {

quickfixj-core/src/main/java/quickfix/mina/acceptor/AcceptorIoHandler.java

@@ -72,7 +72,7 @@ protected void processMessage(IoSession protocolSession, Message message) throws
                         // Session is already bound to another connection
                         sessionLog
                                 .onErrorEvent("Multiple logons/connections for this session are not allowed");
-                        protocolSession.close(true);
+                        protocolSession.closeNow();
                         return;
                     }
                     sessionLog.onEvent("Accepting session " + qfSession.getSessionID() + " from "
@@ -105,7 +105,7 @@ protected void processMessage(IoSession protocolSession, Message message) throws
                 }
             } else {
                 log.warn("Ignoring non-logon message before session establishment: " + message);
-                protocolSession.close(true);
+                protocolSession.closeNow();
                 return;
             }
         }

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

@@ -26,7 +26,7 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.logicalcobwebs.proxool.ProxoolException;
 import org.logicalcobwebs.proxool.ProxoolFacade;

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

@@ -19,7 +19,7 @@
 
 package quickfix;
 
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
 import static quickfix.FixVersions.*;
 
 import java.util.HashMap;

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

@@ -19,8 +19,8 @@
 
 package quickfix;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
+import org.junit.Assert;
 import quickfix.field.BeginString;
 import quickfix.field.LegSymbol;
 import quickfix.field.OrderID;

quickfixj-core/src/test/java/quickfix/mina/IoSessionResponderTest.java

@@ -100,13 +100,13 @@ public void testSynchronousSendWithJoinTimeout() throws Exception {
     public void testDisconnect() throws Exception {
         IoSession mockProtocolSession = mock(IoSession.class);
         stub(mockProtocolSession.getScheduledWriteMessages()).toReturn(0);
-        stub(mockProtocolSession.close(true)).toReturn(null);
+        stub(mockProtocolSession.closeNow()).toReturn(null);
 
         IoSessionResponder responder = new IoSessionResponder(mockProtocolSession, false, 0, 0);
         responder.disconnect();
 
         verify(mockProtocolSession).getScheduledWriteMessages();
-        verify(mockProtocolSession).close(true);
+        verify(mockProtocolSession).closeNow();
 
         verifyNoMoreInteractions(mockProtocolSession);
 }

quickfixj-core/src/test/java/quickfix/mina/ssl/X509TrustManagerWrapperTest.java

@@ -6,12 +6,11 @@
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import junit.framework.Assert;
-
 public class X509TrustManagerWrapperTest {
 
     private X509TrustManagerWrapper underTest;

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

@@ -21,7 +21,7 @@
 
 import java.io.IOException;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import quickfix.Application;
 import quickfix.DoNotSend;

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

@@ -33,10 +33,10 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import junit.framework.Assert;
 import junit.framework.TestSuite;
 
 import org.apache.mina.core.filterchain.IoFilterChainBuilder;
+import org.junit.Assert;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;