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 cbc2269 CAMEL-15704: camel-csimple - Compiled simple language.
cbc2269 is described below
commit cbc22698043b1cb356a3cf1dc15882613a3e1588
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Dec 8 14:31:46 2020 +0100
CAMEL-15704: camel-csimple - Compiled simple language.
---
.../joor/CSimpleSetHeaderPredicateTest.java | 67 ++++++++++++++++++++++
.../camel/language/csimple/CSimpleLanguage.java | 11 ++++
2 files changed, 78 insertions(+)
diff --git
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java
new file mode 100644
index 0000000..165071f
--- /dev/null
+++
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/CSimpleSetHeaderPredicateTest.java
@@ -0,0 +1,67 @@
+/*
+ * 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.language.csimple.joor;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+public class CSimpleSetHeaderPredicateTest extends CamelTestSupport {
+
+ @Test
+ public void testSetHeaderPredicateFalse() throws Exception {
+ getMockEndpoint("mock:result").expectedHeaderReceived("bar", false);
+
+ template.sendBodyAndHeader("direct:start", "Hello World", "foo",
"World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testSetHeaderPredicateTrue() throws Exception {
+ getMockEndpoint("mock:result").expectedHeaderReceived("bar", true);
+
+ template.sendBodyAndHeader("direct:start", "Hello World", "foo",
"Camel");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testOther() throws Exception {
+ getMockEndpoint("mock:other").expectedHeaderReceived("param1",
"hello");
+ getMockEndpoint("mock:other").expectedHeaderReceived("param2", true);
+
+ template.sendBody("direct:other", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").setHeader("bar").csimple("${header.foo}
== 'Camel'", boolean.class).to("mock:result");
+
+ from("direct:other").setHeader("param1",
constant("hello")).log("param1 = ${header.param1}").setHeader("param2")
+ .csimple("${header.param1} == 'hello'",
Boolean.class).log("param2 = ${header.param2}")
+ .to("mock:other");
+ }
+ };
+ }
+
+}
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
index d7210d6..a8e63de 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
@@ -150,6 +150,17 @@ public class CSimpleLanguage extends LanguageSupport
implements StaticService {
}
@Override
+ public Expression createExpression(String expression, Object[] properties)
{
+ Class<?> resultType = (Class<?>) (properties != null &&
properties.length == 1 ? properties[0] : null);
+ if (Boolean.class == resultType || boolean.class == resultType) {
+ // we want it compiled as a predicate
+ return (Expression) createPredicate(expression);
+ } else {
+ return createExpression(expression);
+ }
+ }
+
+ @Override
public Expression createExpression(String expression) {
if (expression == null) {
throw new IllegalArgumentException("expression must be specified");
