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/01/29 14:01:00 UTC
(camel) 01/02: (chores) camel-spring-rabbitmq: minor code cleanups
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 976a37ff52dcc8c42056e28a9b33edaf0d843ab8
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Jan 29 13:34:30 2024 +0100
(chores) camel-spring-rabbitmq: minor code cleanups
- Simplify/correct test assertions
- Use final when possible
---
.../springrabbit/SpringRabbitPollingConsumer.java | 4 ++--
.../integration/RabbitMQProducerIT.java | 21 +++++++++++++--------
.../RabbitMQProducerInvalidExchangeIT.java | 12 ++++--------
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitPollingConsumer.java b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitPollingConsumer.java
index f055f764bb4..200477c49d1 100644
--- a/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitPollingConsumer.java
+++ b/components/camel-spring-rabbitmq/src/main/java/org/apache/camel/component/springrabbit/SpringRabbitPollingConsumer.java
@@ -24,8 +24,8 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate;
public class SpringRabbitPollingConsumer extends PollingConsumerSupport {
- private RabbitTemplate template;
- private SpringRabbitMQEndpoint jmsEndpoint;
+ private final RabbitTemplate template;
+ private final SpringRabbitMQEndpoint jmsEndpoint;
public SpringRabbitPollingConsumer(SpringRabbitMQEndpoint endpoint, RabbitTemplate template) {
super(endpoint);
diff --git a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQProducerIT.java b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQProducerIT.java
index 878e95d20e9..d3ed4743268 100644
--- a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQProducerIT.java
+++ b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQProducerIT.java
@@ -75,7 +75,10 @@ public class RabbitMQProducerIT extends RabbitMQITSupport {
AmqpTemplate template = new RabbitTemplate(cf);
Message out = template.receive("myqueue");
- Assertions.assertEquals("Hello World", new String(out.getBody()));
+
+ byte[] body = out.getBody();
+ Assertions.assertNotNull(body, "The body should not be null");
+ Assertions.assertEquals("Hello World", new String(body));
Assertions.assertEquals("gouda", out.getMessageProperties().getHeader("cheese"));
}
@@ -130,15 +133,17 @@ public class RabbitMQProducerIT extends RabbitMQITSupport {
AmqpTemplate template = new RabbitTemplate(cf);
Message out = template.receive("myqueue");
- String encoding = out.getMessageProperties().getContentEncoding();
+ final MessageProperties messageProperties = out.getMessageProperties();
+ Assertions.assertNotNull(messageProperties, "The message properties should not be null");
+ String encoding = messageProperties.getContentEncoding();
Assertions.assertEquals(Charset.defaultCharset().name(), encoding);
Assertions.assertEquals("<price>123</price>", new String(out.getBody(), encoding));
- Assertions.assertEquals(MessageDeliveryMode.PERSISTENT, out.getMessageProperties().getReceivedDeliveryMode());
- Assertions.assertEquals("price", out.getMessageProperties().getType());
- Assertions.assertEquals("application/xml", out.getMessageProperties().getContentType());
- Assertions.assertEquals("0fe9c142-f9c1-426f-9237-f5a4c988a8ae", out.getMessageProperties().getMessageId());
- Assertions.assertEquals(1, out.getMessageProperties().getPriority());
- Assertions.assertEquals(0, out.getMessageProperties().getHeaders().size());
+ Assertions.assertEquals(MessageDeliveryMode.PERSISTENT, messageProperties.getReceivedDeliveryMode());
+ Assertions.assertEquals("price", messageProperties.getType());
+ Assertions.assertEquals("application/xml", messageProperties.getContentType());
+ Assertions.assertEquals("0fe9c142-f9c1-426f-9237-f5a4c988a8ae", messageProperties.getMessageId());
+ Assertions.assertEquals(1, messageProperties.getPriority());
+ Assertions.assertEquals(0, messageProperties.getHeaders().size());
}
@Override
diff --git a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQProducerInvalidExchangeIT.java b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQProducerInvalidExchangeIT.java
index 694a5af2ec1..efa4e5aef01 100644
--- a/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQProducerInvalidExchangeIT.java
+++ b/components/camel-spring-rabbitmq/src/test/java/org/apache/camel/component/springrabbit/integration/RabbitMQProducerInvalidExchangeIT.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.springrabbit.integration;
import com.rabbitmq.client.ShutdownSignalException;
+import org.apache.camel.CamelExecutionException;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Assertions;
@@ -28,8 +29,6 @@ import org.springframework.amqp.core.TopicExchange;
import org.springframework.amqp.rabbit.connection.ConnectionFactory;
import org.springframework.amqp.rabbit.core.RabbitAdmin;
-import static org.junit.Assert.fail;
-
public class RabbitMQProducerInvalidExchangeIT extends RabbitMQITSupport {
@Override
@@ -49,12 +48,9 @@ public class RabbitMQProducerInvalidExchangeIT extends RabbitMQITSupport {
admin.declareExchange(t);
admin.declareBinding(BindingBuilder.bind(q).to(t).with("foo.bar.#"));
- try {
- template.sendBody("direct:start", "Hello World");
- fail("Should fail");
- } catch (Exception e) {
- Assertions.assertInstanceOf(ShutdownSignalException.class, e.getCause());
- }
+ final CamelExecutionException exception = Assertions.assertThrows(CamelExecutionException.class,
+ () -> template.sendBody("direct:start", "Hello World"));
+ Assertions.assertInstanceOf(ShutdownSignalException.class, exception.getCause());
}
@Override