This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch CAMEL-16593 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 06fd203f5e7c9746b816a65a9f5191970e7726a7 Author: Claus Ibsen <[email protected]> AuthorDate: Sat May 8 12:48:22 2021 +0200 CAMEL-16593: Kamelets local bean - Allow to use expression language to supply the bean WIP --- components/camel-kamelet/pom.xml | 5 ++++ .../kamelet/KameletLocalBeanGroovyTest.java | 29 ++++++---------------- .../camel/component/kamelet/MyInjectBar.java | 8 ++++++ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/components/camel-kamelet/pom.xml b/components/camel-kamelet/pom.xml index fc2d560..c443946 100644 --- a/components/camel-kamelet/pom.xml +++ b/components/camel-kamelet/pom.xml @@ -46,6 +46,11 @@ <!-- TESTS --> <dependency> <groupId>org.apache.camel</groupId> + <artifactId>camel-groovy</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> <artifactId>camel-timer</artifactId> <scope>test</scope> </dependency> diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanGroovyTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanGroovyTest.java index 37d92b9..c5a99c43 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanGroovyTest.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletLocalBeanGroovyTest.java @@ -26,20 +26,9 @@ public class KameletLocalBeanGroovyTest extends CamelTestSupport { @Test public void testOne() throws Exception { - getMockEndpoint("mock:result").expectedBodiesReceived("Hi John we are going to Moes"); + getMockEndpoint("mock:result").expectedBodiesReceived("Hi John we are going to Gr8t"); - template.sendBody("direct:moe", "John"); - - assertMockEndpointsSatisfied(); - } - - @Test - public void testTwo() throws Exception { - getMockEndpoint("mock:result").expectedBodiesReceived("Hi Jack we are going to Shamrock", - "Hi Mary we are going to Moes"); - - template.sendBody("direct:shamrock", "Jack"); - template.sendBody("direct:moe", "Mary"); + template.sendBody("direct:start", "John"); assertMockEndpointsSatisfied(); } @@ -56,18 +45,16 @@ public class KameletLocalBeanGroovyTest extends CamelTestSupport { @Override public void configure() throws Exception { routeTemplate("whereTo") - .templateParameter("bar") // name of bar - .templateBean("myBar").groovy("") + .templateBean("myBar", "groovy", + "def bean = new org.apache.camel.component.kamelet.MyInjectBar()\n" + + "bean.bar = 'Gr8t'\n" + + "return bean") .from("kamelet:source") // must use {{myBar}} to refer to the local bean .to("bean:{{myBar}}"); - from("direct:shamrock") - .kamelet("whereTo?bar=Shamrock") - .to("mock:result"); - - from("direct:moe") - .kamelet("whereTo?bar=Moes") + from("direct:start") + .kamelet("whereTo") .to("mock:result"); } }; diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/MyInjectBar.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/MyInjectBar.java index 9321ecd..727b699 100644 --- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/MyInjectBar.java +++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/MyInjectBar.java @@ -23,6 +23,14 @@ public class MyInjectBar { @PropertyInject("{{bar}}") private String bar; + public String getBar() { + return bar; + } + + public void setBar(String bar) { + this.bar = bar; + } + public String where(String name) { return "Hi " + name + " we are going to " + bar; }
