You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2022/01/15 21:20:15 UTC
[camel] 01/01: cleanup the camel-jms codebase a bit
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch camel-jms-cleanups
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f13912661b0bea8d1fee6ab0b9e8930e0f77c492
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Sat Jan 15 22:18:38 2022 +0100
cleanup the camel-jms codebase a bit
---
.../org/apache/camel/component/jms/EndpointMessageListener.java | 6 +-----
.../org/apache/camel/component/jms/InOnlyMessageSentCallback.java | 6 +-----
.../org/apache/camel/component/jms/reply/ReplyManagerSupport.java | 2 +-
.../org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java | 2 +-
.../org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java | 2 +-
.../apache/camel/component/jms/ConsumeJmsObjectMessageTest.java | 2 +-
.../apache/camel/component/jms/JmsInOutTransferExchangeTest.java | 4 ++--
.../camel/component/jms/JmsIncludeAllJMSXPropertiesTest.java | 2 +-
.../org/apache/camel/component/jms/JmsMessageBodySetNullTest.java | 4 ++--
.../camel/component/jms/JmsNotIncludeAllJMSXPropertiesTest.java | 2 +-
.../jms/issues/ActiveMQPropagateSerializableHeadersTest.java | 2 +-
.../apache/camel/component/jms/issues/JmsToFileMessageIdTest.java | 2 +-
.../camel/component/jms/tx/QueueToProcessorTransactionTest.java | 7 ++++---
.../component/jms/tx/QueueToQueueRequestReplyTransactionTest.java | 7 ++++---
.../apache/camel/component/jms/tx/QueueToQueueTransactionTest.java | 7 ++++---
...QueueToQueueTransactionWithoutDefineTransactionManagerTest.java | 4 ++--
16 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
index 9612202..a1b3796 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java
@@ -221,11 +221,7 @@ public class EndpointMessageListener implements SessionAwareMessageListener {
// process OK so get the reply body if we are InOut and has a body
// If the ppl don't want to send the message back, he should use the InOnly
if (sendReply && exchange.getPattern().isOutCapable()) {
- if (exchange.hasOut()) {
- body = exchange.getOut();
- } else {
- body = exchange.getIn();
- }
+ body = exchange.getMessage();
cause = null;
}
}
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/InOnlyMessageSentCallback.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/InOnlyMessageSentCallback.java
index f1c3197..e298da1 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/InOnlyMessageSentCallback.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/InOnlyMessageSentCallback.java
@@ -41,11 +41,7 @@ public class InOnlyMessageSentCallback implements MessageSentCallback {
if (exchange != null) {
String id = getJMSMessageID(message);
if (id != null) {
- if (exchange.hasOut()) {
- exchange.getOut().setHeader("JMSMessageID", id);
- } else {
- exchange.getIn().setHeader("JMSMessageID", id);
- }
+ exchange.getMessage().setHeader("JMSMessageID", id);
}
}
}
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
index 40d73d0..2564fbe 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ReplyManagerSupport.java
@@ -188,7 +188,7 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl
Session session = holder.getSession();
JmsMessage response = new JmsMessage(exchange, message, session, endpoint.getBinding());
// the JmsBinding is designed to be "pull-based": it will populate the Camel message on demand
- // therefore, we link Exchange and OUT message before continuing, so that the JmsBinding has full access
+ // therefore, we link Exchange and OUT message before continuing, so that the JmsBinding has full access
// to everything it may need, and can populate headers, properties, etc. accordingly (solves CAMEL-6218).
exchange.setOut(response);
Object body = response.getBody();
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java
index 5e55b608..623c1d6 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsBytesMessageTest.java
@@ -79,7 +79,7 @@ public class ConsumeJmsBytesMessageTest extends CamelTestSupport {
Exchange exchange = endpoint.getReceivedExchanges().get(0);
// This should be a JMS Exchange
assertNotNull(ExchangeHelper.getBinding(exchange, JmsBinding.class));
- JmsMessage in = (JmsMessage) exchange.getIn();
+ JmsMessage in = exchange.getIn(JmsMessage.class);
assertNotNull(in);
byte[] bytes = exchange.getIn().getBody(byte[].class);
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java
index 92307ec..89c3262 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsMapMessageTest.java
@@ -66,7 +66,7 @@ public class ConsumeJmsMapMessageTest extends CamelTestSupport {
Exchange exchange = endpoint.getReceivedExchanges().get(0);
// This should be a JMS Exchange
assertNotNull(ExchangeHelper.getBinding(exchange, JmsBinding.class));
- JmsMessage in = (JmsMessage) exchange.getIn();
+ JmsMessage in = exchange.getIn(JmsMessage.class);
assertNotNull(in);
Map<?, ?> map = exchange.getIn().getBody(Map.class);
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
index d524c08..b77ab6b 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ConsumeJmsObjectMessageTest.java
@@ -75,7 +75,7 @@ public class ConsumeJmsObjectMessageTest extends CamelTestSupport {
Exchange exchange = endpoint.getReceivedExchanges().get(0);
// This should be a JMS Exchange
assertNotNull(ExchangeHelper.getBinding(exchange, JmsBinding.class));
- JmsMessage in = (JmsMessage) exchange.getIn();
+ JmsMessage in = exchange.getIn(JmsMessage.class);
assertNotNull(in);
assertIsInstanceOf(ObjectMessage.class, in.getJmsMessage());
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java
index a498bda..88d1ecc 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutTransferExchangeTest.java
@@ -78,7 +78,7 @@ public class JmsInOutTransferExchangeTest extends CamelTestSupport {
Exchange exchange = createExchangeWithBody(null);
assertTrue(transferExchange.getIn() instanceof JmsMessage);
- JmsMessage transferMessage = (JmsMessage) transferExchange.getIn();
+ JmsMessage transferMessage = transferExchange.getIn(JmsMessage.class);
ActiveMQObjectMessage transferActiveMQMessage = (ActiveMQObjectMessage) transferMessage.getJmsMessage();
assertTrue(transferActiveMQMessage.getObject() instanceof DefaultExchangeHolder);
@@ -95,7 +95,7 @@ public class JmsInOutTransferExchangeTest extends CamelTestSupport {
Exchange resultExchange = result.getExchanges().get(0);
assertTrue(resultExchange.getIn() instanceof JmsMessage);
- JmsMessage resultMessage = (JmsMessage) resultExchange.getIn();
+ JmsMessage resultMessage = resultExchange.getIn(JmsMessage.class);
ActiveMQObjectMessage resultActiveMQMessage = (ActiveMQObjectMessage) resultMessage.getJmsMessage();
exchangeHolder = (DefaultExchangeHolder) resultActiveMQMessage.getObject();
exchange = createExchangeWithBody(null);
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsIncludeAllJMSXPropertiesTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsIncludeAllJMSXPropertiesTest.java
index 513af26..02c1996 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsIncludeAllJMSXPropertiesTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsIncludeAllJMSXPropertiesTest.java
@@ -37,7 +37,7 @@ public class JmsIncludeAllJMSXPropertiesTest extends CamelTestSupport {
getMockEndpoint("mock:result").expectedHeaderReceived("JMSXUserID", "Donald");
getMockEndpoint("mock:result").expectedHeaderReceived("JMSXAppID", "MyApp");
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<>();
headers.put("foo", "bar");
headers.put("JMSXUserID", "Donald");
headers.put("JMSXAppID", "MyApp");
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageBodySetNullTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageBodySetNullTest.java
index ae5c753..b9ad4b8 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageBodySetNullTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageBodySetNullTest.java
@@ -83,7 +83,7 @@ public class JmsMessageBodySetNullTest extends CamelTestSupport {
public void configure() throws Exception {
from("jms:queue:foo")
.to("mock:foo")
- .setBody(constant(null))
+ .setBody(constant(new Object[] { null }))
.to("mock:bar");
}
});
@@ -105,7 +105,7 @@ public class JmsMessageBodySetNullTest extends CamelTestSupport {
public void configure() throws Exception {
from("jms:queue:foo")
.to("mock:foo")
- .setBody(constant(null))
+ .setBody(constant(new Object[] { null }))
.to("mock:bar");
}
});
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNotIncludeAllJMSXPropertiesTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNotIncludeAllJMSXPropertiesTest.java
index da6805e..c8d7759 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNotIncludeAllJMSXPropertiesTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsNotIncludeAllJMSXPropertiesTest.java
@@ -37,7 +37,7 @@ public class JmsNotIncludeAllJMSXPropertiesTest extends CamelTestSupport {
getMockEndpoint("mock:result").expectedHeaderReceived("JMSXUserID", null);
getMockEndpoint("mock:result").expectedHeaderReceived("JMSXAppID", null);
- Map headers = new HashMap();
+ Map<String, Object> headers = new HashMap<>();
headers.put("foo", "bar");
headers.put("JMSXUserID", "Donald");
headers.put("JMSXAppID", "MyApp");
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java
index 194b327..1921d04 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/ActiveMQPropagateSerializableHeadersTest.java
@@ -81,7 +81,7 @@ public class ActiveMQPropagateSerializableHeadersTest extends CamelTestSupport {
assertEquals(calValue, headerValue, "myCal");
}
{
- Map<String, Object> headerValue = exchange.getIn().getHeader("myMap", Map.class);
+ Map<?, ?> headerValue = exchange.getIn().getHeader("myMap", Map.class);
assertEquals(mapValue, headerValue, "myMap");
}
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsToFileMessageIdTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsToFileMessageIdTest.java
index bc6dd5c..15ff49c 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsToFileMessageIdTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsToFileMessageIdTest.java
@@ -68,7 +68,7 @@ public class JmsToFileMessageIdTest extends CamelTestSupport {
String camelId = exchange.getIn().getMessageId();
assertNotNull(camelId);
- JmsMessage jms = (JmsMessage) exchange.getIn();
+ JmsMessage jms = exchange.getIn(JmsMessage.class);
String jmsId = jms.getJmsMessage().getJMSMessageID();
assertNotNull(jmsId);
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java
index 2b43c53..47b6080 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToProcessorTransactionTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.jms.tx;
+import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.Policy;
-import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
import org.junit.jupiter.api.Test;
@@ -34,11 +34,12 @@ public class QueueToProcessorTransactionTest extends AbstractTransactionTest {
public void testRollbackUsingXmlQueueToProcessor() throws Exception {
// configure routes and add to camel context
- context.addRoutes(new SpringRouteBuilder() {
+ context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- Policy required = lookup("PROPAGATION_REQUIRED_POLICY", SpringTransactionPolicy.class);
+ Policy required = context().getRegistry().lookupByNameAndType("PROPAGATION_REQUIRED_POLICY",
+ SpringTransactionPolicy.class);
from("activemq:queue:foo").policy(required).process(new ConditionalExceptionProcessor());
}
});
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java
index fdb868c..b9397ab 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueRequestReplyTransactionTest.java
@@ -17,8 +17,8 @@
package org.apache.camel.component.jms.tx;
import org.apache.camel.Message;
+import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.Policy;
-import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
import org.junit.jupiter.api.Test;
@@ -37,10 +37,11 @@ public class QueueToQueueRequestReplyTransactionTest extends AbstractTransaction
@Test
public void testRollbackUsingXmlQueueToQueueRequestReplyUsingDynamicMessageSelector() throws Exception {
final ConditionalExceptionProcessor cp = new ConditionalExceptionProcessor(5);
- context.addRoutes(new SpringRouteBuilder() {
+ context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- Policy required = lookup("PROPAGATION_REQUIRED_POLICY", SpringTransactionPolicy.class);
+ Policy required = context().getRegistry().lookupByNameAndType("PROPAGATION_REQUIRED_POLICY",
+ SpringTransactionPolicy.class);
from("activemq:queue:foo").policy(required).process(cp).to("activemq-1:queue:bar?replyTo=queue:bar.reply");
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java
index 2ef2673..5529f10 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.component.jms.tx;
+import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.spi.Policy;
-import org.apache.camel.spring.SpringRouteBuilder;
import org.apache.camel.spring.spi.SpringTransactionPolicy;
import org.junit.jupiter.api.Test;
@@ -33,11 +33,12 @@ public class QueueToQueueTransactionTest extends AbstractTransactionTest {
public void testRollbackUsingXmlQueueToQueue() throws Exception {
// configure routes and add to camel context
- context.addRoutes(new SpringRouteBuilder() {
+ context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- Policy required = lookup("PROPAGATION_REQUIRED_POLICY", SpringTransactionPolicy.class);
+ Policy required = context().getRegistry().lookupByNameAndType("PROPAGATION_REQUIRED_POLICY",
+ SpringTransactionPolicy.class);
from("activemq:queue:foo?transacted=true").policy(required).process(new ConditionalExceptionProcessor())
.to("activemq:queue:bar?transacted=true");
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java
index 5702318..83130ca 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/QueueToQueueTransactionWithoutDefineTransactionManagerTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.jms.tx;
import org.apache.camel.builder.NotifyBuilder;
-import org.apache.camel.spring.SpringRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
import org.apache.xbean.spring.context.ClassPathXmlApplicationContext;
import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -35,7 +35,7 @@ public class QueueToQueueTransactionWithoutDefineTransactionManagerTest extends
public void testNoTransactionRollbackUsingXmlQueueToQueue() throws Exception {
// configure routes and add to camel context
- context.addRoutes(new SpringRouteBuilder() {
+ context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {