You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2024/08/26 20:09:40 UTC
(camel) 02/10: (chores) camel-jms simplify type checks
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 396af0187b2334443ba4edf5c36d3537d3a1affb
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Aug 26 11:48:51 2024 +0200
(chores) camel-jms simplify type checks
- to use pattern matching for instanceof
- use simpler assertion checks
---
.../jms/DefaultJmsMessageListenerContainer.java | 6 ++--
.../component/jms/EndpointMessageListener.java | 7 ++---
.../org/apache/camel/component/jms/JmsBinding.java | 33 +++++++++-----------
.../camel/component/jms/JmsConfiguration.java | 16 ++++------
.../apache/camel/component/jms/JmsEndpoint.java | 16 +++++-----
.../org/apache/camel/component/jms/JmsMessage.java | 11 ++++---
.../camel/component/jms/JmsMessageHelper.java | 35 +++++++++++-----------
.../camel/component/jms/JmsPollingConsumer.java | 3 +-
.../apache/camel/component/jms/JmsProducer.java | 7 ++---
.../component/jms/reply/ReplyManagerSupport.java | 4 +--
.../jms/JmsEndpointConfigurationTest.java | 3 +-
.../jms/JmsInOutTransferExchangeTest.java | 8 ++---
.../activemq/ActiveMQOriginalDestinationIT.java | 9 ++----
.../AsyncJmsProducerExceptionInTXManualIT.java | 4 +--
.../spring/tx/AbstractTransactionIT.java | 28 ++++++++---------
15 files changed, 86 insertions(+), 104 deletions(-)
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultJmsMessageListenerContainer.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultJmsMessageListenerContainer.java
index cb89cc573c3..a98c1a60c18 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultJmsMessageListenerContainer.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultJmsMessageListenerContainer.java
@@ -134,8 +134,7 @@ public class DefaultJmsMessageListenerContainer extends DefaultMessageListenerCo
}
super.stop();
- if (taskExecutor instanceof ThreadPoolTaskExecutor) {
- ThreadPoolTaskExecutor executor = (ThreadPoolTaskExecutor) taskExecutor;
+ if (taskExecutor instanceof ThreadPoolTaskExecutor executor) {
executor.destroy();
}
}
@@ -148,8 +147,7 @@ public class DefaultJmsMessageListenerContainer extends DefaultMessageListenerCo
}
super.destroy();
- if (taskExecutor instanceof ThreadPoolTaskExecutor) {
- ThreadPoolTaskExecutor executor = (ThreadPoolTaskExecutor) taskExecutor;
+ if (taskExecutor instanceof ThreadPoolTaskExecutor executor) {
executor.destroy();
}
}
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 8dbbe7b9458..a10d5c7814e 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
@@ -229,8 +229,8 @@ public class EndpointMessageListener implements SessionAwareMessageListener {
// send back reply if there was no error and we are supposed to send back a reply
if (rce == null && sendReply && (body != null || cause != null)) {
LOG.trace("onMessage.sendReply START");
- if (replyDestination instanceof Destination) {
- sendReply((Destination) replyDestination, message, exchange, body, cause);
+ if (replyDestination instanceof Destination destination) {
+ sendReply(destination, message, exchange, body, cause);
} else {
sendReply((String) replyDestination, message, exchange, body, cause);
}
@@ -265,8 +265,7 @@ public class EndpointMessageListener implements SessionAwareMessageListener {
// reuse existing jms message if pooled
org.apache.camel.Message msg = exchange.getIn();
- if (msg instanceof JmsMessage) {
- JmsMessage jm = (JmsMessage) msg;
+ if (msg instanceof JmsMessage jm) {
jm.init(exchange, message, session, getBinding());
} else {
exchange.setIn(new JmsMessage(exchange, message, session, getBinding()));
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
index 91d974abf1f..8dd13a4e8f3 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsBinding.java
@@ -137,12 +137,10 @@ public class JmsBinding {
return message;
}
- if (message instanceof ObjectMessage) {
+ if (message instanceof ObjectMessage objectMessage) {
LOG.trace("Extracting body as a ObjectMessage from JMS message: {}", message);
- ObjectMessage objectMessage = (ObjectMessage) message;
Object payload = objectMessage.getObject();
- if (payload instanceof DefaultExchangeHolder) {
- DefaultExchangeHolder holder = (DefaultExchangeHolder) payload;
+ if (payload instanceof DefaultExchangeHolder holder) {
DefaultExchangeHolder.unmarshal(exchange, holder);
// enrich with JMS headers also as otherwise they will get lost when use the transferExchange option.
Map<String, Object> jmsHeaders = extractHeadersFromJms(message, exchange);
@@ -151,19 +149,17 @@ public class JmsBinding {
} else {
return objectMessage.getObject();
}
- } else if (message instanceof TextMessage) {
+ } else if (message instanceof TextMessage textMessage) {
LOG.trace("Extracting body as a TextMessage from JMS message: {}", message);
- TextMessage textMessage = (TextMessage) message;
return textMessage.getText();
- } else if (message instanceof MapMessage) {
+ } else if (message instanceof MapMessage mapMessage) {
LOG.trace("Extracting body as a MapMessage from JMS message: {}", message);
- return createMapFromMapMessage((MapMessage) message);
- } else if (message instanceof BytesMessage) {
+ return createMapFromMapMessage(mapMessage);
+ } else if (message instanceof BytesMessage bytesMessage) {
LOG.trace("Extracting body as a BytesMessage from JMS message: {}", message);
- return createByteArrayFromBytesMessage(exchange, (BytesMessage) message);
- } else if (message instanceof StreamMessage) {
+ return createByteArrayFromBytesMessage(exchange, bytesMessage);
+ } else if (message instanceof StreamMessage streamMessage) {
LOG.trace("Extracting body as a StreamMessage from JMS message: {}", message);
- StreamMessage streamMessage = (StreamMessage) message;
return createInputStreamFromStreamMessage(streamMessage);
} else {
return null;
@@ -313,8 +309,7 @@ public class JmsBinding {
boolean alwaysCopy = endpoint != null && endpoint.getConfiguration().isAlwaysCopyMessage();
boolean force = endpoint != null && endpoint.getConfiguration().isForceSendOriginalMessage();
- if (!alwaysCopy && camelMessage instanceof JmsMessage) {
- JmsMessage jmsMessage = (JmsMessage) camelMessage;
+ if (!alwaysCopy && camelMessage instanceof JmsMessage jmsMessage) {
if (!jmsMessage.shouldCreateNewMessage() || force) {
answer = jmsMessage.getJmsMessage();
@@ -386,10 +381,10 @@ public class JmsBinding {
&& (endpoint == null || !endpoint.isUseMessageIDAsCorrelationID())) {
jmsMessage.setJMSCorrelationID(ExchangeHelper.convertToType(exchange, String.class, headerValue));
} else if (headerName.equals(JmsConstants.JMS_HEADER_REPLY_TO) && headerValue != null) {
- if (headerValue instanceof String) {
+ if (headerValue instanceof String string) {
// if the value is a String we must normalize it first, and must include the prefix
// as ActiveMQ requires that when converting the String to a jakarta.jms.Destination type
- headerValue = normalizeDestinationName((String) headerValue, true);
+ headerValue = normalizeDestinationName(string, true);
}
Destination replyTo = ExchangeHelper.convertToType(exchange, Destination.class, headerValue);
JmsMessageHelper.setJMSReplyTo(jmsMessage, replyTo);
@@ -503,11 +498,11 @@ public class JmsBinding {
return headerValue.toString();
} else if (headerValue instanceof Boolean) {
return headerValue;
- } else if (headerValue instanceof Date) {
+ } else if (headerValue instanceof Date date) {
if (this.endpoint.getConfiguration().isFormatDateHeadersToIso8601()) {
- return ZonedDateTime.ofInstant(((Date) headerValue).toInstant(), ZoneOffset.UTC).toString();
+ return ZonedDateTime.ofInstant(date.toInstant(), ZoneOffset.UTC).toString();
} else {
- return headerValue.toString();
+ return date.toString();
}
}
return null;
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index da10867f092..e3b991015c8 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -749,8 +749,7 @@ public class JmsConfiguration implements Cloneable {
LOG.debug(
"You are overloading the destinationResolver property on a DestinationEndpoint; are you sure you want to do that?");
}
- } else if (endpoint instanceof DestinationEndpoint) {
- DestinationEndpoint destinationEndpoint = (DestinationEndpoint) endpoint;
+ } else if (endpoint instanceof DestinationEndpoint destinationEndpoint) {
template.setDestinationResolver(createDestinationResolver(destinationEndpoint));
}
template.setDefaultDestinationName(destination);
@@ -1633,8 +1632,8 @@ public class JmsConfiguration implements Cloneable {
AbstractMessageListenerContainer container,
JmsEndpoint endpoint) {
container.setConnectionFactory(getOrCreateListenerConnectionFactory());
- if (endpoint instanceof DestinationEndpoint) {
- container.setDestinationResolver(createDestinationResolver((DestinationEndpoint) endpoint));
+ if (endpoint instanceof DestinationEndpoint destinationEndpoint) {
+ container.setDestinationResolver(createDestinationResolver(destinationEndpoint));
} else if (destinationResolver != null) {
container.setDestinationResolver(destinationResolver);
}
@@ -1678,11 +1677,9 @@ public class JmsConfiguration implements Cloneable {
container.setMessageSelector(endpoint.getSelector());
}
- if (container instanceof DefaultMessageListenerContainer) {
- DefaultMessageListenerContainer listenerContainer = (DefaultMessageListenerContainer) container;
+ if (container instanceof DefaultMessageListenerContainer listenerContainer) {
configureDefaultMessageListenerContainer(endpoint, listenerContainer);
- } else if (container instanceof SimpleMessageListenerContainer) {
- SimpleMessageListenerContainer listenerContainer = (SimpleMessageListenerContainer) container;
+ } else if (container instanceof SimpleMessageListenerContainer listenerContainer) {
configureSimpleMessageListenerContainer(listenerContainer);
}
}
@@ -1773,8 +1770,7 @@ public class JmsConfiguration implements Cloneable {
}
JmsOperations operations = listener.getTemplate();
- if (operations instanceof JmsTemplate) {
- JmsTemplate template = (JmsTemplate) operations;
+ if (operations instanceof JmsTemplate template) {
template.setDeliveryPersistent(isReplyToDeliveryPersistent());
}
}
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
index d4164920165..be80215543b 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsEndpoint.java
@@ -237,8 +237,8 @@ public class JmsEndpoint extends DefaultEndpoint
// we are using a shared thread pool that this listener container is using.
// store a reference to the consumer, but we should not shutdown the thread pool when the consumer stops
// as the lifecycle of the shared thread pool is handled elsewhere
- if (configuration.getTaskExecutor() instanceof ExecutorService) {
- consumer.setListenerContainerExecutorService((ExecutorService) configuration.getTaskExecutor(), false);
+ if (configuration.getTaskExecutor() instanceof ExecutorService executorService) {
+ consumer.setListenerContainerExecutorService(executorService, false);
}
} else if (!(listenerContainer instanceof DefaultJmsMessageListenerContainer)
|| configuration.getDefaultTaskExecutorType() == null) {
@@ -260,8 +260,8 @@ public class JmsEndpoint extends DefaultEndpoint
// set a default transaction name if none provided
if (configuration.getTransactionName() == null) {
- if (listenerContainer instanceof DefaultMessageListenerContainer) {
- ((DefaultMessageListenerContainer) listenerContainer).setTransactionName(consumerName);
+ if (listenerContainer instanceof DefaultMessageListenerContainer defaultMessageListenerContainer) {
+ defaultMessageListenerContainer.setTransactionName(consumerName);
}
}
@@ -278,10 +278,10 @@ public class JmsEndpoint extends DefaultEndpoint
}
private void setContainerTaskExecutor(AbstractMessageListenerContainer listenerContainer, Executor executor) {
- if (listenerContainer instanceof SimpleMessageListenerContainer) {
- ((SimpleMessageListenerContainer) listenerContainer).setTaskExecutor(executor);
- } else if (listenerContainer instanceof DefaultMessageListenerContainer) {
- ((DefaultMessageListenerContainer) listenerContainer).setTaskExecutor(executor);
+ if (listenerContainer instanceof SimpleMessageListenerContainer container) {
+ container.setTaskExecutor(executor);
+ } else if (listenerContainer instanceof DefaultMessageListenerContainer defaultMessageListenerContainer) {
+ defaultMessageListenerContainer.setTaskExecutor(executor);
}
}
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
index add5a3b28e1..9b900ceb948 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
@@ -97,8 +97,7 @@ public class JmsMessage extends DefaultMessage {
getHeaders().clear();
boolean copyMessageId = true;
- if (that instanceof JmsMessage) {
- JmsMessage thatMessage = (JmsMessage) that;
+ if (that instanceof JmsMessage thatMessage) {
this.jmsMessage = thatMessage.jmsMessage;
if (this.jmsMessage != null) {
// for performance lets not copy the messageID if we are a JMS message
@@ -276,10 +275,10 @@ public class JmsMessage extends DefaultMessage {
String result = null;
if (destination == null) {
result = "null destination!" + File.separator;
- } else if (destination instanceof Topic) {
- result = "topic" + File.separator + ((Topic) destination).getTopicName() + File.separator;
- } else if (destination instanceof Queue) {
- result = "queue" + File.separator + ((Queue) destination).getQueueName() + File.separator;
+ } else if (destination instanceof Topic topic) {
+ result = "topic" + File.separator + topic.getTopicName() + File.separator;
+ } else if (destination instanceof Queue queue) {
+ result = "queue" + File.separator + queue.getQueueName() + File.separator;
}
return result;
}
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
index 1349118a623..ae265618f04 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
@@ -151,22 +151,22 @@ public final class JmsMessageHelper {
if (value == null) {
return;
}
- if (value instanceof Byte) {
- jmsMessage.setByteProperty(name, (Byte) value);
- } else if (value instanceof Boolean) {
- jmsMessage.setBooleanProperty(name, (Boolean) value);
- } else if (value instanceof Double) {
- jmsMessage.setDoubleProperty(name, (Double) value);
- } else if (value instanceof Float) {
- jmsMessage.setFloatProperty(name, (Float) value);
- } else if (value instanceof Integer) {
- jmsMessage.setIntProperty(name, (Integer) value);
- } else if (value instanceof Long) {
- jmsMessage.setLongProperty(name, (Long) value);
- } else if (value instanceof Short) {
- jmsMessage.setShortProperty(name, (Short) value);
- } else if (value instanceof String) {
- jmsMessage.setStringProperty(name, (String) value);
+ if (value instanceof Byte aByte) {
+ jmsMessage.setByteProperty(name, aByte);
+ } else if (value instanceof Boolean aBoolean) {
+ jmsMessage.setBooleanProperty(name, aBoolean);
+ } else if (value instanceof Double aDouble) {
+ jmsMessage.setDoubleProperty(name, aDouble);
+ } else if (value instanceof Float aFloat) {
+ jmsMessage.setFloatProperty(name, aFloat);
+ } else if (value instanceof Integer integer) {
+ jmsMessage.setIntProperty(name, integer);
+ } else if (value instanceof Long aLong) {
+ jmsMessage.setLongProperty(name, aLong);
+ } else if (value instanceof Short aShort) {
+ jmsMessage.setShortProperty(name, aShort);
+ } else if (value instanceof String string) {
+ jmsMessage.setStringProperty(name, string);
} else {
// fallback to Object
jmsMessage.setObjectProperty(name, value);
@@ -418,8 +418,7 @@ public final class JmsMessageHelper {
public static void setJMSDeliveryMode(Exchange exchange, Message message, Object deliveryMode) throws JMSException {
Integer mode = null;
- if (deliveryMode instanceof String) {
- String s = (String) deliveryMode;
+ if (deliveryMode instanceof String s) {
if ("PERSISTENT".equalsIgnoreCase(s)) {
mode = DeliveryMode.PERSISTENT;
} else if ("NON_PERSISTENT".equalsIgnoreCase(s)) {
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
index 393e6b061b1..a2755c5b981 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsPollingConsumer.java
@@ -80,8 +80,7 @@ public class JmsPollingConsumer extends PollingConsumerSupport {
}
protected void setReceiveTimeout(long timeout) {
- if (template instanceof JmsTemplate) {
- JmsTemplate jmsTemplate = (JmsTemplate) template;
+ if (template instanceof JmsTemplate jmsTemplate) {
jmsTemplate.setReceiveTimeout(timeout);
} else {
throw new IllegalArgumentException(
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
index 46e8abde90c..f0b38161cbd 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsProducer.java
@@ -368,8 +368,7 @@ public class JmsProducer extends DefaultAsyncProducer {
// the reply to is a String, so we need to look up its Destination instance
// and if needed create the destination using the session if needed to
- if (jmsReplyTo instanceof String) {
- String replyTo = (String) jmsReplyTo;
+ if (jmsReplyTo instanceof String replyTo) {
// we need to null it as we use the String to resolve it as a Destination instance
jmsReplyTo = resolveOrCreateDestination(replyTo, session);
}
@@ -379,8 +378,8 @@ public class JmsProducer extends DefaultAsyncProducer {
String replyToOverride = endpoint.getConfiguration().getReplyToOverride();
if (replyToOverride != null) {
replyTo = resolveOrCreateDestination(replyToOverride, session);
- } else if (jmsReplyTo instanceof Destination) {
- replyTo = (Destination) jmsReplyTo;
+ } else if (jmsReplyTo instanceof Destination destinationD) {
+ replyTo = destinationD;
}
if (replyTo != null) {
LOG.debug("Using JMSReplyTo destination: {}", replyTo);
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 ea54a9d7b2e..fffc609d9d2 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
@@ -200,11 +200,11 @@ public abstract class ReplyManagerSupport extends ServiceSupport implements Repl
response.setHeader(JmsConstants.JMS_DESTINATION_NAME_PRODUCED, to);
}
- if (endpoint.isTransferException() && body instanceof Exception) {
+ if (endpoint.isTransferException() && body instanceof Exception exception) {
log.debug("Reply was an Exception. Setting the Exception on the Exchange: {}", body);
// we got an exception back and endpoint was configured to transfer exception
// therefore set response as exception
- exchange.setException((Exception) body);
+ exchange.setException(exception);
} else {
log.debug("Reply received. OUT message body set to reply payload: {}", body);
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
index 5efb34fde34..3baedf60fc4 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsEndpointConfigurationTest.java
@@ -52,6 +52,7 @@ import org.springframework.jms.support.converter.SimpleMessageConverter;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -229,7 +230,7 @@ public class JmsEndpointConfigurationTest implements CamelTestSupportHelper {
assertNotNull(producer, "The producer should not be null");
JmsConsumer consumer = endpoint.createConsumer(dummyProcessor);
JmsOperations operations = consumer.getEndpointMessageListener().getTemplate();
- assertTrue(operations instanceof JmsTemplate);
+ assertInstanceOf(JmsTemplate.class, operations);
JmsTemplate template = (JmsTemplate) operations;
assertEquals(DeliveryMode.NON_PERSISTENT, template.getDeliveryMode(),
"Wrong delivery mode on reply template; expected " + " DeliveryMode.NON_PERSISTENT but was DeliveryMode.PERSISTENT");
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 7aced40fe8b..af3f322dfe5 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
@@ -42,8 +42,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
@Timeout(60)
public class JmsInOutTransferExchangeTest extends AbstractJMSTest {
@@ -97,12 +97,12 @@ public class JmsInOutTransferExchangeTest extends AbstractJMSTest {
Exchange transferExchange = transfer.getExchanges().get(0);
Exchange exchange = createExchangeWithBody(null);
- assertTrue(transferExchange.getIn() instanceof JmsMessage);
+ assertInstanceOf(JmsMessage.class, transferExchange.getIn());
JmsMessage transferMessage = transferExchange.getIn(JmsMessage.class);
ActiveMQObjectMessage transferActiveMQMessage = (ActiveMQObjectMessage) transferMessage.getJmsMessage();
- assertTrue(transferActiveMQMessage.getObject() instanceof DefaultExchangeHolder);
+ assertInstanceOf(DefaultExchangeHolder.class, transferActiveMQMessage.getObject());
DefaultExchangeHolder exchangeHolder = (DefaultExchangeHolder) transferActiveMQMessage.getObject();
DefaultExchangeHolder.unmarshal(exchange, exchangeHolder);
@@ -114,7 +114,7 @@ public class JmsInOutTransferExchangeTest extends AbstractJMSTest {
assertEquals("PropertyValue", exchange.getProperty("PropertyName"));
Exchange resultExchange = result.getExchanges().get(0);
- assertTrue(resultExchange.getIn() instanceof JmsMessage);
+ assertInstanceOf(JmsMessage.class, resultExchange.getIn());
JmsMessage resultMessage = resultExchange.getIn(JmsMessage.class);
ActiveMQObjectMessage resultActiveMQMessage = (ActiveMQObjectMessage) resultMessage.getJmsMessage();
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/activemq/ActiveMQOriginalDestinationIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/activemq/ActiveMQOriginalDestinationIT.java
index 0e25674c2c6..1fc96840e4f 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/activemq/ActiveMQOriginalDestinationIT.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/activemq/ActiveMQOriginalDestinationIT.java
@@ -129,10 +129,7 @@ public class ActiveMQOriginalDestinationIT extends AbstractJMSTest {
@Override
public void onMessageCreated(Message message, Session session, Exchange exchange, Throwable cause) {
if (exchange.getIn() instanceof JmsMessage) {
- JmsMessage msg = exchange.getIn(JmsMessage.class);
- Message jms = msg.getJmsMessage();
- if (message instanceof ActiveMQMessage) {
- ActiveMQMessage amq = (ActiveMQMessage) jms;
+ if (message instanceof ActiveMQMessage amq) {
ActiveMQDestination from = null;
try {
from = (ActiveMQDestination) amq.getJMSDestination();
@@ -140,9 +137,9 @@ public class ActiveMQOriginalDestinationIT extends AbstractJMSTest {
throw new RuntimeException(e);
}
- if (from != null && message instanceof ActiveMQMessage) {
+ if (from != null) {
try {
- ((ActiveMQMessage) message).setJMSDestination(amq.getJMSDestination());
+ amq.setJMSDestination(amq.getJMSDestination());
} catch (JMSException e) {
throw new RuntimeException(e);
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/AsyncJmsProducerExceptionInTXManualIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/AsyncJmsProducerExceptionInTXManualIT.java
index 8b6b5678be2..835b8aa15e3 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/AsyncJmsProducerExceptionInTXManualIT.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/issues/AsyncJmsProducerExceptionInTXManualIT.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
import org.springframework.transaction.TransactionException;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.fail;
/**
@@ -77,7 +77,7 @@ class AsyncJmsProducerExceptionInTXManualIT extends SpringJMSBasic {
fail("transaction should fail, otherwise looks like CAMEL-4616 has been emerged!");
} catch (CamelExecutionException e) {
Throwable cause = e.getCause();
- assertTrue(cause instanceof TransactionException);
+ assertInstanceOf(TransactionException.class, cause);
while (cause.getCause() != null) {
cause = cause.getCause();
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/AbstractTransactionIT.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/AbstractTransactionIT.java
index 3b198123cc5..b90091b7ed6 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/AbstractTransactionIT.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/integration/spring/tx/AbstractTransactionIT.java
@@ -94,13 +94,13 @@ public abstract class AbstractTransactionIT extends AbstractSpringJMSITSupport {
while (true) {
processor = unwrapDeadLetter(processor);
- if (processor instanceof Channel) {
- processor = ((Channel) processor).getNextProcessor();
- } else if (processor instanceof DelegateProcessor) {
+ if (processor instanceof Channel channel) {
+ processor = channel.getNextProcessor();
+ } else if (processor instanceof DelegateProcessor delegateProcessor) {
// TransactionInterceptor is a DelegateProcessor
- processor = ((DelegateProcessor) processor).getProcessor();
- } else if (processor instanceof Pipeline) {
- for (Processor p : ((Pipeline) processor).next()) {
+ processor = delegateProcessor.getProcessor();
+ } else if (processor instanceof Pipeline pipeline) {
+ for (Processor p : pipeline.next()) {
p = findProcessorByClass(p, findClass);
if (p != null && p.getClass().isAssignableFrom(findClass)) {
processor = p;
@@ -115,14 +115,14 @@ public abstract class AbstractTransactionIT extends AbstractSpringJMSITSupport {
private Processor unwrapDeadLetter(Processor processor) {
while (true) {
- if (processor instanceof Channel) {
- processor = ((Channel) processor).getNextProcessor();
- } else if (processor instanceof DeadLetterChannel) {
- processor = ((DeadLetterChannel) processor).getOutput();
- } else if (processor instanceof DefaultErrorHandler) {
- processor = ((DefaultErrorHandler) processor).getOutput();
- } else if (processor instanceof TransactionErrorHandler) {
- processor = ((TransactionErrorHandler) processor).getOutput();
+ if (processor instanceof Channel channel) {
+ processor = channel.getNextProcessor();
+ } else if (processor instanceof DeadLetterChannel deadLetterChannel) {
+ processor = deadLetterChannel.getOutput();
+ } else if (processor instanceof DefaultErrorHandler defaultErrorHandler) {
+ processor = defaultErrorHandler.getOutput();
+ } else if (processor instanceof TransactionErrorHandler transactionErrorHandler) {
+ processor = transactionErrorHandler.getOutput();
} else {
return processor;
}