Removing unused quickfix.mina.ssl.SSLFilter

Author: the-thing

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

@@ -23,6 +23,7 @@
 import org.apache.mina.core.buffer.SimpleBufferAllocator;
 import org.apache.mina.core.service.IoAcceptor;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.filter.ssl.SslFilter;
 import quickfix.Acceptor;
 import quickfix.Application;
 import quickfix.ConfigError;
@@ -45,7 +46,6 @@
 import quickfix.mina.message.FIXProtocolCodecFactory;
 import quickfix.mina.ssl.SSLConfig;
 import quickfix.mina.ssl.SSLContextFactory;
-import quickfix.mina.ssl.SSLFilter;
 import quickfix.mina.ssl.SSLSupport;
 
 import javax.net.ssl.SSLContext;
@@ -132,7 +132,7 @@ private void installSSL(AcceptorSocketDescriptor descriptor,
         log.info("Installing SSL filter for {}", descriptor.getAddress());
         SSLConfig sslConfig = descriptor.getSslConfig();
         SSLContext sslContext = SSLContextFactory.getInstance(sslConfig);
-        SSLFilter sslFilter = new SSLFilter(sslContext);
+        SslFilter sslFilter = new SslFilter(sslContext);
         sslFilter.setNeedClientAuth(sslConfig.isNeedClientAuth());
         sslFilter.setEnabledCipherSuites(sslConfig.getEnabledCipherSuites() != null ? sslConfig.getEnabledCipherSuites()
                 : SSLSupport.getDefaultCipherSuites(sslContext));

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

@@ -22,16 +22,12 @@
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.proxy.AbstractProxyIoHandler;
 
-import quickfix.mina.ssl.SSLFilter;
-
 class InitiatorProxyIoHandler extends AbstractProxyIoHandler {
     private final InitiatorIoHandler initiatorIoHandler;
-    private final SSLFilter sslFilter;
 
-    InitiatorProxyIoHandler(InitiatorIoHandler initiatorIoHandler, SSLFilter sslFilter) {
+    InitiatorProxyIoHandler(InitiatorIoHandler initiatorIoHandler) {
         super();
         this.initiatorIoHandler = initiatorIoHandler;
-        this.sslFilter = sslFilter;
     }
 
     @Override
@@ -60,9 +56,6 @@ public void exceptionCaught(IoSession ioSession, Throwable cause) throws Excepti
     }
 
     @Override
-    public void proxySessionOpened(IoSession ioSession) throws Exception {
-//        if (this.sslFilter != null) {
-//            this.sslFilter.initiateHandshake(ioSession);
-//        }
+    public void proxySessionOpened(IoSession ioSession) {
     }
 }

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

@@ -24,6 +24,7 @@
 import org.apache.mina.core.service.IoConnector;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.codec.ProtocolCodecFilter;
+import org.apache.mina.filter.ssl.SslFilter;
 import org.apache.mina.proxy.ProxyConnector;
 import org.apache.mina.transport.socket.SocketConnector;
 import quickfix.ConfigError;
@@ -40,7 +41,6 @@
 import quickfix.mina.message.FIXProtocolCodecFactory;
 import quickfix.mina.ssl.SSLConfig;
 import quickfix.mina.ssl.SSLContextFactory;
-import quickfix.mina.ssl.SSLFilter;
 import quickfix.mina.ssl.SSLSupport;
 
 import javax.net.ssl.SSLContext;
@@ -153,7 +153,7 @@ private void setupIoConnector() throws ConfigError, GeneralSecurityException {
 
             boolean hasProxy = proxyType != null && proxyPort > 0 && socketAddresses[nextSocketAddressIndex] instanceof InetSocketAddress;
 
-            SSLFilter sslFilter = null;
+            SslFilter sslFilter = null;
             if (sslEnabled) {
                 sslFilter = installSslFilter(ioFilterChainBuilder);
             }
@@ -175,9 +175,7 @@ private void setupIoConnector() throws ConfigError, GeneralSecurityException {
                 );
 
                 proxyConnector.setHandler(new InitiatorProxyIoHandler(
-                        new InitiatorIoHandler(fixSession, sessionSettings, networkingOptions, eventHandlingStrategy),
-                        sslFilter
-                ));
+                        new InitiatorIoHandler(fixSession, sessionSettings, networkingOptions, eventHandlingStrategy)));
 
                 newConnector = proxyConnector;
             }
@@ -188,10 +186,10 @@ private void setupIoConnector() throws ConfigError, GeneralSecurityException {
             ioConnector = newConnector;
         }
 
-        private SSLFilter installSslFilter(CompositeIoFilterChainBuilder ioFilterChainBuilder)
+        private SslFilter installSslFilter(CompositeIoFilterChainBuilder ioFilterChainBuilder)
                 throws GeneralSecurityException {
             final SSLContext sslContext = SSLContextFactory.getInstance(sslConfig);
-            final SSLFilter sslFilter = new SSLFilter(sslContext);
+            final SslFilter sslFilter = new SslFilter(sslContext);
             sslFilter.setEnabledCipherSuites(sslConfig.getEnabledCipherSuites() != null ? sslConfig.getEnabledCipherSuites()
                     : SSLSupport.getDefaultCipherSuites(sslContext));
             sslFilter.setEnabledProtocols(sslConfig.getEnabledProtocols() != null ? sslConfig.getEnabledProtocols()

quickfixj-core/src/main/java/quickfix/mina/ssl/SSLFilter.java

@@ -22,6 +22,7 @@
 import org.apache.mina.core.filterchain.IoFilterAdapter;
 import org.apache.mina.core.filterchain.IoFilterChain;
 import org.apache.mina.core.session.IoSession;
+import org.apache.mina.filter.ssl.SslFilter;
 import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -589,12 +590,12 @@ private SSLSession findSSLSession(Session session) throws Exception {
                 return null;
 
             IoFilterChain filterChain = ioSession.getFilterChain();
-            SSLFilter sslFilter = (SSLFilter) filterChain.get(SSLSupport.FILTER_NAME);
+            SslFilter sslFilter = (SslFilter) filterChain.get(SSLSupport.FILTER_NAME);
 
             if (sslFilter == null)
                 return null;
 
-            return (SSLSession) ioSession.getAttribute(SSLFilter.SSL_SECURED);
+            return (SSLSession) ioSession.getAttribute(SslFilter.SSL_SECURED);
         }
 
         private Session findSession(SessionID sessionID) {