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 2020/12/27 12:21:54 UTC
[camel] branch master updated: CAMEL-15993: camel-amqp - Add
support for DynamicAware endpoints for toD
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 3b4bfaa CAMEL-15993: camel-amqp - Add support for DynamicAware endpoints for toD
3b4bfaa is described below
commit 3b4bfaaf21aaaab106b4afee2b9cf914cb158c42
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Dec 27 13:20:43 2020 +0100
CAMEL-15993: camel-amqp - Add support for DynamicAware endpoints for toD
---
.../services/org/apache/camel/send-dynamic/amqp | 2 +
.../camel/component/amqp/AMQPSendDynamicAware.java | 25 +++++++
.../component/amqp/AMQPToDSendDynamicTest.java | 86 ++++++++++++++++++++++
.../apache/camel/component/amqp/AMQPToDTest.java | 83 +++++++++++++++++++++
4 files changed, 196 insertions(+)
diff --git a/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/amqp b/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/amqp
new file mode 100644
index 0000000..531b385
--- /dev/null
+++ b/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/send-dynamic/amqp
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.amqp.AMQPSendDynamicAware
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPSendDynamicAware.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPSendDynamicAware.java
new file mode 100644
index 0000000..65a2e27
--- /dev/null
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPSendDynamicAware.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.amqp;
+
+import org.apache.camel.component.jms.JmsSendDynamicAware;
+import org.apache.camel.spi.annotations.SendDynamic;
+
+@SendDynamic("amqp")
+public class AMQPSendDynamicAware extends JmsSendDynamicAware {
+
+}
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
new file mode 100644
index 0000000..5de90dd
--- /dev/null
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDSendDynamicTest.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.amqp;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.component.amqp.AMQPConnectionDetails.AMQP_PORT;
+import static org.apache.camel.component.amqp.AMQPConnectionDetails.discoverAMQP;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class AMQPToDSendDynamicTest extends CamelTestSupport {
+
+ static int amqpPort = AvailablePortFinder.getNextAvailable();
+
+ static BrokerService broker;
+
+ @BeforeAll
+ public static void beforeClass() throws Exception {
+ broker = new BrokerService();
+ broker.setPersistent(false);
+ broker.addConnector("amqp://0.0.0.0:" + amqpPort);
+ broker.start();
+
+ System.setProperty(AMQP_PORT, amqpPort + "");
+ }
+
+ @AfterAll
+ public static void afterClass() throws Exception {
+ broker.stop();
+ }
+
+ @Test
+ public void testToD() throws Exception {
+ template.sendBodyAndHeader("direct:start", "Hello bar", "where", "bar");
+ template.sendBodyAndHeader("direct:start", "Hello beer", "where", "beer");
+
+ // there should only be one amqp endpoint
+ long count = context.getEndpoints().stream().filter(e -> e.getEndpointUri().startsWith("amqp:")).count();
+ assertEquals(1, count, "There should only be 1 amqp endpoint");
+
+ // and the messages should be in the queues
+ String out = consumer.receiveBody("amqp:queue:bar", 2000, String.class);
+ assertEquals("Hello bar", out);
+ out = consumer.receiveBody("amqp:queue:beer", 2000, String.class);
+ assertEquals("Hello beer", out);
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext camelContext = super.createCamelContext();
+ camelContext.getRegistry().bind("amqpConnection", discoverAMQP(camelContext));
+ return camelContext;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ // route message dynamic using toD
+ from("direct:start").toD("amqp:queue:${header.where}");
+ }
+ };
+ }
+
+}
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
new file mode 100644
index 0000000..aabc9b7
--- /dev/null
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPToDTest.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.amqp;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.apache.camel.component.amqp.AMQPConnectionDetails.AMQP_PORT;
+import static org.apache.camel.component.amqp.AMQPConnectionDetails.discoverAMQP;
+
+public class AMQPToDTest extends CamelTestSupport {
+
+ static int amqpPort = AvailablePortFinder.getNextAvailable();
+
+ static BrokerService broker;
+
+ @BeforeAll
+ public static void beforeClass() throws Exception {
+ broker = new BrokerService();
+ broker.setPersistent(false);
+ broker.addConnector("amqp://0.0.0.0:" + amqpPort);
+ broker.start();
+
+ System.setProperty(AMQP_PORT, amqpPort + "");
+ }
+
+ @AfterAll
+ public static void afterClass() throws Exception {
+ broker.stop();
+ }
+
+ @Test
+ public void testToD() throws Exception {
+ getMockEndpoint("mock:bar").expectedBodiesReceived("Hello bar");
+ getMockEndpoint("mock:beer").expectedBodiesReceived("Hello beer");
+
+ template.sendBodyAndHeader("direct:start", "Hello bar", "where", "bar");
+ template.sendBodyAndHeader("direct:start", "Hello beer", "where", "beer");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext camelContext = super.createCamelContext();
+ camelContext.getRegistry().bind("amqpConnection", discoverAMQP(camelContext));
+ return camelContext;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ // route message dynamic using toD
+ from("direct:start").toD("amqp:queue:${header.where}");
+
+ from("amqp:queue:bar").to("mock:bar");
+ from("amqp:queue:beer").to("mock:beer");
+ }
+ };
+ }
+
+}