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 2023/07/11 19:20:57 UTC
[camel] branch main updated: CAMEL-19598: camel-amqp test 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
The following commit(s) were added to refs/heads/main by this push:
new 1d168b94dd4 CAMEL-19598: camel-amqp test code cleanups
1d168b94dd4 is described below
commit 1d168b94dd4e90eaee7199dcc3dec09b6e18a7ac
Author: Nikita Konovalov <nk...@redhat.com>
AuthorDate: Tue Jul 11 15:21:44 2023 +0200
CAMEL-19598: camel-amqp test code cleanups
- Added final where possible
- Deleted redundant exception throws
- Fixed outdated concatenation with empty strings
---
.../test/java/org/apache/camel/component/amqp/AMQPRouteTest.java | 4 ++--
.../org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java | 4 ++--
.../org/apache/camel/component/amqp/AMQPToDSendDynamicTest.java | 6 +++---
.../src/test/java/org/apache/camel/component/amqp/AMQPToDTest.java | 6 +++---
.../apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index a15016ad5f4..b195def9858 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -46,7 +46,7 @@ public class AMQPRouteTest extends AMQPTestSupport {
private ProducerTemplate template;
private MockEndpoint resultEndpoint;
- private String expectedBody = "Hello there!";
+ private final String expectedBody = "Hello there!";
@BeforeEach
void setupTemplate() {
@@ -143,7 +143,7 @@ public class AMQPRouteTest extends AMQPTestSupport {
@ContextFixture
public void configureContext(CamelContext context) {
- System.setProperty(AMQPConnectionDetails.AMQP_PORT, service.brokerPort() + "");
+ System.setProperty(AMQPConnectionDetails.AMQP_PORT, String.valueOf(service.brokerPort()));
context.getRegistry().bind("amqpConnection", discoverAMQP(context));
context.addComponent("amqp-customized", amqpComponent(service.serviceAddress()));
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java
index dc146002a6f..db8cdf02ef8 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTraceFrameTest.java
@@ -44,7 +44,7 @@ public class AMQPRouteTraceFrameTest extends AMQPTestSupport {
private MockEndpoint resultEndpoint;
- private String expectedBody = "Hello there!";
+ private final String expectedBody = "Hello there!";
private ProducerTemplate template;
@BeforeEach
@@ -64,7 +64,7 @@ public class AMQPRouteTraceFrameTest extends AMQPTestSupport {
@ContextFixture
public void configureContext(CamelContext context) {
- System.setProperty(AMQPConnectionDetails.AMQP_PORT, service.brokerPort() + "");
+ System.setProperty(AMQPConnectionDetails.AMQP_PORT, String.valueOf(service.brokerPort()));
context.getRegistry().bind("amqpConnection", discoverAMQP(context));
JmsConnectionFactory connectionFactory
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDSendDynamicTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDSendDynamicTest.java
index d39cda81516..ef46af29b7a 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDSendDynamicTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDSendDynamicTest.java
@@ -51,8 +51,8 @@ public class AMQPToDSendDynamicTest extends AMQPTestSupport {
}
@BeforeAll
- static void startContext() throws Exception {
- System.setProperty(AMQPConnectionDetails.AMQP_PORT, service.brokerPort() + "");
+ static void startContext() {
+ System.setProperty(AMQPConnectionDetails.AMQP_PORT, String.valueOf(service.brokerPort()));
}
@BeforeEach
@@ -63,7 +63,7 @@ public class AMQPToDSendDynamicTest extends AMQPTestSupport {
@ContextFixture
public void configureContext(CamelContext camelContext) {
- System.setProperty(AMQPConnectionDetails.AMQP_PORT, service.brokerPort() + "");
+ System.setProperty(AMQPConnectionDetails.AMQP_PORT, String.valueOf(service.brokerPort()));
camelContext.getRegistry().bind("amqpConnection", discoverAMQP(camelContext));
}
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDTest.java
index 4edc7e967df..d8dc61fcc3a 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDTest.java
@@ -43,8 +43,8 @@ public class AMQPToDTest extends AMQPTestSupport {
}
@BeforeAll
- static void startContext() throws Exception {
- System.setProperty(AMQPConnectionDetails.AMQP_PORT, service.brokerPort() + "");
+ static void startContext() {
+ System.setProperty(AMQPConnectionDetails.AMQP_PORT, String.valueOf(service.brokerPort()));
}
@BeforeEach
@@ -54,7 +54,7 @@ public class AMQPToDTest extends AMQPTestSupport {
@ContextFixture
public void configureContext(CamelContext camelContext) {
- System.setProperty(AMQPConnectionDetails.AMQP_PORT, service.brokerPort() + "");
+ System.setProperty(AMQPConnectionDetails.AMQP_PORT, String.valueOf(service.brokerPort()));
camelContext.getRegistry().bind("amqpConnection", discoverAMQP(camelContext));
}
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java
index 806cff27e7e..4bd63d0f4b3 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/artemis/AMQPEmbeddedBrokerTest.java
@@ -49,7 +49,7 @@ public class AMQPEmbeddedBrokerTest {
private MockEndpoint resultEndpoint;
- private String expectedBody = "Hello there!";
+ private final String expectedBody = "Hello there!";
@BeforeEach
void prepareTest() {
@@ -65,8 +65,8 @@ public class AMQPEmbeddedBrokerTest {
}
@ContextFixture
- public static void setupRoutes(CamelContext context) throws Exception {
- System.setProperty(AMQP_PORT, service.brokerPort() + "");
+ public static void setupRoutes(CamelContext context) {
+ System.setProperty(AMQP_PORT, String.valueOf(service.brokerPort()));
System.setProperty(AMQP_SET_TOPIC_PREFIX, "false");
context.getRegistry().bind("amqpConnection", discoverAMQP(context));