This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-4.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.14.x by this push:
new e6781eaedacf Support converting JMS and SJMS messages to
jakarta.jms.Message for easier testing
e6781eaedacf is described below
commit e6781eaedacfddbbdbbc56ba0f5c208b1863927e
Author: Peter Palaga <[email protected]>
AuthorDate: Fri Sep 5 19:19:17 2025 +0200
Support converting JMS and SJMS messages to jakarta.jms.Message for
easier testing
---
components/camel-jms/pom.xml | 2 +-
.../jms/converter/JmsConverterLoader.java | 60 ++++++++++++++
.../services/org/apache/camel/TypeConverterLoader | 2 +
.../component/jms/converter/JmsConverter.java | 38 +++++++++
.../component/jms/converter/JmsConverterTest.java | 93 ++++++++++++++++++++++
.../sjms/converter/SjmsConverterLoader.java | 60 ++++++++++++++
.../services/org/apache/camel/TypeConverterLoader | 2 +
.../component/sjms/converter/SjmsConverter.java | 38 +++++++++
.../sjms/converter/SjmsConverterTest.java | 81 +++++++++++++++++++
9 files changed, 375 insertions(+), 1 deletion(-)
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 0243cb1832e8..acdbe8274368 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -110,7 +110,7 @@
</dependency>
<!-- test infra -->
- <dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-test-infra-core</artifactId>
<version>${project.version}</version>
diff --git
a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/converter/JmsConverterLoader.java
b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/converter/JmsConverterLoader.java
new file mode 100644
index 000000000000..74a8fb05fc65
--- /dev/null
+++
b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/converter/JmsConverterLoader.java
@@ -0,0 +1,60 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.jms.converter;
+
+import javax.annotation.processing.Generated;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.DeferredContextBinding;
+import org.apache.camel.Exchange;
+import org.apache.camel.TypeConversionException;
+import org.apache.camel.TypeConverterLoaderException;
+import org.apache.camel.spi.TypeConverterLoader;
+import org.apache.camel.spi.TypeConverterRegistry;
+import org.apache.camel.support.SimpleTypeConverter;
+import org.apache.camel.support.TypeConverterSupport;
+import org.apache.camel.util.DoubleMap;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.TypeConverterLoaderGeneratorMojo")
+@SuppressWarnings("unchecked")
+@DeferredContextBinding
+public final class JmsConverterLoader implements TypeConverterLoader,
CamelContextAware {
+
+ private CamelContext camelContext;
+
+ public JmsConverterLoader() {
+ }
+
+ @Override
+ public void setCamelContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
+
+ @Override
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ @Override
+ public void load(TypeConverterRegistry registry) throws
TypeConverterLoaderException {
+ registerConverters(registry);
+ }
+
+ private void registerConverters(TypeConverterRegistry registry) {
+ addTypeConverter(registry, jakarta.jms.Message.class,
org.apache.camel.component.jms.JmsMessage.class, false,
+ (type, exchange, value) -> {
+ Object answer =
org.apache.camel.component.jms.converter.JmsConverter.toMessage((org.apache.camel.component.jms.JmsMessage)
value);
+ if (false && answer == null) {
+ answer = Void.class;
+ }
+ return answer;
+ });
+ }
+
+ private static void addTypeConverter(TypeConverterRegistry registry,
Class<?> toType, Class<?> fromType, boolean allowNull,
SimpleTypeConverter.ConversionMethod method) {
+ registry.addTypeConverter(toType, fromType, new
SimpleTypeConverter(allowNull, method));
+ }
+}
diff --git
a/components/camel-jms/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
b/components/camel-jms/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
new file mode 100644
index 000000000000..a6532ed7d3ec
--- /dev/null
+++
b/components/camel-jms/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+org.apache.camel.component.jms.converter.JmsConverterLoader
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/converter/JmsConverter.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/converter/JmsConverter.java
new file mode 100644
index 000000000000..8c0607989854
--- /dev/null
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/converter/JmsConverter.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jms.converter;
+
+import jakarta.jms.Message;
+
+import org.apache.camel.CamelException;
+import org.apache.camel.Converter;
+import org.apache.camel.component.jms.JmsMessage;
+
+@Converter(generateLoader = true)
+public class JmsConverter {
+
+ /**
+ * Converts a {@link JmsMessage} to a {@link Message}.
+ *
+ * @return {@link Message}
+ */
+ @Converter
+ public static Message toMessage(JmsMessage jmsMessage) throws
CamelException {
+ return jmsMessage.getJmsMessage();
+ }
+
+}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/converter/JmsConverterTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/converter/JmsConverterTest.java
new file mode 100644
index 000000000000..06bedf4074d2
--- /dev/null
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/converter/JmsConverterTest.java
@@ -0,0 +1,93 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jms.converter;
+
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Message;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jms.AbstractJMSTest;
+import org.apache.camel.component.jms.JmsComponent;
+import org.apache.camel.component.jms.JmsMessage;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.infra.core.CamelContextExtension;
+import org.apache.camel.test.infra.core.DefaultCamelContextExtension;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.springframework.jms.core.JmsTemplate;
+
+public class JmsConverterTest extends AbstractJMSTest {
+
+ @Order(2)
+ @RegisterExtension
+ public static CamelContextExtension camelContextExtension = new
DefaultCamelContextExtension();
+
+ protected JmsTemplate jmsTemplate;
+ protected CamelContext context;
+ protected ProducerTemplate template;
+
+ @Override
+ protected String getComponentName() {
+ return "activemq";
+ }
+
+ @Override
+ protected JmsComponent setupComponent(
+ CamelContext camelContext, ConnectionFactory connectionFactory,
String componentName) {
+ jmsTemplate = new JmsTemplate(connectionFactory);
+
+ return super.setupComponent(camelContext, connectionFactory,
componentName);
+ }
+
+ @Override
+ public CamelContextExtension getCamelContextExtension() {
+ return camelContextExtension;
+ }
+
+ @BeforeEach
+ void setUpRequirements() {
+ context = camelContextExtension.getContext();
+ template = camelContextExtension.getProducerTemplate();
+ }
+
+ @Test
+ public void toJakartaJmsMessage() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.allMessages().inMessage().isInstanceOf(JmsMessage.class);
+ mock.allMessages().body(Message.class).isInstanceOf(Message.class);
+
+ jmsTemplate.setPubSubDomain(false);
+ jmsTemplate.send("JmsConverterTest", session ->
session.createTextMessage("Hello world!"));
+
+ mock.assertIsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ from("activemq:JmsConverterTest").to("mock:result");
+ from("direct:test").to("activemq:JmsConverterTest");
+ }
+ };
+ }
+}
diff --git
a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/converter/SjmsConverterLoader.java
b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/converter/SjmsConverterLoader.java
new file mode 100644
index 000000000000..08bc029e2d2f
--- /dev/null
+++
b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/converter/SjmsConverterLoader.java
@@ -0,0 +1,60 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.sjms.converter;
+
+import javax.annotation.processing.Generated;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelContextAware;
+import org.apache.camel.DeferredContextBinding;
+import org.apache.camel.Exchange;
+import org.apache.camel.TypeConversionException;
+import org.apache.camel.TypeConverterLoaderException;
+import org.apache.camel.spi.TypeConverterLoader;
+import org.apache.camel.spi.TypeConverterRegistry;
+import org.apache.camel.support.SimpleTypeConverter;
+import org.apache.camel.support.TypeConverterSupport;
+import org.apache.camel.util.DoubleMap;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.TypeConverterLoaderGeneratorMojo")
+@SuppressWarnings("unchecked")
+@DeferredContextBinding
+public final class SjmsConverterLoader implements TypeConverterLoader,
CamelContextAware {
+
+ private CamelContext camelContext;
+
+ public SjmsConverterLoader() {
+ }
+
+ @Override
+ public void setCamelContext(CamelContext camelContext) {
+ this.camelContext = camelContext;
+ }
+
+ @Override
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ @Override
+ public void load(TypeConverterRegistry registry) throws
TypeConverterLoaderException {
+ registerConverters(registry);
+ }
+
+ private void registerConverters(TypeConverterRegistry registry) {
+ addTypeConverter(registry, jakarta.jms.Message.class,
org.apache.camel.component.sjms.SjmsMessage.class, false,
+ (type, exchange, value) -> {
+ Object answer =
org.apache.camel.component.sjms.converter.SjmsConverter.toMessage((org.apache.camel.component.sjms.SjmsMessage)
value);
+ if (false && answer == null) {
+ answer = Void.class;
+ }
+ return answer;
+ });
+ }
+
+ private static void addTypeConverter(TypeConverterRegistry registry,
Class<?> toType, Class<?> fromType, boolean allowNull,
SimpleTypeConverter.ConversionMethod method) {
+ registry.addTypeConverter(toType, fromType, new
SimpleTypeConverter(allowNull, method));
+ }
+}
diff --git
a/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
b/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
new file mode 100644
index 000000000000..edbf76c6e3ee
--- /dev/null
+++
b/components/camel-sjms/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+org.apache.camel.component.sjms.converter.SjmsConverterLoader
diff --git
a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/converter/SjmsConverter.java
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/converter/SjmsConverter.java
new file mode 100644
index 000000000000..6560f8f315ba
--- /dev/null
+++
b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/converter/SjmsConverter.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.converter;
+
+import jakarta.jms.Message;
+
+import org.apache.camel.CamelException;
+import org.apache.camel.Converter;
+import org.apache.camel.component.sjms.SjmsMessage;
+
+@Converter(generateLoader = true)
+public class SjmsConverter {
+
+ /**
+ * Converts a {@link SjmsMessage} to a {@link Message}.
+ *
+ * @return {@link Message}
+ */
+ @Converter
+ public static Message toMessage(SjmsMessage sjmsMessage) throws
CamelException {
+ return sjmsMessage.getJmsMessage();
+ }
+
+}
diff --git
a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/converter/SjmsConverterTest.java
b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/converter/SjmsConverterTest.java
new file mode 100644
index 000000000000..d40fae48cb78
--- /dev/null
+++
b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/converter/SjmsConverterTest.java
@@ -0,0 +1,81 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sjms.converter;
+
+import java.io.File;
+import java.io.InputStream;
+
+import jakarta.jms.Message;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.sjms.SjmsMessage;
+import org.apache.camel.component.sjms.support.JmsTestSupport;
+import org.apache.commons.io.FileUtils;
+import org.junit.jupiter.api.Test;
+
+public class SjmsConverterTest extends JmsTestSupport {
+
+ private static final String TEST_DATA_DIR = "target/SjmsConverterTest";
+ private static final String FILE_OUTPUT_URI = "file:" + TEST_DATA_DIR;
+ private static final String FILE_INPUT_URI = "file:" + TEST_DATA_DIR;
+ private static final String SJMS_QUEUE_URI =
"sjms:queue:file.converter.queue.JmsMessageTest";
+ private static final String MOCK_RESULT_URI = "mock:result";
+
+ @Test
+ public void toJakartaJmsMessage() throws Exception {
+ File f = new File(TEST_DATA_DIR);
+
+ // First make sure the directories are empty or purged so we don't get
bad data on a
+ // test that is run against an uncleaned target directory
+ if (f.exists()) {
+ FileUtils.deleteDirectory(new File(TEST_DATA_DIR));
+ }
+
+ // Then add the directory back
+ f.mkdirs();
+
+ // Create the test String
+ final String expectedBody = "Hello World";
+
+ // Create the Mock endpoint
+ MockEndpoint mock = getMockEndpoint(MOCK_RESULT_URI);
+ mock.expectedMessageCount(1);
+ mock.allMessages().inMessage().isInstanceOf(SjmsMessage.class);
+ mock.allMessages().body(Message.class).isInstanceOf(Message.class);
+
+ // Send the message to a file to be read by the file component
+ template.sendBody(FILE_OUTPUT_URI, expectedBody);
+
+ // Verify that it is working correctly
+ mock.assertIsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ from(FILE_INPUT_URI)
+ .convertBodyTo(InputStream.class)
+ .to(SJMS_QUEUE_URI);
+
+ from(SJMS_QUEUE_URI)
+ .to(MOCK_RESULT_URI);
+ }
+ };
+ }
+}
