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 5eac8d158bb (chores) camel-jms: rename a few resources to ensure
uniqueness
5eac8d158bb is described below
commit 5eac8d158bba860997615781a1d8897de8a3f3af
Author: Otavio Rodolfo Piske <angusyo...@gmail.com>
AuthorDate: Wed Aug 17 15:34:54 2022 +0200
(chores) camel-jms: rename a few resources to ensure uniqueness
---
...ailoverWithForceSendOriginalJmsMessageTest.java | 20 +++++++++--------
...OnCompletionAndInterceptAndOnExceptionTest.java | 6 +++---
.../camel/component/jms/JmsOnCompletionTest.java | 6 +++---
.../component/jms/JmsRoutingSlipInOutTest.java | 11 +++++-----
.../component/jms/ManagedJmsEndpointTest.java | 14 ++++++------
.../jms/ReplyToDestinationSelectorNameTest.java | 7 +++---
.../SimpleJmsRequestReplyExclusiveReplyToTest.java | 25 +++++++++++++++-------
.../SimpleJmsRequestReplySharedReplyToTest.java | 15 ++++++-------
.../jms/async/AsyncConsumerFalseTest.java | 6 +++---
.../jms/async/AsyncConsumerInOutTwoTest.java | 6 ++++--
.../component/jms/async/AsyncConsumerTest.java | 6 +++---
.../jms/issues/JmsInOutRoutingSlipTest.java | 5 +++--
.../JmsInOutUseMessageIDasCorrelationIDTest.java | 22 +++++++++++--------
.../JmsMessageHeaderContentBasedRouterTest.java | 4 ++--
.../jms/issues/JmsReplyToLoopIssueTest.java | 11 +++++-----
15 files changed, 91 insertions(+), 73 deletions(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.java
index 8dd39c2d3d3..1edc039375e 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.java
@@ -49,7 +49,8 @@ public class
JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest extends A
resultMock.expectedMessageCount(1);
resultMock.expectedHeaderReceived("foo", "bar");
- String out = template.requestBodyAndHeader("jms:queue:start", "Hello
World", "foo", "bar", String.class);
+ String out =
template.requestBodyAndHeader("jms:queue:JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.start",
+ "Hello World", "foo", "bar", String.class);
assertEquals("Hello Back", out);
assertMockEndpointsSatisfied();
@@ -78,7 +79,8 @@ public class
JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest extends A
resultMock.expectedMessageCount(1);
resultMock.expectedHeaderReceived("foo", "bar");
- out = template.requestBodyAndHeader("jms:queue:start", "Hello World",
"foo", "bar", String.class);
+ out =
template.requestBodyAndHeader("jms:queue:JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.start",
+ "Hello World", "foo", "bar", String.class);
assertEquals("Bye World", out);
assertMockEndpointsSatisfied();
@@ -93,23 +95,23 @@ public class
JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest extends A
return new RouteBuilder() {
@Override
public void configure() {
- from("jms:queue:start?mapJmsMessage=false")
+
from("jms:queue:JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.start?mapJmsMessage=false")
.loadBalance().failover(-1, false, true)
- .to("jms:queue:one?forceSendOriginalMessage=" +
forceSendOriginalMessage)
- .to("jms:queue:two?forceSendOriginalMessage=" +
forceSendOriginalMessage)
- .to("jms:queue:three?forceSendOriginalMessage=" +
forceSendOriginalMessage)
+
.to("jms:queue:JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.one?forceSendOriginalMessage="
+ forceSendOriginalMessage)
+
.to("jms:queue:JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.two?forceSendOriginalMessage="
+ forceSendOriginalMessage)
+
.to("jms:queue:JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.three?forceSendOriginalMessage="
+ forceSendOriginalMessage)
.end()
.to("mock:result");
- from("jms:queue:one?mapJmsMessage=false")
+
from("jms:queue:JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.one?mapJmsMessage=false")
.to("mock:one")
.throwException(new IllegalArgumentException("Damn"));
- from("jms:queue:two?mapJmsMessage=false")
+
from("jms:queue:JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.two?mapJmsMessage=false")
.to("mock:two")
.transform().simple("Hello Back");
- from("jms:queue:three?mapJmsMessage=false")
+
from("jms:queue:JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.three?mapJmsMessage=false")
.to("mock:three")
.transform().simple("Bye World");
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionAndInterceptAndOnExceptionTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionAndInterceptAndOnExceptionTest.java
index 9258c1da19b..990b8bf4b49 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionAndInterceptAndOnExceptionTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionAndInterceptAndOnExceptionTest.java
@@ -40,7 +40,7 @@ public class JmsOnCompletionAndInterceptAndOnExceptionTest
extends AbstractJMSTe
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Bye World");
- template.sendBody("activemq:queue:start", "Hello World");
+
template.sendBody("activemq:queue:JmsOnCompletionAndInterceptAndOnExceptionTest.start",
"Hello World");
assertMockEndpointsSatisfied();
}
@@ -55,7 +55,7 @@ public class JmsOnCompletionAndInterceptAndOnExceptionTest
extends AbstractJMSTe
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(0);
- template.sendBody("activemq:queue:start", "Kabom");
+
template.sendBody("activemq:queue:JmsOnCompletionAndInterceptAndOnExceptionTest.start",
"Kabom");
assertMockEndpointsSatisfied();
}
@@ -73,7 +73,7 @@ public class JmsOnCompletionAndInterceptAndOnExceptionTest
extends AbstractJMSTe
// define an on exception
onException(Exception.class).to("mock:exception");
- from("activemq:queue:start")
+
from("activemq:queue:JmsOnCompletionAndInterceptAndOnExceptionTest.start")
.process(new MyProcessor())
.to("mock:result");
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionTest.java
index 551a02af07a..0c95915b424 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsOnCompletionTest.java
@@ -41,7 +41,7 @@ public class JmsOnCompletionTest extends AbstractJMSTest {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Bye World");
- template.sendBody("activemq:queue:start", "Hello World");
+ template.sendBody("activemq:queue:JmsOnCompletionTest.start", "Hello
World");
assertMockEndpointsSatisfied();
}
@@ -54,7 +54,7 @@ public class JmsOnCompletionTest extends AbstractJMSTest {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(0);
- template.sendBody("activemq:queue:start", "Kabom");
+ template.sendBody("activemq:queue:JmsOnCompletionTest.start", "Kabom");
assertMockEndpointsSatisfied();
}
@@ -65,7 +65,7 @@ public class JmsOnCompletionTest extends AbstractJMSTest {
@Override
public void configure() {
// START SNIPPET: e1
- from("activemq:queue:start")
+ from("activemq:queue:JmsOnCompletionTest.start")
.onCompletion()
// this route is only invoked when the original route
is complete as a kind
// of completion callback
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
index c6d3796bab4..99f4a1b86ac 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
@@ -42,7 +42,7 @@ public class JmsRoutingSlipInOutTest extends AbstractJMSTest {
public void testInOutRoutingSlip() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Result-Done-B-A-Hello");
- template.sendBody("activemq:queue:start", "Hello");
+ template.sendBody("activemq:queue:JmsRoutingSlipInOutTest.start",
"Hello");
assertMockEndpointsSatisfied();
}
@@ -63,15 +63,16 @@ public class JmsRoutingSlipInOutTest extends
AbstractJMSTest {
return new RouteBuilder() {
@Override
public void configure() {
-
from("activemq:queue:start").to("direct:start").to("bean:myBean?method=doResult").to("mock:result");
+
from("activemq:queue:JmsRoutingSlipInOutTest.start").to("direct:start").to("bean:myBean?method=doResult")
+ .to("mock:result");
from("direct:start").to("bean:myBean?method=createSlip").setExchangePattern(ExchangePattern.InOut)
.routingSlip(header("mySlip"))
.to("bean:myBean?method=backFromSlip");
- from("activemq:queue:a").to("bean:myBean?method=doA");
+
from("activemq:queue:JmsRoutingSlipInOutTest.a").to("bean:myBean?method=doA");
- from("activemq:queue:b").to("bean:myBean?method=doB");
+
from("activemq:queue:JmsRoutingSlipInOutTest.b").to("bean:myBean?method=doB");
}
};
}
@@ -79,7 +80,7 @@ public class JmsRoutingSlipInOutTest extends AbstractJMSTest {
public static final class MyBean {
public void createSlip(@Headers Map<String, Object> headers) {
- headers.put("mySlip", "activemq:queue:a,activemq:queue:b");
+ headers.put("mySlip",
"activemq:queue:JmsRoutingSlipInOutTest.a,activemq:queue:JmsRoutingSlipInOutTest.b");
}
public String backFromSlip(String body) {
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
index fb7c5aa3a04..1f6e3415b0a 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ManagedJmsEndpointTest.java
@@ -46,12 +46,14 @@ public class ManagedJmsEndpointTest extends
AbstractPersistentJMSTest {
MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> objectNames = mbeanServer.queryNames(
- new
ObjectName("org.apache.camel:context=camel-*,type=endpoints,name=\"activemq://queue:start\""),
null);
+ new ObjectName(
+
"org.apache.camel:context=camel-*,type=endpoints,name=\"activemq://queue:ManagedJmsEndpointTest\""),
+ null);
assertEquals(1, objectNames.size());
ObjectName name = objectNames.iterator().next();
String uri = (String) mbeanServer.getAttribute(name, "EndpointUri");
- assertEquals("activemq://queue:start", uri);
+ assertEquals("activemq://queue:ManagedJmsEndpointTest", uri);
Boolean singleton = (Boolean) mbeanServer.getAttribute(name,
"Singleton");
assertTrue(singleton);
@@ -64,8 +66,8 @@ public class ManagedJmsEndpointTest extends
AbstractPersistentJMSTest {
getMockEndpoint("mock:result").expectedMessageCount(2);
- template.sendBody("activemq:queue:start", "Hello World");
- template.sendBody("activemq:queue:start", "Bye World");
+ template.sendBody("activemq:queue:ManagedJmsEndpointTest", "Hello
World");
+ template.sendBody("activemq:queue:ManagedJmsEndpointTest", "Bye
World");
assertMockEndpointsSatisfied();
@@ -73,7 +75,7 @@ public class ManagedJmsEndpointTest extends
AbstractPersistentJMSTest {
context.getRouteController().stopRoute("foo");
// send a message to queue
- template.sendBody("activemq:queue:start", "Hi World");
+ template.sendBody("activemq:queue:ManagedJmsEndpointTest", "Hi World");
size = (Long) mbeanServer.invoke(name, "queueSize", null, null);
assertEquals(1, size.intValue());
@@ -88,7 +90,7 @@ public class ManagedJmsEndpointTest extends
AbstractPersistentJMSTest {
return new RouteBuilder() {
@Override
public void configure() {
-
from("activemq:queue:start").routeId("foo").to("log:foo").to("mock:result");
+
from("activemq:queue:ManagedJmsEndpointTest").routeId("foo").to("log:foo").to("mock:result");
}
};
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ReplyToDestinationSelectorNameTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ReplyToDestinationSelectorNameTest.java
index 922d9bfeedc..262c040536f 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/ReplyToDestinationSelectorNameTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/ReplyToDestinationSelectorNameTest.java
@@ -50,8 +50,7 @@ public class ReplyToDestinationSelectorNameTest extends
AbstractJMSTest {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory
- = createConnectionFactory(service);
+ ConnectionFactory connectionFactory = createConnectionFactory(service);
JmsComponent component =
jmsComponentAutoAcknowledge(connectionFactory);
camelContext.addComponent("activemq", component);
return camelContext;
@@ -63,10 +62,10 @@ public class ReplyToDestinationSelectorNameTest extends
AbstractJMSTest {
@Override
public void configure() {
from("direct:start")
-
.to("activemq:queue:foo?replyTo=queue:bar&replyToDestinationSelectorName=replyId")
+
.to("activemq:queue:ReplyToDestinationSelectorNameTest.foo?replyTo=queue:ReplyToDestinationSelectorNameTest.bar&replyToDestinationSelectorName=replyId")
.to("mock:result");
- from("activemq:queue:foo")
+ from("activemq:queue:ReplyToDestinationSelectorNameTest.foo")
.log("Using header named replyId with value as
correlation - ${header.replyId}")
.transform(body().prepend("Bye "));
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplyExclusiveReplyToTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplyExclusiveReplyToTest.java
index 4965a7f7292..9ac4cc578c7 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplyExclusiveReplyToTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplyExclusiveReplyToTest.java
@@ -34,22 +34,31 @@ public class SimpleJmsRequestReplyExclusiveReplyToTest
extends AbstractJMSTest {
@Test
public void testJmsRequestReplyExclusiveFixedReplyTo() {
assertEquals("Hello A",
-
template.requestBody("activemq:queue:foo?replyTo=bar&replyToType=Exclusive&replyToConsumerType=Simple",
"A"));
+ template.requestBody(
+
"activemq:queue:SimpleJmsRequestReplyExclusiveReplyToTest.foo?replyTo=queue:SimpleJmsRequestReplyExclusiveReplyToTest.bar&replyToType=Exclusive&replyToConsumerType=Simple",
+ "A"));
assertEquals("Hello B",
-
template.requestBody("activemq:queue:foo?replyTo=bar&replyToType=Exclusive&replyToConsumerType=Simple",
"B"));
+ template.requestBody(
+
"activemq:queue:SimpleJmsRequestReplyExclusiveReplyToTest.foo?replyTo=queue:SimpleJmsRequestReplyExclusiveReplyToTest.bar&replyToType=Exclusive&replyToConsumerType=Simple",
+ "B"));
assertEquals("Hello C",
-
template.requestBody("activemq:queue:foo?replyTo=bar&replyToType=Exclusive&replyToConsumerType=Simple",
"C"));
+ template.requestBody(
+
"activemq:queue:SimpleJmsRequestReplyExclusiveReplyToTest.foo?replyTo=queue:SimpleJmsRequestReplyExclusiveReplyToTest.bar&replyToType=Exclusive&replyToConsumerType=Simple",
+ "C"));
assertEquals("Hello D",
-
template.requestBody("activemq:queue:foo?replyTo=bar&replyToType=Exclusive&replyToConsumerType=Simple",
"D"));
+ template.requestBody(
+
"activemq:queue:SimpleJmsRequestReplyExclusiveReplyToTest.foo?replyTo=queue:SimpleJmsRequestReplyExclusiveReplyToTest.bar&replyToType=Exclusive&replyToConsumerType=Simple",
+ "D"));
assertEquals("Hello E",
-
template.requestBody("activemq:queue:foo?replyTo=bar&replyToType=Exclusive&replyToConsumerType=Simple",
"E"));
+ template.requestBody(
+
"activemq:queue:SimpleJmsRequestReplyExclusiveReplyToTest.foo?replyTo=queue:SimpleJmsRequestReplyExclusiveReplyToTest.bar&replyToType=Exclusive&replyToConsumerType=Simple",
+ "E"));
}
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory
- = createConnectionFactory(service);
+ ConnectionFactory connectionFactory = createConnectionFactory(service);
camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;
}
@@ -59,7 +68,7 @@ public class SimpleJmsRequestReplyExclusiveReplyToTest
extends AbstractJMSTest {
return new RouteBuilder() {
@Override
public void configure() {
- from("activemq:queue:foo")
+
from("activemq:queue:SimpleJmsRequestReplyExclusiveReplyToTest.foo")
.transform(body().prepend("Hello "));
}
};
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplySharedReplyToTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplySharedReplyToTest.java
index 476690a1bea..4be4cd4768b 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplySharedReplyToTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/SimpleJmsRequestReplySharedReplyToTest.java
@@ -31,27 +31,26 @@ public class SimpleJmsRequestReplySharedReplyToTest extends
AbstractJMSTest {
@Test
public void testJmsRequestReplySharedReplyTo() {
assertEquals("Hello A", template.requestBody(
-
"activemq:queue:foo?replyTo=bar&replyToType=Shared&replyToDestinationSelectorName=mySelector&replyToConsumerType=Simple",
+
"activemq:queue:queue:SimpleJmsRequestReplySharedReplyToTest.foo?replyTo=queue:SimpleJmsRequestReplySharedReplyToTest.bar&replyToType=Shared&replyToDestinationSelectorName=mySelector&replyToConsumerType=Simple",
"A"));
assertEquals("Hello B", template.requestBody(
-
"activemq:queue:foo?replyTo=bar&replyToType=Shared&replyToDestinationSelectorName=mySelector&replyToConsumerType=Simple",
+
"activemq:queue:queue:SimpleJmsRequestReplySharedReplyToTest.foo?replyTo=queue:SimpleJmsRequestReplySharedReplyToTest.bar&replyToType=Shared&replyToDestinationSelectorName=mySelector&replyToConsumerType=Simple",
"B"));
assertEquals("Hello C", template.requestBody(
-
"activemq:queue:foo?replyTo=bar&replyToType=Shared&replyToDestinationSelectorName=mySelector&replyToConsumerType=Simple",
+
"activemq:queue:queue:SimpleJmsRequestReplySharedReplyToTest.foo?replyTo=queue:SimpleJmsRequestReplySharedReplyToTest.bar&replyToType=Shared&replyToDestinationSelectorName=mySelector&replyToConsumerType=Simple",
"C"));
assertEquals("Hello D", template.requestBody(
-
"activemq:queue:foo?replyTo=bar&replyToType=Shared&replyToDestinationSelectorName=mySelector&replyToConsumerType=Simple",
+
"activemq:queue:queue:SimpleJmsRequestReplySharedReplyToTest.foo?replyTo=queue:SimpleJmsRequestReplySharedReplyToTest.bar&replyToType=Shared&replyToDestinationSelectorName=mySelector&replyToConsumerType=Simple",
"D"));
assertEquals("Hello E", template.requestBody(
-
"activemq:queue:foo?replyTo=bar&replyToType=Shared&replyToDestinationSelectorName=mySelector&replyToConsumerType=Simple",
+
"activemq:queue:queue:SimpleJmsRequestReplySharedReplyToTest.foo?replyTo=queue:SimpleJmsRequestReplySharedReplyToTest.bar&replyToType=Shared&replyToDestinationSelectorName=mySelector&replyToConsumerType=Simple",
"E"));
}
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory
- = createConnectionFactory(service);
+ ConnectionFactory connectionFactory = createConnectionFactory(service);
camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;
}
@@ -61,7 +60,7 @@ public class SimpleJmsRequestReplySharedReplyToTest extends
AbstractJMSTest {
return new RouteBuilder() {
@Override
public void configure() {
- from("activemq:queue:foo")
+
from("activemq:queue:queue:SimpleJmsRequestReplySharedReplyToTest.foo")
.transform(body().prepend("Hello "));
}
};
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerFalseTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerFalseTest.java
index 3ede229300a..3e1e53caa9f 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerFalseTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerFalseTest.java
@@ -36,8 +36,8 @@ public class AsyncConsumerFalseTest extends AbstractJMSTest {
// async is disabled (so we should receive in same order)
getMockEndpoint("mock:result").expectedBodiesReceived("Camel", "Hello
World");
- template.sendBody("activemq:queue:start", "Hello Camel");
- template.sendBody("activemq:queue:start", "Hello World");
+ template.sendBody("activemq:queue:AsyncConsumerFalseTest.start",
"Hello Camel");
+ template.sendBody("activemq:queue:AsyncConsumerFalseTest.start",
"Hello World");
assertMockEndpointsSatisfied();
}
@@ -61,7 +61,7 @@ public class AsyncConsumerFalseTest extends AbstractJMSTest {
@Override
public void configure() {
// disable async in only mode on the consumer
- from("activemq:queue:start?asyncConsumer=false")
+
from("activemq:queue:AsyncConsumerFalseTest.start?asyncConsumer=false")
.choice()
.when(body().contains("Camel"))
.to("async:camel?delay=2000")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTwoTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTwoTest.java
index acb1b59f3c2..a9054693ada 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTwoTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerInOutTwoTest.java
@@ -34,7 +34,9 @@ public class AsyncConsumerInOutTwoTest extends
AbstractJMSTest {
@Test
public void testAsyncJmsConsumer() {
- String out = template.requestBody("activemq:queue:start?replyTo=bar",
"Hello World", String.class);
+ String out = template.requestBody(
+
"activemq:queue:AsyncConsumerInOutTwoTest.start?replyTo=AsyncConsumerInOutTwoTest.bar",
"Hello World",
+ String.class);
assertEquals("Bye World", out);
}
@@ -57,7 +59,7 @@ public class AsyncConsumerInOutTwoTest extends
AbstractJMSTest {
@Override
public void configure() {
// enable async in only mode on the consumer
- from("activemq:queue:start?asyncConsumer=true")
+
from("activemq:queue:AsyncConsumerInOutTwoTest.start?asyncConsumer=true")
.to("async:camel?delay=2000")
.transform(constant("Bye World"));
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerTest.java
index 83604571e91..c0099ac7cff 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/AsyncConsumerTest.java
@@ -38,8 +38,8 @@ public class AsyncConsumerTest extends AbstractJMSTest {
// process the 2nd message on the queue
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World",
"Camel");
- template.sendBody("activemq:queue:start", "Hello Camel");
- template.sendBody("activemq:queue:start", "Hello World");
+ template.sendBody("activemq:queue:AsyncConsumerTest.start", "Hello
Camel");
+ template.sendBody("activemq:queue:AsyncConsumerTest.start", "Hello
World");
assertMockEndpointsSatisfied();
}
@@ -63,7 +63,7 @@ public class AsyncConsumerTest extends AbstractJMSTest {
@Override
public void configure() {
// enable async in only mode on the consumer
- from("activemq:queue:start?asyncConsumer=true")
+
from("activemq:queue:AsyncConsumerTest.start?asyncConsumer=true")
.choice()
.when(body().contains("Camel"))
.to("async:camel?delay=2000")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java
index 41949cda4aa..4ff785e2c62 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java
@@ -35,7 +35,8 @@ public class JmsInOutRoutingSlipTest extends AbstractJMSTest {
getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
getMockEndpoint("mock:end").expectedBodiesReceived("Bye World");
- template.sendBodyAndHeader("activemq:queue:start", "World", "slip",
"activemq:queue:foo,activemq:queue:result");
+
template.sendBodyAndHeader("activemq:queue:JmsInOutRoutingSlipTest.start",
"World", "slip",
+ "activemq:queue:foo,activemq:queue:result");
assertMockEndpointsSatisfied();
}
@@ -54,7 +55,7 @@ public class JmsInOutRoutingSlipTest extends AbstractJMSTest {
return new RouteBuilder() {
@Override
public void configure() {
- from("activemq:queue:start")
+ from("activemq:queue:JmsInOutRoutingSlipTest.start")
.setExchangePattern(ExchangePattern.InOut)
.routingSlip(header("slip"))
.to("log:end")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutUseMessageIDasCorrelationIDTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutUseMessageIDasCorrelationIDTest.java
index 9860a9e703b..3863cf48dca 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutUseMessageIDasCorrelationIDTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutUseMessageIDasCorrelationIDTest.java
@@ -32,13 +32,17 @@ public class JmsInOutUseMessageIDasCorrelationIDTest
extends AbstractJMSTest {
@Test
public void testInOutWithMsgIdAsCorrId() {
- String reply =
template.requestBody("activemq:queue:in?useMessageIDAsCorrelationID=true",
"Hello World", String.class);
+ String reply = template.requestBody(
+
"activemq:queue:JmsInOutUseMessageIDasCorrelationIDTest.in?useMessageIDAsCorrelationID=true",
"Hello World",
+ String.class);
assertEquals("Bye World", reply);
}
@Test
public void testInOutFixedReplyToAndWithMsgIdAsCorrId() {
- String reply =
template.requestBody("activemq:queue:in?replyTo=bar&useMessageIDAsCorrelationID=true",
"Hello World",
+ String reply = template.requestBody(
+
"activemq:queue:JmsInOutUseMessageIDasCorrelationIDTest.in?replyTo=queue:JmsInOutUseMessageIDasCorrelationIDTest.bar&useMessageIDAsCorrelationID=true",
+ "Hello World",
String.class);
assertEquals("Bye World", reply);
}
@@ -46,8 +50,7 @@ public class JmsInOutUseMessageIDasCorrelationIDTest extends
AbstractJMSTest {
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory
- = createConnectionFactory(service);
+ ConnectionFactory connectionFactory = createConnectionFactory(service);
camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;
}
@@ -56,12 +59,13 @@ public class JmsInOutUseMessageIDasCorrelationIDTest
extends AbstractJMSTest {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-
from("activemq:queue:in?useMessageIDAsCorrelationID=true").process(exchange -> {
- String id = exchange.getIn().getHeader("JMSCorrelationID",
String.class);
- assertNull(id, "JMSCorrelationID should be null");
+
from("activemq:queue:JmsInOutUseMessageIDasCorrelationIDTest.in?useMessageIDAsCorrelationID=true")
+ .process(exchange -> {
+ String id =
exchange.getIn().getHeader("JMSCorrelationID", String.class);
+ assertNull(id, "JMSCorrelationID should be null");
- exchange.getMessage().setBody("Bye World");
- });
+ exchange.getMessage().setBody("Bye World");
+ });
}
};
}
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMessageHeaderContentBasedRouterTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMessageHeaderContentBasedRouterTest.java
index a14d855eb3b..f67280d5d1c 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMessageHeaderContentBasedRouterTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsMessageHeaderContentBasedRouterTest.java
@@ -38,7 +38,7 @@ public class JmsMessageHeaderContentBasedRouterTest extends
AbstractJMSTest {
getMockEndpoint("mock:a").expectedMessageCount(0);
getMockEndpoint("mock:b").expectedMessageCount(1);
- template.sendBody("activemq:queue:start", "Hello World");
+ template.sendBody("activemq:queue:JmsInOutRoutingSlipTest.start",
"Hello World");
assertMockEndpointsSatisfied();
}
@@ -60,7 +60,7 @@ public class JmsMessageHeaderContentBasedRouterTest extends
AbstractJMSTest {
Predicate isA = header("route").isEqualTo("a");
Predicate isB = header("route").isEqualTo("b");
- from("activemq:queue:start")
+ from("activemq:queue:JmsInOutRoutingSlipTest.start")
.bean(MyPreProcessorBean.class, "determineRouting")
.choice()
.when(isA).to("mock:a")
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToLoopIssueTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToLoopIssueTest.java
index 2c4f8adefc3..e3f65a60407 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToLoopIssueTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsReplyToLoopIssueTest.java
@@ -37,7 +37,7 @@ public class JmsReplyToLoopIssueTest extends AbstractJMSTest {
getMockEndpoint("mock:bar").expectedBodiesReceived("Bye World");
getMockEndpoint("mock:done").expectedBodiesReceived("World");
- template.sendBodyAndHeader("direct:start", "World", "JMSReplyTo",
"queue:bar");
+ template.sendBodyAndHeader("direct:start", "World", "JMSReplyTo",
"queue:JmsReplyToLoopIssueTest.bar");
// sleep a little to ensure we do not do endless loop
Awaitility.await().atMost(250,
TimeUnit.MILLISECONDS).untilAsserted(this::assertMockEndpointsSatisfied);
@@ -46,8 +46,7 @@ public class JmsReplyToLoopIssueTest extends AbstractJMSTest {
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ConnectionFactory connectionFactory
- = createConnectionFactory(service);
+ ConnectionFactory connectionFactory = createConnectionFactory(service);
camelContext.addComponent("activemq",
jmsComponentAutoAcknowledge(connectionFactory));
return camelContext;
}
@@ -59,14 +58,14 @@ public class JmsReplyToLoopIssueTest extends
AbstractJMSTest {
public void configure() {
from("direct:start")
// must enable preserveMessageQos to force Camel to
use the JMSReplyTo header
- .to("activemq:queue:foo?preserveMessageQos=true")
+
.to("activemq:queue:JmsReplyToLoopIssueTest.foo?preserveMessageQos=true")
.to("mock:done");
- from("activemq:queue:foo")
+ from("activemq:queue:JmsReplyToLoopIssueTest.foo")
.to("log:foo?showAll=true", "mock:foo")
.transform(body().prepend("Bye "));
- from("activemq:queue:bar")
+ from("activemq:queue:JmsReplyToLoopIssueTest.bar")
.to("log:bar?showAll=true", "mock:bar");
}
};
