Repository: camel Updated Branches: refs/heads/master a9fe036f5 -> 66130a29c
CAMEL-11871: Fixed stomp component to use destination as-is. This closes #1989 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/66130a29 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/66130a29 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/66130a29 Branch: refs/heads/master Commit: 66130a29c51d9e7f545442596e837c670d2a9a7a Parents: a9fe036 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Oct 4 09:58:24 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Oct 4 09:58:45 2017 +0200 ---------------------------------------------------------------------- .../org/apache/camel/component/stomp/StompComponent.java | 4 +--- .../apache/camel/component/stomp/StompConsumerTest.java | 4 ++-- .../camel/component/stomp/StompConsumerUriTest.java | 4 ++-- .../camel/component/stomp/StompGlobalSslConsumerTest.java | 2 +- .../apache/camel/component/stomp/StompProducerTest.java | 10 ++++++---- .../camel/component/stomp/StompSslConsumerTest.java | 2 +- .../camel/component/stomp/StompSslProducerTest.java | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/66130a29/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java index 657d1d1..fa67c0a 100644 --- a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java +++ b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java @@ -54,14 +54,12 @@ public class StompComponent extends HeaderFilterStrategyComponent implements SSL @Override protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception { - String destination = "/" + remaining.replaceAll(":", "/"); - // must copy config so we do not have side effects StompConfiguration config = getConfiguration().copy(); // allow to configure configuration from uri parameters setProperties(config, parameters); - StompEndpoint endpoint = new StompEndpoint(uri, this, config, destination); + StompEndpoint endpoint = new StompEndpoint(uri, this, config, remaining); // set header filter strategy and then call set properties // if user wants to add CustomHeaderFilterStrategy http://git-wip-us.apache.org/repos/asf/camel/blob/66130a29/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java index 02a349c..b2294a6 100644 --- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java +++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerTest.java @@ -49,7 +49,7 @@ public class StompConsumerTest extends StompBaseTest { for (int i = 0; i < numberOfMessages; i++) { StompFrame frame = new StompFrame(SEND); - frame.addHeader(DESTINATION, StompFrame.encodeHeader("/queue/test")); + frame.addHeader(DESTINATION, StompFrame.encodeHeader("test")); frame.addHeader(MESSAGE_ID, StompFrame.encodeHeader("msg:" + i)); frame.content(utf8("Important Message " + i)); producerConnection.send(frame); @@ -62,7 +62,7 @@ public class StompConsumerTest extends StompBaseTest { protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { - from("stomp:queue:test") + from("stomp:test") .transform(body().convertToString()) .to("mock:result"); } http://git-wip-us.apache.org/repos/asf/camel/blob/66130a29/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java index c9ad73d..c1f233d 100644 --- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java +++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompConsumerUriTest.java @@ -49,7 +49,7 @@ public class StompConsumerUriTest extends StompBaseTest { for (int i = 0; i < numberOfMessages; i++) { StompFrame frame = new StompFrame(SEND); - frame.addHeader(DESTINATION, StompFrame.encodeHeader("/queue/test")); + frame.addHeader(DESTINATION, StompFrame.encodeHeader("test")); frame.addHeader(MESSAGE_ID, StompFrame.encodeHeader("msg:" + i)); frame.content(utf8("Important Message " + i)); producerConnection.send(frame); @@ -62,7 +62,7 @@ public class StompConsumerUriTest extends StompBaseTest { protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { - fromF("stomp:queue:test?brokerURL=tcp://localhost:%d", getPort()) + fromF("stomp:test?brokerURL=tcp://localhost:%d", getPort()) .transform(body().convertToString()) .to("mock:result"); } http://git-wip-us.apache.org/repos/asf/camel/blob/66130a29/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompGlobalSslConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompGlobalSslConsumerTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompGlobalSslConsumerTest.java index 7245243..0046831 100644 --- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompGlobalSslConsumerTest.java +++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompGlobalSslConsumerTest.java @@ -40,7 +40,7 @@ public class StompGlobalSslConsumerTest extends StompConsumerTest { protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { - fromF("stomp:queue:test?brokerURL=ssl://localhost:%d", getPort()) + fromF("stomp:test?brokerURL=ssl://localhost:%d", getPort()) .transform(body().convertToString()) .to("mock:result"); } http://git-wip-us.apache.org/repos/asf/camel/blob/66130a29/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java index a564237..b8454b3 100644 --- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java +++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompProducerTest.java @@ -19,6 +19,7 @@ package org.apache.camel.component.stomp; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.apache.camel.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; @@ -50,7 +51,7 @@ public class StompProducerTest extends StompBaseTest { final BlockingConnection subscribeConnection = stomp.connectBlocking(); StompFrame frame = new StompFrame(SUBSCRIBE); - frame.addHeader(DESTINATION, StompFrame.encodeHeader("/queue/test")); + frame.addHeader(DESTINATION, StompFrame.encodeHeader("test")); frame.addHeader(ID, subscribeConnection.nextId()); StompFrame response = subscribeConnection.request(frame); @@ -74,9 +75,10 @@ public class StompProducerTest extends StompBaseTest { }); thread.start(); - Producer producer = context.getEndpoint("direct:foo").createProducer(); + Endpoint endpoint = context.getEndpoint("direct:foo"); + Producer producer = endpoint.createProducer(); for (int i = 0; i < numberOfMessages; i++) { - Exchange exchange = producer.createExchange(); + Exchange exchange = endpoint.createExchange(); exchange.getIn().setBody(("test message " + i).getBytes("UTF-8")); exchange.getIn().setHeader(HEADER, HEADER_VALUE); producer.process(exchange); @@ -89,7 +91,7 @@ public class StompProducerTest extends StompBaseTest { protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { - from("direct:foo").to("stomp:queue:test"); + from("direct:foo").to("stomp:test"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/66130a29/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompSslConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompSslConsumerTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompSslConsumerTest.java index bee9f4b..6ca2ef7 100644 --- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompSslConsumerTest.java +++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompSslConsumerTest.java @@ -29,7 +29,7 @@ public class StompSslConsumerTest extends StompConsumerTest { protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { public void configure() { - fromF("stomp:queue:test?brokerURL=ssl://localhost:%d&sslContextParameters=#sslContextParameters", getPort()) + fromF("stomp:test?brokerURL=ssl://localhost:%d&sslContextParameters=#sslContextParameters", getPort()) .transform(body().convertToString()) .to("mock:result"); } http://git-wip-us.apache.org/repos/asf/camel/blob/66130a29/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompSslProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompSslProducerTest.java b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompSslProducerTest.java index 9054216..438556f 100644 --- a/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompSslProducerTest.java +++ b/components/camel-stomp/src/test/java/org/apache/camel/component/stomp/StompSslProducerTest.java @@ -30,7 +30,7 @@ public class StompSslProducerTest extends StompProducerTest { return new RouteBuilder() { public void configure() { from("direct:foo") - .toF("stomp:queue:test?brokerURL=ssl://localhost:%d&sslContextParameters=#sslContextParameters", getPort()); + .toF("stomp:test?brokerURL=ssl://localhost:%d&sslContextParameters=#sslContextParameters", getPort()); } }; }
