This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new b1d2a533e919 CAMEL-23144: camel-quickfixj - Upgrade to 3.0.0 (#21941)
b1d2a533e919 is described below
commit b1d2a533e919b0eaf055064c1dbb690efc9d5934
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Mar 11 19:53:09 2026 +0100
CAMEL-23144: camel-quickfixj - Upgrade to 3.0.0 (#21941)
---
.../camel/component/quickfixj/converter/QuickfixjConverters.java | 5 ++++-
.../apache/camel/component/quickfixj/QuickfixjConvertersTest.java | 4 ++--
.../org/apache/camel/component/quickfixj/QuickfixjSpringTest.java | 2 +-
.../test/java/org/apache/camel/component/quickfixj/TestSupport.java | 2 ++
docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc | 3 +++
parent/pom.xml | 2 +-
6 files changed, 13 insertions(+), 5 deletions(-)
diff --git
a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java
b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java
index 5850aaf9906e..fa8a5059d472 100644
---
a/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java
+++
b/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/converter/QuickfixjConverters.java
@@ -37,6 +37,7 @@ import quickfix.InvalidMessage;
import quickfix.Message;
import quickfix.Session;
import quickfix.SessionID;
+import quickfix.ValidationSettings;
import quickfix.field.MsgType;
import static
org.apache.camel.component.quickfixj.QuickfixjEndpoint.EVENT_CATEGORY_KEY;
@@ -45,6 +46,7 @@ import static
org.apache.camel.component.quickfixj.QuickfixjEndpoint.SESSION_ID_
@Converter(generateLoader = true)
public final class QuickfixjConverters {
+
private static final Logger LOG =
LoggerFactory.getLogger(QuickfixjConverters.class);
private QuickfixjConverters() {
@@ -65,6 +67,7 @@ public final class QuickfixjConverters {
@Converter
public static Message toMessage(byte[] value, Exchange exchange)
throws InvalidMessage, ConfigError, UnsupportedEncodingException {
+ ValidationSettings vs = new ValidationSettings();
DataDictionary dataDictionary = getDataDictionary(exchange);
String charsetName = ExchangeHelper.getCharsetName(exchange);
@@ -82,7 +85,7 @@ public final class QuickfixjConverters {
message = message.substring(0, message.length() - 1);
}
- return new Message(message, dataDictionary, false);
+ return new Message(message, dataDictionary, vs, false);
}
@Converter
diff --git
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
index d37667d61b8c..aa8ddc99490d 100644
---
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
+++
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjConvertersTest.java
@@ -85,7 +85,7 @@ public class QuickfixjConvertersTest extends CamelTestSupport
{
QuickfixjEndpoint endpoint = new QuickfixjEndpoint(null, "", new
QuickfixjComponent(context));
Message message = new Message();
- message.getHeader().setString(MsgType.FIELD, MsgType.ORDER_SINGLE);
+ message.getHeader().setString(MsgType.FIELD, MsgType.NEW_ORDER_SINGLE);
Exchange exchange = QuickfixjConverters.toExchange(endpoint,
sessionID, message, QuickfixjEventCategory.AppMessageSent);
@@ -94,7 +94,7 @@ public class QuickfixjConvertersTest extends CamelTestSupport
{
assertThat((QuickfixjEventCategory)
exchange.getIn().getHeader(QuickfixjEndpoint.EVENT_CATEGORY_KEY),
is(QuickfixjEventCategory.AppMessageSent));
- assertThat((String)
exchange.getIn().getHeader(QuickfixjEndpoint.MESSAGE_TYPE_KEY),
is(MsgType.ORDER_SINGLE));
+ assertThat((String)
exchange.getIn().getHeader(QuickfixjEndpoint.MESSAGE_TYPE_KEY),
is(MsgType.NEW_ORDER_SINGLE));
}
@Test
diff --git
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
index 8cf7f96cdcb4..7ab6a90877a6 100644
---
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
+++
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
@@ -73,7 +73,7 @@ public class QuickfixjSpringTest extends
CamelSpringTestSupport {
public static class CustomMessageFactory extends DefaultMessageFactory {
@Override
public Message create(String beginString, String msgType) {
- if (beginString.equals(FixVersions.BEGINSTRING_FIX42) &&
msgType.equals(MsgType.ORDER_SINGLE)) {
+ if (beginString.equals(FixVersions.BEGINSTRING_FIX42) &&
msgType.equals(MsgType.NEW_ORDER_SINGLE)) {
return new CustomNewOrderSingle();
}
return super.create(beginString, msgType);
diff --git
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java
index fd56a4e1285c..9789f738d56c 100644
---
a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java
+++
b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/TestSupport.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Date;
+import java.util.GregorianCalendar;
import org.mockito.Mockito;
import quickfix.Acceptor;
@@ -72,6 +73,7 @@ public final class TestSupport {
MessageStoreFactory mockMessageStoreFactory =
Mockito.mock(MessageStoreFactory.class);
MessageStore mockMessageStore = Mockito.mock(MessageStore.class);
Mockito.when(mockMessageStore.getCreationTime()).thenReturn(new
Date());
+
Mockito.when(mockMessageStore.getCreationTimeCalendar()).thenReturn(new
GregorianCalendar());
Mockito.when(mockMessageStoreFactory.create(sessionID)).thenReturn(mockMessageStore);
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
index 2fc07d768691..ed43a3cfdf57 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
@@ -377,6 +377,9 @@ HttpRequest request =
context.getAttribute(AS2ClientManager.HTTP_REQUEST, HttpRe
HttpRequest request = context.getRequest();
----
+=== camel-quickfix
+
+Upgraded QuickFixJ from 2.3.2 to 3.0.0 in `camel-quickfix` component.
=== MDC older logic (Deprecation)
diff --git a/parent/pom.xml b/parent/pom.xml
index dda30bdd7bb5..1d9c073f13c3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -474,7 +474,7 @@
<quarkus-mcp-server-version>1.10.2</quarkus-mcp-server-version>
<quarkus-version>3.32.2</quarkus-version>
<quartz-version>2.5.2</quartz-version>
- <quickfixj-version>2.3.2</quickfixj-version>
+ <quickfixj-version>3.0.0</quickfixj-version>
<reactive-streams-version>1.0.4</reactive-streams-version>
<reactor-version>3.8.4</reactor-version>
<reactor-netty-version>1.3.4</reactor-netty-version>
