This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.7.x by this push:
new f44b8f5 CAMEL-16480: Fixed setProperty/setHeader using body as key
name will cause to not work.
f44b8f5 is described below
commit f44b8f5dc558b0b178307f1d5a9e7e7bfe6d4a12
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Apr 15 09:20:50 2021 +0200
CAMEL-16480: Fixed setProperty/setHeader using body as key name will cause
to not work.
---
.../org/apache/camel/reifier/SetHeaderReifier.java | 9 +++-
.../apache/camel/reifier/SetPropertyReifier.java | 9 +++-
.../camel/processor/LogEipBodyWithSimpleTest.java | 60 ++++++++++++++++++++++
3 files changed, 76 insertions(+), 2 deletions(-)
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
index a890503..154373d 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
@@ -22,6 +22,7 @@ import org.apache.camel.Route;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.SetHeaderDefinition;
import org.apache.camel.processor.SetHeaderProcessor;
+import org.apache.camel.support.LanguageSupport;
import org.apache.camel.util.ObjectHelper;
public class SetHeaderReifier extends ExpressionReifier<SetHeaderDefinition> {
@@ -34,7 +35,13 @@ public class SetHeaderReifier extends
ExpressionReifier<SetHeaderDefinition> {
public Processor createProcessor() throws Exception {
ObjectHelper.notNull(definition.getName(), "headerName");
Expression expr = createExpression(definition.getExpression());
- Expression nameExpr =
camelContext.resolveLanguage("simple").createExpression(parseString(definition.getName()));
+ Expression nameExpr;
+ String key = parseString(definition.getName());
+ if (LanguageSupport.hasSimpleFunction(key)) {
+ nameExpr =
camelContext.resolveLanguage("simple").createExpression(key);
+ } else {
+ nameExpr =
camelContext.resolveLanguage("constant").createExpression(key);
+ }
nameExpr.init(camelContext);
return new SetHeaderProcessor(nameExpr, expr);
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
index bd852e0..09339db 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
@@ -22,6 +22,7 @@ import org.apache.camel.Route;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.SetPropertyDefinition;
import org.apache.camel.processor.SetPropertyProcessor;
+import org.apache.camel.support.LanguageSupport;
import org.apache.camel.util.ObjectHelper;
public class SetPropertyReifier extends
ExpressionReifier<SetPropertyDefinition> {
@@ -34,7 +35,13 @@ public class SetPropertyReifier extends
ExpressionReifier<SetPropertyDefinition>
public Processor createProcessor() throws Exception {
ObjectHelper.notNull(definition.getName(), "propertyName", this);
Expression expr = createExpression(definition.getExpression());
- Expression nameExpr =
camelContext.resolveLanguage("simple").createExpression(parseString(definition.getName()));
+ Expression nameExpr;
+ String key = parseString(definition.getName());
+ if (LanguageSupport.hasSimpleFunction(key)) {
+ nameExpr =
camelContext.resolveLanguage("simple").createExpression(key);
+ } else {
+ nameExpr =
camelContext.resolveLanguage("constant").createExpression(key);
+ }
nameExpr.init(camelContext);
return new SetPropertyProcessor(nameExpr, expr);
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/processor/LogEipBodyWithSimpleTest.java
b/core/camel-core/src/test/java/org/apache/camel/processor/LogEipBodyWithSimpleTest.java
new file mode 100644
index 0000000..7a3961a
--- /dev/null
+++
b/core/camel-core/src/test/java/org/apache/camel/processor/LogEipBodyWithSimpleTest.java
@@ -0,0 +1,60 @@
+/*
+ * 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.processor;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class LogEipBodyWithSimpleTest extends ContextTestSupport {
+
+ private String msg;
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ context.adapt(ExtendedCamelContext.class).addLogListener((exchange,
camelLogger, message) -> {
+ msg = message;
+ return message;
+ });
+ return context;
+ }
+
+ @Test
+ public void testLogEip() throws Exception {
+ template.sendBody("direct:start", null);
+
+ assertEquals("Response from API is ==> REAL DATA", msg);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .setBody(constant("REAL DATA"))
+ .setProperty("body", constant("hello"))
+ .log("Response from API is ==> ${body}");
+ }
+ };
+ }
+}
