You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/03/19 17:03:58 UTC
[camel] branch master updated: (chores): cleanup camel-activemq
tests (#5247)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 1575703 (chores): cleanup camel-activemq tests (#5247)
1575703 is described below
commit 1575703d99945d2dc7e5e6ce110e1cfb5187d30e
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Fri Mar 19 18:03:22 2021 +0100
(chores): cleanup camel-activemq tests (#5247)
- remove unused exceptions
- cleanup tests that check for exceptions thrown
- use log markers for the test log messages
- use simpler assertions when possible
- minor test cleanups: use lambdas when cleaner, fixed typos
- ensure tests have assertions
- remove a few unused methods
---
.../camel/component/activemq/AMQ2240Test.java | 79 ++++++++++------------
.../camel/component/activemq/AMQ2611Test.java | 2 +-
.../activemq/ActiveMQJmsHeaderRouteTest.java | 2 +-
.../activemq/AdvisoryConsumerExample.java | 7 +-
.../activemq/ComplexRequestReplyTest.java | 6 +-
.../apache/camel/component/activemq/DlqTest.java | 11 +--
...nvokeRequestReplyUsingJmsReplyToHeaderTest.java | 15 ++--
.../apache/camel/component/activemq/JmsBridge.java | 6 +-
.../activemq/JmsConsumeSendTransacted.java | 12 ++--
.../component/activemq/JmsJdbcXARollbackTest.java | 18 ++---
.../camel/component/activemq/JmsJdbcXATest.java | 12 ++--
.../activemq/JmsSimpleRequestReplyTest.java | 12 ++--
.../apache/camel/component/activemq/MyBean.java | 2 +-
.../camel/component/activemq/SetHeaderTest.java | 2 +-
.../component/activemq/TransactedConsumeTest.java | 7 +-
.../component/activemq/converter/ConsumerBean.java | 47 +++----------
.../converter/InvokeMessageListenerTest.java | 8 +--
17 files changed, 106 insertions(+), 142 deletions(-)
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2240Test.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2240Test.java
index 7299dc3..83f5d28 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2240Test.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2240Test.java
@@ -17,16 +17,18 @@
package org.apache.camel.component.activemq;
import org.apache.camel.CamelContext;
+import org.apache.camel.CamelExecutionException;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.activemq.AMQ2611Test.Consumer;
+import org.apache.camel.component.jms.JmsConfiguration;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class AMQ2240Test {
@@ -35,7 +37,7 @@ public class AMQ2240Test {
private CamelContext camelContext;
@AfterEach
- public void destroyCamelContext() throws Exception {
+ public void destroyCamelContext() {
if (camelContext != null) {
camelContext.stop();
camelContext = null;
@@ -43,51 +45,40 @@ public class AMQ2240Test {
}
@Test
- public void testBadVMTransportOptionsJMSPrefix() throws Exception {
-
- try {
- final String vmUri
- = "vm://localhost?" + "jms.redeliveryPolicy.maximumRedeliveries=0&"
- + "jms.redeliveryPolicy.initialRedeliveryDelay=500&"
- + "jms.useAsyncSend=false&jms.sendTimeout=ABC&" + "jms.maxXXXXReconnectAttempts=1&jms.timeout=3000";
-
- LOG.info("creating context with bad URI: " + vmUri);
- ActiveMQComponent amq = ActiveMQComponent.activeMQComponent(vmUri);
-
- amq.getConfiguration().getOrCreateConnectionFactory();
-
- fail("Should have received an exception from the bad URI.");
- } catch (Exception e) {
- // Expected
- }
+ public void testBadVMTransportOptionsJMSPrefix() {
+ final String vmUri = "vm://localhost?jms.redeliveryPolicy.maximumRedeliveries=0&"
+ + "jms.redeliveryPolicy.initialRedeliveryDelay=500&"
+ + "jms.useAsyncSend=false&jms.sendTimeout=ABC&"
+ + "jms.maxXXXXReconnectAttempts=1&jms.timeout=3000";
+
+ LOG.info("creating context with bad URI: {}", vmUri);
+ ActiveMQComponent amq = ActiveMQComponent.activeMQComponent(vmUri);
+
+ final JmsConfiguration configuration = amq.getConfiguration();
+ assertThrows(IllegalArgumentException.class, () -> configuration.getOrCreateConnectionFactory(),
+ "Should have received an exception from the bad URI.");
}
@Test
public void testBadVMTransportOptionsBrokerPrefix() throws Exception {
- try {
-
- final String vmUri = "vm://localhost?" + "broker.XXX=foo&broker.persistent=XXX&broker.useJmx=false";
-
- LOG.info("creating context with bad URI: " + vmUri);
- ActiveMQComponent amq = ActiveMQComponent.activeMQComponent(vmUri);
-
- camelContext = new DefaultCamelContext();
- camelContext.addComponent("activemq", amq);
- final String queueEndpointName = "activemq:queuetest.Queue";
- camelContext.addRoutes(new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from(queueEndpointName).bean(Consumer.class, "consume");
- }
- });
-
- camelContext.start();
- final ProducerTemplate producerTemplate = camelContext.createProducerTemplate();
- producerTemplate.sendBody(queueEndpointName, "message");
-
- fail("Should have received an exception from the bad URI.");
- } catch (Exception e) {
- // Expected
- }
+ final String vmUri = "vm://localhost?broker.XXX=foo&broker.persistent=XXX&broker.useJmx=false";
+
+ LOG.info("creating context with bad URI: {}", vmUri);
+ ActiveMQComponent amq = ActiveMQComponent.activeMQComponent(vmUri);
+
+ camelContext = new DefaultCamelContext();
+ camelContext.addComponent("activemq", amq);
+ final String queueEndpointName = "activemq:queuetest.Queue";
+ camelContext.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() {
+ from(queueEndpointName).bean(Consumer.class, "consume");
+ }
+ });
+
+ camelContext.start();
+ final ProducerTemplate producerTemplate = camelContext.createProducerTemplate();
+ assertThrows(CamelExecutionException.class, () -> producerTemplate.sendBody(queueEndpointName, "message"),
+ "Should have received an exception from the bad URI.");
}
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2611Test.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2611Test.java
index 182b5fe..a278b29 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2611Test.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AMQ2611Test.java
@@ -44,7 +44,7 @@ public class AMQ2611Test {
public static class Consumer {
public void consume(@Body String message) {
- LOG.info("consume message = " + message);
+ LOG.info("consume message = {}", message);
}
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
index 7dfe46c..8f5cf0e 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
@@ -66,7 +66,7 @@ public class ActiveMQJmsHeaderRouteTest extends CamelTestSupport {
List<Exchange> list = resultEndpoint.getReceivedExchanges();
Exchange exchange = list.get(0);
Object replyTo = exchange.getIn().getHeader("JMSReplyTo");
- LOG.info("Reply to is: " + replyTo);
+ LOG.info("Reply to is: {}", replyTo);
Destination destination = assertIsInstanceOf(Destination.class, replyTo);
assertEquals(replyQueue.toString(), destination.toString(), "ReplyTo");
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java
index 64b5f13..7af23fb 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/AdvisoryConsumerExample.java
@@ -26,11 +26,14 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.jms.JmsMessage;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
*/
public class AdvisoryConsumerExample extends CamelTestSupport {
+ private static final Logger LOG = LoggerFactory.getLogger(AdvisoryConsumerExample.class);
@Test
public void testWorks() throws Exception {
@@ -48,7 +51,7 @@ public class AdvisoryConsumerExample extends CamelTestSupport {
from("activemq:InitialQueue").to("log:Messages");
from("activemq:topic:ActiveMQ.Advisory.Queue?cacheLevelName=CACHE_CONSUMER").process(new Processor() {
- public void process(Exchange exchange) throws Exception {
+ public void process(Exchange exchange) {
Message in = exchange.getIn();
if (in instanceof JmsMessage) {
JmsMessage jmsMessage = (JmsMessage) in;
@@ -58,7 +61,7 @@ public class AdvisoryConsumerExample extends CamelTestSupport {
DataStructure structure = activeMQMessage.getDataStructure();
if (structure instanceof DestinationInfo) {
DestinationInfo destinationInfo = (DestinationInfo) structure;
- System.out.println("Received: " + destinationInfo);
+ LOG.info("Received: {}", destinationInfo);
}
}
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java
index 9cebabf..e761a56 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ComplexRequestReplyTest.java
@@ -66,7 +66,7 @@ public class ComplexRequestReplyTest {
}
@AfterEach
- public void tearDown() throws Exception {
+ public void tearDown() {
try {
shutdownBrokerA();
} catch (Exception ex) {
@@ -85,7 +85,7 @@ public class ComplexRequestReplyTest {
LOG.info("*** Sending Request 1");
String response = (String) requester.requestBody(fromEndpoint, "This is a request");
assertNotNull(response);
- LOG.info("Got response: " + response);
+ LOG.info("Got response: {}", response);
/**
* You actually don't need to restart the broker, just wait long enough and the next next send will take out a
@@ -106,7 +106,7 @@ public class ComplexRequestReplyTest {
LOG.info("*** Sending Request 2");
response = (String) requester.requestBody(fromEndpoint, "This is a request");
assertNotNull(response);
- LOG.info("Got response: " + response);
+ LOG.info("Got response: {}", response);
}
private CamelContext createSenderContext() throws Exception {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
index 64af2b8..715bbc9 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/DlqTest.java
@@ -46,12 +46,7 @@ public class DlqTest extends CamelSpringTestSupport {
LOG.info("Wait for dlq message...");
- assertTrue(Wait.waitFor(new Wait.Condition() {
- @Override
- public boolean isSatisified() throws Exception {
- return broker.getAdminView().getTotalEnqueueCount() == 2;
- }
- }));
+ assertTrue(Wait.waitFor(() -> broker.getAdminView().getTotalEnqueueCount() == 2));
}
private void sendJMSMessageToKickOffRoute() throws Exception {
@@ -67,7 +62,7 @@ public class DlqTest extends CamelSpringTestSupport {
connection.close();
}
- private BrokerService createBroker(boolean deleteAllMessages) throws Exception {
+ private BrokerService createBroker(boolean deleteAllMessages) {
BrokerService brokerService = new BrokerService();
brokerService.setDeleteAllMessagesOnStartup(deleteAllMessages);
brokerService.setBrokerName("testDlq");
@@ -93,7 +88,7 @@ public class DlqTest extends CamelSpringTestSupport {
}
public static class CanError {
- public String enrich(String body) throws Exception {
+ public String enrich(String body) {
LOG.info("Got body: " + body);
throw new RuntimeException("won't enrich today!");
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
index e60a23f..8b47422 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/InvokeRequestReplyUsingJmsReplyToHeaderTest.java
@@ -44,7 +44,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
*
*/
public class InvokeRequestReplyUsingJmsReplyToHeaderTest extends CamelTestSupport {
- private static final transient Logger LOG = LoggerFactory.getLogger(InvokeRequestReplyUsingJmsReplyToHeaderTest.class);
+ private static final transient Logger LOG = LoggerFactory
+ .getLogger(InvokeRequestReplyUsingJmsReplyToHeaderTest.class);
protected String replyQueueName = "queue://test.reply";
protected Object correlationID = "ABC-123";
protected Object groupID = "GROUP-XYZ";
@@ -72,9 +73,9 @@ public class InvokeRequestReplyUsingJmsReplyToHeaderTest extends CamelTestSuppor
Message in = reply.getIn();
Object replyTo = in.getHeader("JMSReplyTo");
- LOG.info("Reply to is: " + replyTo);
- LOG.info("Received headers: " + in.getHeaders());
- LOG.info("Received body: " + in.getBody());
+ LOG.info("Reply to is: {}", replyTo);
+ LOG.info("Received headers: {}", in.getHeaders());
+ LOG.info("Received body: {}", in.getBody());
assertMessageHeader(in, "JMSCorrelationID", correlationID);
@@ -84,7 +85,7 @@ public class InvokeRequestReplyUsingJmsReplyToHeaderTest extends CamelTestSuppor
assertThat(receivedHeaders, hasEntry("JMSCorrelationID", correlationID));
replyTo = receivedHeaders.get("JMSReplyTo");
- LOG.info("Reply to is: " + replyTo);
+ LOG.info("Reply to is: {}", replyTo);
Destination destination = assertIsInstanceOf(Destination.class, replyTo);
assertEquals(replyQueueName, destination.toString(), "ReplyTo");
}
@@ -103,7 +104,7 @@ public class InvokeRequestReplyUsingJmsReplyToHeaderTest extends CamelTestSuppor
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
- public void configure() throws Exception {
+ public void configure() {
from("activemq:test.server").bean(myBean);
}
};
@@ -114,7 +115,7 @@ public class InvokeRequestReplyUsingJmsReplyToHeaderTest extends CamelTestSuppor
public String process(@Headers Map<String, Object> headers, String body) {
this.headers = headers;
- LOG.info("process() invoked with headers: " + headers);
+ LOG.info("process() invoked with headers: {}", headers);
return "Hello " + body;
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
index 41b5a4f..696fdba 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsBridge.java
@@ -62,7 +62,7 @@ public class JmsBridge extends CamelSpringTestSupport {
consumeMessages();
- LOG.info("ConnectionCount: " + connectionCount.get());
+ LOG.info("ConnectionCount: {}", connectionCount.get());
assertEquals(5 + errorLimit, connectionCount.get(), "x connections");
}
@@ -121,7 +121,9 @@ public class JmsBridge extends CamelSpringTestSupport {
brokerSub = createBroker("sub", 61617, true);
brokerSub.setPlugins(new BrokerPlugin[] { new BrokerPluginSupport() {
@Override
- public void send(ProducerBrokerExchange producerExchange, org.apache.activemq.command.Message messageSend)
+ public void send(
+ ProducerBrokerExchange producerExchange,
+ org.apache.activemq.command.Message messageSend)
throws Exception {
if (sendCount.incrementAndGet() <= errorLimit) {
throw new RuntimeException("You need to try send " + errorLimit + " times!");
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
index 974dfdb..c30d0f5 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsConsumeSendTransacted.java
@@ -31,9 +31,12 @@ import org.junit.jupiter.api.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
public class JmsConsumeSendTransacted extends CamelSpringTestSupport {
BrokerService broker;
- int messageCount;
+ final int messagesSent = 1;
+ int messagesToConsume;
@Test
public void testTransactedRoute() throws Exception {
@@ -41,6 +44,7 @@ public class JmsConsumeSendTransacted extends CamelSpringTestSupport {
// camel route will use a single transaction for send and and ack
consumeMessages();
+ assertEquals(0, messagesToConsume, "Some messages were not consumed");
}
private void consumeMessages() throws Exception {
@@ -52,7 +56,7 @@ public class JmsConsumeSendTransacted extends CamelSpringTestSupport {
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer consumer = session.createConsumer(new ActiveMQQueue("to"));
- int messagesToConsume = messageCount;
+ messagesToConsume = messagesSent;
while (messagesToConsume > 0) {
Message message = consumer.receive(5000);
if (message != null) {
@@ -68,8 +72,8 @@ public class JmsConsumeSendTransacted extends CamelSpringTestSupport {
connection.start();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer producer = session.createProducer(new ActiveMQQueue("from"));
- TextMessage message = session.createTextMessage("Some Text, messageCount:" + messageCount++);
- message.setIntProperty("seq", messageCount);
+ TextMessage message = session.createTextMessage("Some Text, messageCount:" + messagesSent);
+ message.setIntProperty("seq", messagesSent);
producer.send(message);
connection.close();
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
index 9f46182..7821cef 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXARollbackTest.java
@@ -58,9 +58,8 @@ public class JmsJdbcXARollbackTest extends CamelSpringTestSupport {
public java.sql.Connection initDb() throws Exception {
String createStatement = "CREATE TABLE SCP_INPUT_MESSAGES (" + "id int NOT NULL GENERATED ALWAYS AS IDENTITY, "
- + "messageId varchar(96) NOT NULL, "
- + "messageCorrelationId varchar(96) NOT NULL, " + "messageContent varchar(2048) NOT NULL, "
- + "PRIMARY KEY (id) )";
+ + "messageId varchar(96) NOT NULL, " + "messageCorrelationId varchar(96) NOT NULL, "
+ + "messageContent varchar(2048) NOT NULL, " + "PRIMARY KEY (id) )";
java.sql.Connection conn = getJDBCConnection();
try {
@@ -88,8 +87,8 @@ public class JmsJdbcXARollbackTest extends CamelSpringTestSupport {
ResultSet resultSet = jdbcConn.createStatement().executeQuery("SELECT * FROM SCP_INPUT_MESSAGES");
while (resultSet.next()) {
count++;
- LOG.info("message - seq:" + resultSet.getInt(1) + ", id: " + resultSet.getString(2) + ", corr: "
- + resultSet.getString(3) + ", content: " + resultSet.getString(4));
+ LOG.info("message - seq: {}, id: {}, corr: {}, content: {}", resultSet.getInt(1), resultSet.getString(2),
+ resultSet.getString(3), resultSet.getString(4));
}
return count;
}
@@ -127,7 +126,8 @@ public class JmsJdbcXARollbackTest extends CamelSpringTestSupport {
}
private void initTMRef() {
- transactionManager[0] = getMandatoryBean(JtaTransactionManager.class, "jtaTransactionManager").getTransactionManager();
+ transactionManager[0] = getMandatoryBean(JtaTransactionManager.class, "jtaTransactionManager")
+ .getTransactionManager();
}
@@ -174,10 +174,10 @@ public class JmsJdbcXARollbackTest extends CamelSpringTestSupport {
public static class MarkRollbackOnly {
public String enrich(Exchange exchange) throws Exception {
- LOG.info("Got exchange: " + exchange);
- LOG.info("Got message: " + ((JmsMessage) exchange.getIn()).getJmsMessage());
+ LOG.info("Got exchange: {}", exchange);
+ LOG.info("Got message: {}", ((JmsMessage) exchange.getIn()).getJmsMessage());
- LOG.info("Current tx: " + transactionManager[0].getTransaction());
+ LOG.info("Current tx: {}", transactionManager[0].getTransaction());
LOG.info("Marking rollback only...");
transactionManager[0].getTransaction().setRollbackOnly();
return "Some Text";
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
index 4a4fed7..8c49ee4 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsJdbcXATest.java
@@ -55,9 +55,8 @@ public class JmsJdbcXATest extends CamelSpringTestSupport {
public java.sql.Connection initDb() throws Exception {
String createStatement = "CREATE TABLE SCP_INPUT_MESSAGES (" + "id int NOT NULL GENERATED ALWAYS AS IDENTITY, "
- + "messageId varchar(96) NOT NULL, "
- + "messageCorrelationId varchar(96) NOT NULL, " + "messageContent varchar(2048) NOT NULL, "
- + "PRIMARY KEY (id) )";
+ + "messageId varchar(96) NOT NULL, " + "messageCorrelationId varchar(96) NOT NULL, "
+ + "messageContent varchar(2048) NOT NULL, " + "PRIMARY KEY (id) )";
java.sql.Connection conn = getJDBCConnection();
try {
@@ -85,8 +84,8 @@ public class JmsJdbcXATest extends CamelSpringTestSupport {
ResultSet resultSet = jdbcConn.createStatement().executeQuery("SELECT * FROM SCP_INPUT_MESSAGES");
while (resultSet.next()) {
count++;
- LOG.info("message - seq:" + resultSet.getInt(1) + ", id: " + resultSet.getString(2) + ", corr: "
- + resultSet.getString(3) + ", content: " + resultSet.getString(4));
+ LOG.info("message - seq: {}, id: {}, corr: {}, content: {}", resultSet.getInt(1), resultSet.getString(2),
+ resultSet.getString(3), resultSet.getString(4));
}
return count;
}
@@ -175,7 +174,8 @@ public class JmsJdbcXATest extends CamelSpringTestSupport {
broker = createBroker(true);
broker.setPlugins(new BrokerPlugin[] { new BrokerPluginSupport() {
@Override
- public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase) throws Exception {
+ public void commitTransaction(ConnectionContext context, TransactionId xid, boolean onePhase)
+ throws Exception {
if (onePhase) {
super.commitTransaction(context, xid, onePhase);
} else {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
index eeca9cf..6f81829 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JmsSimpleRequestReplyTest.java
@@ -21,8 +21,6 @@ import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.pool.PooledConnectionFactory;
import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit5.CamelTestSupport;
@@ -73,12 +71,10 @@ public class JmsSimpleRequestReplyTest extends CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
- public void configure() throws Exception {
- from("activemq:queue:hello").process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- exchange.getIn().setBody("Bye World");
- assertNotNull(exchange.getIn().getHeader("JMSReplyTo"));
- }
+ public void configure() {
+ from("activemq:queue:hello").process(exchange -> {
+ exchange.getIn().setBody("Bye World");
+ assertNotNull(exchange.getIn().getHeader("JMSReplyTo"));
}).to("mock:result");
}
};
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/MyBean.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/MyBean.java
index 9317b1a..8492aa4 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/MyBean.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/MyBean.java
@@ -20,7 +20,7 @@ public class MyBean {
private boolean invoked;
- public void doSomething(Object body) throws Exception {
+ public void doSomething(Object body) {
invoked = true;
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java
index 3b16d84..40d9c53 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/SetHeaderTest.java
@@ -58,7 +58,7 @@ public class SetHeaderTest {
List<Exchange> list = expectedEndpoint.getReceivedExchanges();
for (Exchange exchange : list) {
Object body = exchange.getIn().getBody();
- LOG.debug("Received: body: " + body + " of type: " + ObjectHelper.className(body) + " on: " + exchange);
+ LOG.debug("Received: body: {} of type: {} on: {}", body, ObjectHelper.className(body), exchange);
}
}
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
index fe26341..87ecfb3 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/TransactedConsumeTest.java
@@ -64,7 +64,7 @@ public class TransactedConsumeTest extends CamelSpringTestSupport {
}
}, 20 * 60 * 1000));
long duration = System.currentTimeMillis() - firstConsumed.get();
- LOG.info("Done message consumption in " + duration + "millis");
+ LOG.info("Done message consumption in {} millis", duration);
}
private void sendJMSMessageToKickOffRoute() throws Exception {
@@ -98,7 +98,8 @@ public class TransactedConsumeTest extends CamelSpringTestSupport {
// AMQPersistenceAdapter amq = new AMQPersistenceAdapter();
// amq.setDirectory(new File("target/data"));
// brokerService.setPersistenceAdapter(amq);
- KahaDBPersistenceAdapter kahaDBPersistenceAdapter = (KahaDBPersistenceAdapter) brokerService.getPersistenceAdapter();
+ KahaDBPersistenceAdapter kahaDBPersistenceAdapter = (KahaDBPersistenceAdapter) brokerService
+ .getPersistenceAdapter();
kahaDBPersistenceAdapter.setJournalDiskSyncStrategy(Journal.JournalDiskSyncStrategy.NEVER.toString());
brokerService.addConnector("tcp://localhost:61616");
return brokerService;
@@ -136,7 +137,7 @@ public class TransactedConsumeTest extends CamelSpringTestSupport {
ActiveMQTextMessage m = (ActiveMQTextMessage) ((JmsMessage) exchange.getIn()).getJmsMessage();
// Thread.currentThread().sleep(500);
if (consumed.get() % 500 == 0) {
- LOG.info("received on " + m.getConnection().toString());
+ LOG.info("received on {}", m.getConnection());
}
}
}
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
index f066309..329178d 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/ConsumerBean.java
@@ -36,10 +36,6 @@ public class ConsumerBean implements MessageListener {
public ConsumerBean() {
}
- public ConsumerBean(String id) {
- this.id = id;
- }
-
public List<Message> flushMessages() {
List<Message> answer = null;
synchronized (this.messages) {
@@ -53,43 +49,22 @@ public class ConsumerBean implements MessageListener {
synchronized (this.messages) {
this.messages.add(message);
if (this.verbose) {
- LOG.info("" + this.id + "Received: " + message);
+ LOG.info("{} Received: {}", this.id, message);
}
this.messages.notifyAll();
}
}
- public void waitForMessageToArrive() {
- LOG.info("Waiting for message to arrive");
- long start = System.currentTimeMillis();
-
- try {
- if (this.hasReceivedMessage()) {
- synchronized (this.messages) {
- this.messages.wait(4000L);
- }
- }
- } catch (InterruptedException var6) {
- LOG.info("Caught: " + var6);
- }
-
- long end = System.currentTimeMillis() - start;
- LOG.info("End of wait for " + end + " millis");
- }
-
- public void waitForMessagesToArrive(int messageCount) {
- this.waitForMessagesToArrive(messageCount, 120000L);
- }
-
public void waitForMessagesToArrive(int messageCount, long maxWaitTime) {
- long maxRemainingMessageCount = (long) Math.max(0, messageCount - this.messages.size());
- LOG.info("Waiting for (" + maxRemainingMessageCount + ") message(s) to arrive");
+ long maxRemainingMessageCount = getRemaining(messageCount);
+ LOG.info("Waiting for ({}) message(s) to arrive", maxRemainingMessageCount);
long start = System.currentTimeMillis();
for (long endTime = start + maxWaitTime;
maxRemainingMessageCount > 0L;
- maxRemainingMessageCount = (long) Math.max(0, messageCount - this.messages.size())) {
+ maxRemainingMessageCount = getRemaining(
+ messageCount)) {
try {
synchronized (this.messages) {
this.messages.wait(1000L);
@@ -99,20 +74,16 @@ public class ConsumerBean implements MessageListener {
break;
}
} catch (InterruptedException var13) {
- LOG.info("Caught: " + var13);
+ LOG.info("Caught: {}", var13);
}
}
long end = System.currentTimeMillis() - start;
- LOG.info("End of wait for " + end + " millis");
+ LOG.info("End of wait for {} millis", end);
}
- public void assertMessagesArrived(int total) {
- this.waitForMessagesToArrive(total);
- synchronized (this.messages) {
- int count = this.messages.size();
- assertEquals((long) total, (long) count, "Messages received");
- }
+ private long getRemaining(int messageCount) {
+ return Math.max(0, messageCount - this.messages.size());
}
public void assertMessagesArrived(int total, long maxWaitTime) {
diff --git a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
index 974ecae..9ad0e38 100644
--- a/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
+++ b/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/converter/InvokeMessageListenerTest.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
import static org.apache.camel.component.activemq.ActiveMQComponent.activeMQComponent;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
/**
*
@@ -50,13 +50,13 @@ public class InvokeMessageListenerTest extends CamelTestSupport {
listener.assertMessagesArrived(1, 5000);
List<Message> list = listener.flushMessages();
- assertTrue(!list.isEmpty(), "Should have received some messages!");
+ assertFalse(list.isEmpty(), "Should have received some messages!");
Message message = list.get(0);
- LOG.debug("Received: " + message);
+ LOG.debug("Received: {}", message);
TextMessage textMessage = assertIsInstanceOf(TextMessage.class, message);
- assertEquals(expectedBody, textMessage.getText(), "Text mesage body: " + textMessage);
+ assertEquals(expectedBody, textMessage.getText(), "Text message body: " + textMessage);
}
@Override