Skip to content

Commit 82c6924

Browse files
chrjohnchrjohn
authored
Merge branch 'master' into first_field_in_group_as_delimiter
2 parents 294d0db + 8bfaf28 commit 82c6924

File tree

7 files changed

+30
-70
lines changed

7 files changed

+30
-70
lines changed

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<slf4j.version>2.0.16</slf4j.version>
6666
<mockito-core.version>4.11.0</mockito-core.version>
6767
<hamcrest.version>3.0</hamcrest.version>
68-
<junit.jupiter.version>5.11.3</junit.jupiter.version>
68+
<junit.jupiter.version>5.11.4</junit.jupiter.version>
6969
<maven.compiler.source>8</maven.compiler.source>
7070
<maven.compiler.target>8</maven.compiler.target>
7171
<mainClass/>
@@ -78,7 +78,7 @@
7878
<maven-surefire-plugin-version>3.5.2</maven-surefire-plugin-version>
7979
<maven-pmd-plugin-version>3.26.0</maven-pmd-plugin-version>
8080
<maven-source-plugin-version>3.3.1</maven-source-plugin-version>
81-
<maven-javadoc-plugin-version>3.11.1</maven-javadoc-plugin-version>
81+
<maven-javadoc-plugin-version>3.11.2</maven-javadoc-plugin-version>
8282
<maven-shade-plugin-version>3.6.0</maven-shade-plugin-version>
8383
<maven-assembly-plugin-version>3.7.1</maven-assembly-plugin-version>
8484
<maven-bundle-plugin-version>5.1.9</maven-bundle-plugin-version>
@@ -97,7 +97,7 @@
9797
<fix-orchestra.repository.version>1.7.3</fix-orchestra.repository.version>
9898
<docgen.version>1.6.8</docgen.version>
9999
<jaxb.version>4.0.2</jaxb.version>
100-
<apache.mina.version>2.2.3</apache.mina.version>
100+
<apache.mina.version>2.2.4</apache.mina.version>
101101
<commons.io.version>2.18.0</commons.io.version>
102102
<orchestra.file>OrchestraFIXLatest.xml</orchestra.file>
103103
<org.quickfixj.orchestra.tools.version>1.0.2</org.quickfixj.orchestra.tools.version>
@@ -458,7 +458,7 @@
458458
</plugin>
459459
<plugin>
460460
<artifactId>maven-invoker-plugin</artifactId>
461-
<version>3.8.1</version>
461+
<version>3.9.0</version>
462462
</plugin>
463463
<plugin>
464464
<artifactId>maven-plugin-plugin</artifactId>

‎quickfixj-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<dependency>
121121
<groupId>io.netty</groupId>
122122
<artifactId>netty-example</artifactId>
123-
<version>4.1.115.Final</version>
123+
<version>4.1.116.Final</version>
124124
<scope>test</scope>
125125
</dependency>
126126
<dependency>

‎quickfixj-core/src/main/java/quickfix/CompositeLog.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ public void clear() {
4040
for (Log log : logs) {
4141
try {
4242
log.clear();
43-
} catch (Throwable e) {
43+
} catch (Exception e) {
4444
handleError(e);
4545
}
4646
}
4747
}
4848

49-
private void handleError(Throwable e) {
49+
private void handleError(Exception e) {
5050
if (rethrowException) {
5151
throw new RuntimeException(e);
5252
}
@@ -57,7 +57,7 @@ public void onIncoming(String message) {
5757
for (Log log : logs) {
5858
try {
5959
log.onIncoming(message);
60-
} catch (Throwable e) {
60+
} catch (Exception e) {
6161
handleError(e);
6262
}
6363
}
@@ -67,7 +67,7 @@ public void onOutgoing(String message) {
6767
for (Log log : logs) {
6868
try {
6969
log.onOutgoing(message);
70-
} catch (Throwable e) {
70+
} catch (Exception e) {
7171
defaultLog.error(e.getMessage() + ", continuing", e);
7272
}
7373
}
@@ -77,7 +77,7 @@ public void onEvent(String text) {
7777
for (Log log : logs) {
7878
try {
7979
log.onEvent(text);
80-
} catch (Throwable e) {
80+
} catch (Exception e) {
8181
handleError(e);
8282
}
8383
}
@@ -87,7 +87,7 @@ public void onErrorEvent(String text) {
8787
for (Log log : logs) {
8888
try {
8989
log.onErrorEvent(text);
90-
} catch (Throwable e) {
90+
} catch (Exception e) {
9191
handleError(e);
9292
}
9393
}

‎quickfixj-core/src/main/java/quickfix/mina/CustomSslFilter.java‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import quickfix.SessionID;
4141
import quickfix.SessionSettings;
4242
import quickfix.mina.CompositeIoFilterChainBuilder;
43-
import quickfix.mina.CustomSslFilter;
4443
import quickfix.mina.EventHandlingStrategy;
4544
import quickfix.mina.NetworkingOptions;
4645
import quickfix.mina.ProtocolFactory;
@@ -135,7 +134,7 @@ private void installSSL(AcceptorSocketDescriptor descriptor,
135134
log.info("Installing SSL filter for {}", descriptor.getAddress());
136135
SSLConfig sslConfig = descriptor.getSslConfig();
137136
SSLContext sslContext = SSLContextFactory.getInstance(sslConfig);
138-
SslFilter sslFilter = new CustomSslFilter(sslContext);
137+
SslFilter sslFilter = new SslFilter(sslContext);
139138
sslFilter.setNeedClientAuth(sslConfig.isNeedClientAuth());
140139
sslFilter.setEnabledCipherSuites(sslConfig.getEnabledCipherSuites() != null ? sslConfig.getEnabledCipherSuites()
141140
: SSLSupport.getDefaultCipherSuites(sslContext));

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import quickfix.SessionSettings;
3535
import quickfix.SystemTime;
3636
import quickfix.mina.CompositeIoFilterChainBuilder;
37-
import quickfix.mina.CustomSslFilter;
3837
import quickfix.mina.EventHandlingStrategy;
3938
import quickfix.mina.NetworkingOptions;
4039
import quickfix.mina.ProtocolFactory;
@@ -159,9 +158,8 @@ private void setupIoConnector() throws ConfigError, GeneralSecurityException {
159158

160159
boolean hasProxy = proxyType != null && proxyPort > 0 && socketAddresses[nextSocketAddressIndex] instanceof InetSocketAddress;
161160

162-
SslFilter sslFilter = null;
163161
if (sslEnabled) {
164-
sslFilter = installSslFilter(ioFilterChainBuilder);
162+
installSslFilter(ioFilterChainBuilder);
165163
}
166164

167165
ioFilterChainBuilder.addLast(FIXProtocolCodecFactory.FILTER_NAME, new ProtocolCodecFilter(new FIXProtocolCodecFactory()));
@@ -192,17 +190,16 @@ private void setupIoConnector() throws ConfigError, GeneralSecurityException {
192190
ioConnector = newConnector;
193191
}
194192

195-
private SslFilter installSslFilter(CompositeIoFilterChainBuilder ioFilterChainBuilder)
193+
private void installSslFilter(CompositeIoFilterChainBuilder ioFilterChainBuilder)
196194
throws GeneralSecurityException {
197195
final SSLContext sslContext = SSLContextFactory.getInstance(sslConfig);
198-
final SslFilter sslFilter = new CustomSslFilter(sslContext, false);
196+
final SslFilter sslFilter = new SslFilter(sslContext, false);
199197
sslFilter.setEnabledCipherSuites(sslConfig.getEnabledCipherSuites() != null ? sslConfig.getEnabledCipherSuites()
200198
: SSLSupport.getDefaultCipherSuites(sslContext));
201199
sslFilter.setEnabledProtocols(sslConfig.getEnabledProtocols() != null ? sslConfig.getEnabledProtocols()
202200
: SSLSupport.getSupportedProtocols(sslContext));
203201
sslFilter.setEndpointIdentificationAlgorithm(sslConfig.getEndpointIdentificationAlgorithm());
204202
ioFilterChainBuilder.addLast(SSLSupport.FILTER_NAME, sslFilter);
205-
return sslFilter;
206203
}
207204

208205
@Override

‎quickfixj-core/src/test/java/quickfix/mina/ssl/SecureSocketTest.java‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919

2020
package quickfix.mina.ssl;
2121

22-
import junit.framework.TestCase;
2322
import org.apache.mina.core.filterchain.IoFilterAdapter;
2423
import org.apache.mina.core.session.IoSession;
24+
import org.junit.Before;
25+
import org.junit.Test;
2526
import org.slf4j.Logger;
2627
import org.slf4j.LoggerFactory;
2728
import quickfix.ApplicationAdapter;
2829
import quickfix.ConfigError;
2930
import quickfix.DefaultMessageFactory;
3031
import quickfix.FixVersions;
31-
import quickfix.Initiator;
3232
import quickfix.MemoryStoreFactory;
3333
import quickfix.Session;
3434
import quickfix.SessionID;
@@ -43,14 +43,20 @@
4343
import java.util.concurrent.CountDownLatch;
4444
import java.util.concurrent.TimeUnit;
4545

46-
public class SecureSocketTest extends TestCase {
46+
import static org.junit.Assert.assertNotNull;
47+
import static org.junit.Assert.assertTrue;
48+
49+
public class SecureSocketTest {
50+
4751
private final Logger log = LoggerFactory.getLogger(getClass());
4852
private final int transportProtocol = ProtocolFactory.SOCKET;
4953

50-
protected void setUp() throws Exception {
54+
@Before
55+
public void setUp() throws Exception {
5156
SystemTime.setTimeSource(null);
5257
}
5358

59+
@Test
5460
public void testLogonWithBadCertificate() throws Exception {
5561
ServerThread serverThread = new ServerThread("nonexistent", "pwd");
5662
try {
@@ -85,10 +91,12 @@ public void exceptionCaught(NextFilter nextFilter, IoSession session, Throwable
8591
}
8692
}
8793

94+
@Test
8895
public void testLogonWithDefaultCertificate() throws Exception {
8996
doLogonTest(null, null);
9097
}
9198

99+
@Test
92100
public void testLogonWithCustomCertificate() throws Exception {
93101
doLogonTest("test.keystore", "quickfixjtestpw");
94102
}
@@ -103,6 +111,7 @@ public void testLogonWithCustomCertificate() throws Exception {
103111
* so that it's not cached by another test so that there are no false failures.
104112
* The test-client.keystore key store is just a copy of test.keystore under a different name.
105113
*/
114+
@Test
106115
public void testLogonWithBadCertificateOnInitiatorSide() throws Exception {
107116
SessionID clientSessionID = new SessionID(FixVersions.BEGINSTRING_FIX42, "TW", "ISLD");
108117
SessionSettings settings = getClientSessionSettings(clientSessionID);
@@ -177,14 +186,8 @@ private void assertLoggedOn(ClientApplication clientApplication, Session clientS
177186
}
178187

179188
private class ClientApplication extends ApplicationAdapter {
180-
public CountDownLatch logonLatch;
181-
private Initiator initiator;
182-
private boolean stopAfterLogon;
183189

184-
//public void stopAfterLogon(Initiator initiator) {
185-
// this.initiator = initiator;
186-
// this.stopAfterLogon = true;
187-
//}
190+
public CountDownLatch logonLatch;
188191

189192
public void setUpLogonExpectation() {
190193
logonLatch = new CountDownLatch(1);
@@ -195,14 +198,11 @@ public void onLogon(SessionID sessionId) {
195198
log.info("Releasing logon latch");
196199
logonLatch.countDown();
197200
}
198-
if (stopAfterLogon) {
199-
log.info("Stopping after logon");
200-
initiator.stop();
201-
}
202201
}
203202
}
204203

205204
private class ServerThread extends Thread {
205+
206206
private final ATServer server;
207207

208208
public ServerThread(String keyStoreName, String keyStorePassword) {
@@ -223,5 +223,4 @@ public void waitForInitialization() throws InterruptedException {
223223
server.waitForInitialization();
224224
}
225225
}
226-
227226
}

0 commit comments

Comments
 (0)