Skip to content

Commit b98fc69

Browse files
chrjohnchrjohn
committed
Merge pull request #65 from guidomedina/master
QFJ-884 Removed quickfixj-messages-all dependency from individual quickfixj-messages-fixXX MessageFactory code generator changed from if-string-equals to switch Most deprecated API calls fixed
2 parents 8c74944 + a31a648 commit b98fc69

File tree

31 files changed

+201
-273
lines changed

31 files changed

+201
-273
lines changed

‎pom.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@
6969
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7070
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
7171
<jdkLevel>1.7</jdkLevel>
72-
<slf4j.version>1.7.19</slf4j.version>
72+
<slf4j.version>1.7.21</slf4j.version>
73+
<junit.version>4.12</junit.version>
7374
<mainClass/>
7475

7576
<maven-resources-plugin-version>2.7</maven-resources-plugin-version>
@@ -154,6 +155,9 @@
154155
<groupId>org.apache.maven.plugins</groupId>
155156
<artifactId>maven-javadoc-plugin</artifactId>
156157
<version>${maven-javadoc-plugin-version}</version>
158+
<configuration>
159+
<excludePackageNames>quickfix.fix*</excludePackageNames>
160+
</configuration>
157161
<executions>
158162
<execution>
159163
<id>attach-javadocs</id>

‎quickfixj-codegenerator/src/main/resources/org/quickfixj/codegenerator/MessageFactory.xsl‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,38 +53,41 @@ import quickfix.Group;
5353
public class MessageFactory implements quickfix.MessageFactory {
5454

5555
public Message create(String beginString, String msgType) {
56-
<xsl:call-template name="if-statement"/>
56+
<xsl:call-template name="switch-statement"/>
5757
return new <xsl:value-of select="$messagePackage"/>.Message();
5858
}
5959

6060
public Group create(String beginString, String msgType, int correspondingFieldID) {
61-
<xsl:call-template name="group-if-statement"/>
61+
<xsl:call-template name="group-switch-statement"/>
6262
return null;
6363
}
6464
}
6565
</xsl:template>
6666

67-
<xsl:template name="if-statement">
67+
<xsl:template name="switch-statement">
68+
switch (msgType) {
6869
<xsl:for-each select="//fix/messages/message">
69-
if (<xsl:value-of select="$messagePackage"/>.<xsl:value-of select="@name"/>.MSGTYPE.equals(msgType)) {
70-
return new <xsl:value-of select="$messagePackage"/>.<xsl:value-of select="@name"/>();
71-
}
70+
case <xsl:value-of select="$messagePackage"/>.<xsl:value-of select="@name"/>.MSGTYPE:
71+
return new <xsl:value-of select="$messagePackage"/>.<xsl:value-of select="@name"/>();
7272
</xsl:for-each>
73+
}
7374
</xsl:template>
7475

75-
<xsl:template name="group-if-statement">
76+
<xsl:template name="group-switch-statement">
77+
switch (msgType) {
7678
<xsl:for-each select="//fix/messages/message[group or component]">
77-
if (<xsl:value-of select="$messagePackage"/>.<xsl:value-of select="@name"/>.MSGTYPE.equals(msgType)) {
78-
switch (correspondingFieldID) {
79+
case <xsl:value-of select="$messagePackage"/>.<xsl:value-of select="@name"/>.MSGTYPE:
80+
switch (correspondingFieldID) {
7981
<xsl:apply-templates mode="group-factories" select="group">
8082
<xsl:with-param name="fullPath" select="@name"/>
8183
</xsl:apply-templates>
8284
<xsl:apply-templates mode="group-factories" select="component">
8385
<xsl:with-param name="fullPath" select="@name"/>
8486
</xsl:apply-templates>
85-
}
86-
}
87+
}
88+
break;
8789
</xsl:for-each>
90+
}
8891
</xsl:template>
8992

9093
<xsl:template mode="group-factories" match="group">

‎quickfixj-core/pom.xml‎

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>junit</groupId>
2424
<artifactId>junit</artifactId>
25-
<version>4.12</version>
25+
<version>${junit.version}</version>
2626
<scope>test</scope>
2727
</dependency>
2828
<dependency>
@@ -102,6 +102,36 @@
102102
</dependencies>
103103

104104
<build>
105+
<resources>
106+
<resource>
107+
<directory>../quickfixj-messages/quickfixj-messages-fixt11/src/main/resources</directory>
108+
</resource>
109+
<resource>
110+
<directory>../quickfixj-messages/quickfixj-messages-fix50/src/main/resources</directory>
111+
</resource>
112+
<resource>
113+
<directory>../quickfixj-messages/quickfixj-messages-fix44/src/main/resources</directory>
114+
</resource>
115+
<resource>
116+
<directory>../quickfixj-messages/quickfixj-messages-fix43/src/main/resources</directory>
117+
</resource>
118+
<resource>
119+
<directory>../quickfixj-messages/quickfixj-messages-fix42/src/main/resources</directory>
120+
</resource>
121+
<resource>
122+
<directory>../quickfixj-messages/quickfixj-messages-fix41/src/main/resources</directory>
123+
</resource>
124+
<resource>
125+
<directory>../quickfixj-messages/quickfixj-messages-fix40/src/main/resources</directory>
126+
</resource>
127+
<resource>
128+
<directory>../quickfixj-messages/quickfixj-messages-fix50sp1/src/main/resources</directory>
129+
</resource>
130+
<resource>
131+
<directory>../quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources</directory>
132+
</resource>
133+
</resources>
134+
105135
<testResources>
106136
<testResource>
107137
<directory>src/test/resources</directory>
@@ -230,12 +260,37 @@
230260
<fieldPackage>quickfix.field</fieldPackage>
231261
<decimal>${generator.decimal}</decimal>
232262
</configuration>
263+
</execution>
264+
<execution>
265+
<id>fix50sp2</id>
266+
<goals>
267+
<goal>generate</goal>
268+
</goals>
269+
<configuration>
270+
<dictFile>../quickfixj-messages/quickfixj-messages-fix50sp2/src/main/resources/FIX50SP2.modified.xml</dictFile>
271+
<packaging>quickfix.fix50sp2</packaging>
272+
<fieldPackage>quickfix.field</fieldPackage>
273+
<decimal>${generator.decimal}</decimal>
274+
</configuration>
275+
</execution>
276+
<execution>
277+
<id>fix50sp1</id>
278+
<goals>
279+
<goal>generate</goal>
280+
</goals>
281+
<configuration>
282+
<dictFile>../quickfixj-messages/quickfixj-messages-fix50sp1/src/main/resources/FIX50SP1.modified.xml</dictFile>
283+
<packaging>quickfix.fix50sp1</packaging>
284+
<fieldPackage>quickfix.field</fieldPackage>
285+
<decimal>${generator.decimal}</decimal>
286+
</configuration>
233287
</execution>
234288
</executions>
235289
</plugin>
236290
<plugin>
237291
<groupId>org.apache.maven.plugins</groupId>
238292
<artifactId>maven-jar-plugin</artifactId>
293+
<version>${maven-jar-plugin-version}</version>
239294
<configuration>
240295
<includes>
241296
<include>quickfix/**</include>
@@ -326,7 +381,7 @@
326381
</plugin>
327382
<plugin>
328383
<artifactId>maven-javadoc-plugin</artifactId>
329-
<version>2.10.3</version>
384+
<version>${maven-javadoc-plugin-version}</version>
330385
</plugin>
331386
<plugin>
332387
<artifactId>maven-jxr-plugin</artifactId>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void exceptionCaught(IoSession ioSession, Throwable cause) throws Excepti
7979
quickFixSession.disconnect(reason, true);
8080
} else {
8181
log.error(reason, cause);
82-
ioSession.close(true);
82+
ioSession.closeNow();
8383
}
8484
} else {
8585
log.error(reason, cause);
@@ -100,9 +100,9 @@ public void sessionClosed(IoSession ioSession) throws Exception {
100100
eventHandlingStrategy.onMessage(quickFixSession, EventHandlingStrategy.END_OF_STREAM );
101101
ioSession.removeAttribute(SessionConnector.QF_SESSION);
102102
}
103-
ioSession.close(true);
103+
ioSession.closeNow();
104104
} catch (Exception e) {
105-
ioSession.close(true);
105+
ioSession.closeNow();
106106
throw e;
107107
}
108108
}
@@ -120,14 +120,14 @@ public void messageReceived(IoSession ioSession, Object message) throws Exceptio
120120
} catch (InvalidMessage e) {
121121
if (MsgType.LOGON.equals(MessageUtils.getMessageType(messageString))) {
122122
log.error("Invalid LOGON message, disconnecting: " + e.getMessage());
123-
ioSession.close(true);
123+
ioSession.closeNow();
124124
} else {
125125
log.error("Invalid message: " + e.getMessage());
126126
}
127127
}
128128
} else {
129129
log.error("Disconnecting; received message for unknown session: " + messageString);
130-
ioSession.close(true);
130+
ioSession.closeNow();
131131
}
132132
}
133133

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void disconnect() {
8484
// threading model and calling join will prevent the
8585
// close event from being processed by this thread (if
8686
// this thread is the MINA IO processor thread.
87-
ioSession.close(true);
87+
ioSession.closeNow();
8888
}
8989

9090
private void waitForScheduleMessagesToBeWritten() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ protected void processMessage(IoSession protocolSession, Message message) throws
7272
// Session is already bound to another connection
7373
sessionLog
7474
.onErrorEvent("Multiple logons/connections for this session are not allowed");
75-
protocolSession.close(true);
75+
protocolSession.closeNow();
7676
return;
7777
}
7878
sessionLog.onEvent("Accepting session " + qfSession.getSessionID() + " from "
@@ -105,7 +105,7 @@ protected void processMessage(IoSession protocolSession, Message message) throws
105105
}
106106
} else {
107107
log.warn("Ignoring non-logon message before session establishment: " + message);
108-
protocolSession.close(true);
108+
protocolSession.closeNow();
109109
return;
110110
}
111111
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.sql.SQLException;
2727
import java.sql.Statement;
2828

29-
import junit.framework.Assert;
29+
import org.junit.Assert;
3030

3131
import org.logicalcobwebs.proxool.ProxoolException;
3232
import org.logicalcobwebs.proxool.ProxoolFacade;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package quickfix;
2121

22-
import static junit.framework.Assert.*;
22+
import static org.junit.Assert.*;
2323
import static quickfix.FixVersions.*;
2424

2525
import java.util.HashMap;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
package quickfix;
2121

22-
import junit.framework.Assert;
2322
import junit.framework.TestCase;
23+
import org.junit.Assert;
2424
import quickfix.field.BeginString;
2525
import quickfix.field.LegSymbol;
2626
import quickfix.field.OrderID;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ public void testSynchronousSendWithJoinTimeout() throws Exception {
100100
public void testDisconnect() throws Exception {
101101
IoSession mockProtocolSession = mock(IoSession.class);
102102
stub(mockProtocolSession.getScheduledWriteMessages()).toReturn(0);
103-
stub(mockProtocolSession.close(true)).toReturn(null);
103+
stub(mockProtocolSession.closeNow()).toReturn(null);
104104

105105
IoSessionResponder responder = new IoSessionResponder(mockProtocolSession, false, 0, 0);
106106
responder.disconnect();
107107

108108
verify(mockProtocolSession).getScheduledWriteMessages();
109-
verify(mockProtocolSession).close(true);
109+
verify(mockProtocolSession).closeNow();
110110

111111
verifyNoMoreInteractions(mockProtocolSession);
112112
}

0 commit comments

Comments
 (0)