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 2026/01/11 18:47:53 UTC
(camel) 01/01: CAMEL-22834: camel-core - Add trim function to simple language
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch trim
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 99115ed0344c26293ac920d6dd3f1fab0ebd095d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Jan 11 19:47:32 2026 +0100
CAMEL-22834: camel-core - Add trim function to simple language
---
.../language/csimple/joor/OriginalSimpleTest.java | 22 ++++++++++++
.../org/apache/camel/language/simple/simple.json | 35 ++++++++++---------
.../modules/languages/pages/simple-language.adoc | 2 ++
.../camel/language/csimple/CSimpleHelper.java | 14 ++++++++
.../camel/language/simple/SimpleConstants.java | 3 ++
.../language/simple/SimpleExpressionBuilder.java | 40 ++++++++++++++++++++++
.../simple/ast/SimpleFunctionExpression.java | 40 ++++++++++++++++++++--
.../apache/camel/language/simple/SimpleTest.java | 22 ++++++++++++
8 files changed, 159 insertions(+), 19 deletions(-)
diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
index b81c45826d50..c8888db8e702 100644
--- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
+++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
@@ -2240,6 +2240,28 @@ public class OriginalSimpleTest extends LanguageTestSupport {
assertExpression("${uuid(mygen)}", "1234");
}
+ @Test
+ public void testTrim() {
+ exchange.getMessage().setBody(" Hello World ");
+
+ Expression expression = context.resolveLanguage("csimple").createExpression("${trim()}");
+ String s = expression.evaluate(exchange, String.class);
+ assertEquals("Hello World", s);
+
+ expression = context.resolveLanguage("csimple").createExpression("${trim(${body})}");
+ s = expression.evaluate(exchange, String.class);
+ assertEquals("Hello World", s);
+
+ expression = context.resolveLanguage("csimple").createExpression("${trim(' Hi ')}");
+ s = expression.evaluate(exchange, String.class);
+ assertEquals("Hi", s);
+
+ exchange.getMessage().setHeader("beer", " Carlsberg");
+ expression = context.resolveLanguage("csimple").createExpression("${trim(${header.beer})}");
+ s = expression.evaluate(exchange, String.class);
+ assertEquals("Carlsberg", s);
+ }
+
@Override
protected String getLanguageName() {
return "csimple";
diff --git a/core/camel-core-languages/src/generated/resources/META-INF/org/apache/camel/language/simple/simple.json b/core/camel-core-languages/src/generated/resources/META-INF/org/apache/camel/language/simple/simple.json
index 79d35b797c46..aa60afaf8268 100644
--- a/core/camel-core-languages/src/generated/resources/META-INF/org/apache/camel/language/simple/simple.json
+++ b/core/camel-core-languages/src/generated/resources/META-INF/org/apache/camel/language/simple/simple.json
@@ -70,22 +70,23 @@
"substring(head,tail)": { "index": 45, "kind": "function", "displayName": "Substring", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Returns a substring of the message body\/expression. If only one positive number, then the returned string is clipped from the beginning. If only one negative number, then the returned string is clipped fr [...]
"random(min,max)": { "index": 46, "kind": "function", "displayName": "Generate Random Number", "group": "function", "label": "function", "required": false, "javaType": "int", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Returns a random number between min (included) and max (excluded).", "ognl": false, "suffix": "}" },
"skip(num)": { "index": 47, "kind": "function", "displayName": "Skip First Items from the Message Body", "group": "function", "label": "function", "required": false, "javaType": "java.util.Iterator", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The skip function iterates the message body and skips the first number of items. This can be used with the Splitter EIP to split a message body and skip the first N number of [...]
- "collate(num)": { "index": 48, "kind": "function", "displayName": "Group Message Body into Sub Lists", "group": "function", "label": "function", "required": false, "javaType": "java.util.Iterator", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The collate function iterates the message body and groups the data into sub lists of specified size. This can be used with the Splitter EIP to split a message body and group\/ba [...]
- "join(separator,prefix,exp)": { "index": 49, "kind": "function", "displayName": "Join", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The join function iterates the message body\/expression and joins the data into a string. The separator is by default a comma. The prefix is optional. The join uses the message body as source by default. [...]
- "messageHistory(boolean)": { "index": 50, "kind": "function", "displayName": "Print Message History", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The message history of the current exchange (how it has been routed). This is similar to the route stack-trace message history the error handler logs in case of an unhandled exception. The b [...]
- "uuid(type)": { "index": 51, "kind": "function", "displayName": "Generate UUID", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Returns a UUID using the Camel `UuidGenerator`. You can choose between `default`, `classic`, `short` and `simple` as the type. If no type is given, the default is used. It is also possible to use a custom `UuidG [...]
- "hash(exp,algorithm)": { "index": 52, "kind": "function", "displayName": "Compute Hash Value", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Returns a hashed value (string in hex decimal) of the message body\/expression using JDK MessageDigest. The algorithm can be SHA-256 (default) or SHA3-256.", "ognl": false, "suffix": "}" },
- "empty(type)": { "index": 53, "kind": "function", "displayName": "Create Empty Object", "group": "function", "label": "function", "required": false, "javaType": "Object", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Creates a new empty object (decided by type). Use `string` to create an empty String. Use `list` to create an empty `java.util.ArrayList`. Use `map` to create an empty `java.util.LinkedHashMap`.", "ognl": [...]
- "iif(predicate,trueExp,falseExp)": { "index": 54, "kind": "function", "displayName": "If Then Else", "group": "function", "label": "function", "required": false, "javaType": "Object", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Evaluates the predicate and returns the value of trueExp or falseExp. This function is similar to the ternary operator in Java.", "ognl": false, "suffix": "}" },
- "list(val...)": { "index": 55, "kind": "function", "displayName": "Create List of values", "group": "function", "label": "function", "required": false, "javaType": "java.util.ArrayList", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The list function creates an ArrayList with the given set of values.", "ognl": false, "suffix": "}" },
- "map(key1,value1,...)": { "index": 56, "kind": "function", "displayName": "Create Map of pairs", "group": "function", "label": "function", "required": false, "javaType": "java.util.LinkedHashMap", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The map function creates a LinkedHashMap with the given set of pairs.", "ognl": false, "suffix": "}" },
- "attachments": { "index": 57, "kind": "function", "displayName": "Attachments", "group": "function", "label": "function", "required": false, "javaType": "java.util.Map", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "All the attachments as a Map<String,DataHandler.", "ognl": false, "suffix": "}" },
- "attachments.size": { "index": 58, "kind": "function", "displayName": "Attachments", "group": "function", "label": "function", "required": false, "javaType": "int", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The number of attachments. Is 0 if there are no attachments.", "ognl": false, "suffix": "}" },
- "attachmentContentAsText": { "index": 59, "kind": "function", "displayName": "Attachment Content As Text", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content of the attachment as text (ie String).", "ognl": false, "suffix": "}" },
- "attachmentContent": { "index": 60, "kind": "function", "displayName": "Attachment Content", "group": "function", "label": "function", "required": false, "javaType": "Object", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content of the attachment", "ognl": false, "suffix": "}" },
- "attachmentContentAs(type)": { "index": 61, "kind": "function", "displayName": "Attachment Content As", "group": "function", "label": "function", "required": false, "javaType": "Object", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content of the attachment, converted to the given type.", "ognl": false, "suffix": "}" },
- "attachmentHeader(key,name)": { "index": 62, "kind": "function", "displayName": "Attachment Header", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The attachment header with the given name.", "ognl": false, "suffix": "}" },
- "attachmentHeader(key,name,type)": { "index": 63, "kind": "function", "displayName": "Attachment Header", "group": "function", "label": "function", "required": false, "javaType": "Object", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The attachment header with the given name, converted to the given type.", "ognl": false, "suffix": "}" },
- "attachment(key)": { "index": 64, "kind": "function", "displayName": "Attachment", "group": "function", "label": "function", "required": false, "javaType": "jakarta.activation.DataHandler", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The DataHandler for the given attachment.", "ognl": true, "suffix": "}" }
+ "trim(exp)": { "index": 48, "kind": "function", "displayName": "Trims the message body (or expression)", "group": "function", "label": "function", "required": false, "javaType": "", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The trim function trims the message body (or expression) by removing all leading and trailing white spaces.", "ognl": false, "suffix": "}" },
+ "collate(num)": { "index": 49, "kind": "function", "displayName": "Group Message Body into Sub Lists", "group": "function", "label": "function", "required": false, "javaType": "java.util.Iterator", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The collate function iterates the message body and groups the data into sub lists of specified size. This can be used with the Splitter EIP to split a message body and group\/ba [...]
+ "join(separator,prefix,exp)": { "index": 50, "kind": "function", "displayName": "Join", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The join function iterates the message body\/expression and joins the data into a string. The separator is by default a comma. The prefix is optional. The join uses the message body as source by default. [...]
+ "messageHistory(boolean)": { "index": 51, "kind": "function", "displayName": "Print Message History", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The message history of the current exchange (how it has been routed). This is similar to the route stack-trace message history the error handler logs in case of an unhandled exception. The b [...]
+ "uuid(type)": { "index": 52, "kind": "function", "displayName": "Generate UUID", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Returns a UUID using the Camel `UuidGenerator`. You can choose between `default`, `classic`, `short` and `simple` as the type. If no type is given, the default is used. It is also possible to use a custom `UuidG [...]
+ "hash(exp,algorithm)": { "index": 53, "kind": "function", "displayName": "Compute Hash Value", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Returns a hashed value (string in hex decimal) of the message body\/expression using JDK MessageDigest. The algorithm can be SHA-256 (default) or SHA3-256.", "ognl": false, "suffix": "}" },
+ "empty(type)": { "index": 54, "kind": "function", "displayName": "Create Empty Object", "group": "function", "label": "function", "required": false, "javaType": "Object", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Creates a new empty object (decided by type). Use `string` to create an empty String. Use `list` to create an empty `java.util.ArrayList`. Use `map` to create an empty `java.util.LinkedHashMap`.", "ognl": [...]
+ "iif(predicate,trueExp,falseExp)": { "index": 55, "kind": "function", "displayName": "If Then Else", "group": "function", "label": "function", "required": false, "javaType": "Object", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Evaluates the predicate and returns the value of trueExp or falseExp. This function is similar to the ternary operator in Java.", "ognl": false, "suffix": "}" },
+ "list(val...)": { "index": 56, "kind": "function", "displayName": "Create List of values", "group": "function", "label": "function", "required": false, "javaType": "java.util.ArrayList", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The list function creates an ArrayList with the given set of values.", "ognl": false, "suffix": "}" },
+ "map(key1,value1,...)": { "index": 57, "kind": "function", "displayName": "Create Map of pairs", "group": "function", "label": "function", "required": false, "javaType": "java.util.LinkedHashMap", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The map function creates a LinkedHashMap with the given set of pairs.", "ognl": false, "suffix": "}" },
+ "attachments": { "index": 58, "kind": "function", "displayName": "Attachments", "group": "function", "label": "function", "required": false, "javaType": "java.util.Map", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "All the attachments as a Map<String,DataHandler.", "ognl": false, "suffix": "}" },
+ "attachments.size": { "index": 59, "kind": "function", "displayName": "Attachments", "group": "function", "label": "function", "required": false, "javaType": "int", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The number of attachments. Is 0 if there are no attachments.", "ognl": false, "suffix": "}" },
+ "attachmentContentAsText": { "index": 60, "kind": "function", "displayName": "Attachment Content As Text", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content of the attachment as text (ie String).", "ognl": false, "suffix": "}" },
+ "attachmentContent": { "index": 61, "kind": "function", "displayName": "Attachment Content", "group": "function", "label": "function", "required": false, "javaType": "Object", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content of the attachment", "ognl": false, "suffix": "}" },
+ "attachmentContentAs(type)": { "index": 62, "kind": "function", "displayName": "Attachment Content As", "group": "function", "label": "function", "required": false, "javaType": "Object", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The content of the attachment, converted to the given type.", "ognl": false, "suffix": "}" },
+ "attachmentHeader(key,name)": { "index": 63, "kind": "function", "displayName": "Attachment Header", "group": "function", "label": "function", "required": false, "javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The attachment header with the given name.", "ognl": false, "suffix": "}" },
+ "attachmentHeader(key,name,type)": { "index": 64, "kind": "function", "displayName": "Attachment Header", "group": "function", "label": "function", "required": false, "javaType": "Object", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The attachment header with the given name, converted to the given type.", "ognl": false, "suffix": "}" },
+ "attachment(key)": { "index": 65, "kind": "function", "displayName": "Attachment", "group": "function", "label": "function", "required": false, "javaType": "jakarta.activation.DataHandler", "prefix": "${", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The DataHandler for the given attachment.", "ognl": true, "suffix": "}" }
}
}
diff --git a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
index cc12e22a36c5..4784e4ad7a03 100644
--- a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
+++ b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
@@ -290,6 +290,8 @@ the error handler logs in case of an unhandled exception.
includes the route stack-trace). This can be used if you do not want to
log sensitive data from the message itself.
+|trim(exp) |String |The trim function trims the message body (or expression) by removing all leading and trailing white spaces.
+
|uuid(type) |String |Returns a UUID using the Camel `UuidGenerator`.
You can choose between `default`, `classic`, `short`, `simple` and `random` as the type.
If no type is given, the default is used. It is also possible to use a custom `UuidGenerator`
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
index 575cadbd6b3c..95cb9d51615b 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
@@ -773,4 +773,18 @@ public final class CSimpleHelper {
public static UuidGenerator customUuidGenerator(Exchange exchange, String generator) {
return CamelContextHelper.mandatoryLookup(exchange.getContext(), generator, UuidGenerator.class);
}
+
+ public static String trim(Exchange exchange, Object value) {
+ String body;
+ if (value != null) {
+ body = exchange.getContext().getTypeConverter().tryConvertTo(String.class, exchange, value);
+ } else {
+ body = exchange.getMessage().getBody(String.class);
+ }
+ if (body != null) {
+ body = body.trim();
+ }
+ return body;
+ }
+
}
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleConstants.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleConstants.java
index cfed2884a95c..0a879885e3b0 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleConstants.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleConstants.java
@@ -180,6 +180,9 @@ public final class SimpleConstants {
+ " This can be used with the Splitter EIP to split a message body and skip the first N number of items.",
label = "function", javaType = "java.util.Iterator", displayName = "Skip First Items from the Message Body")
public static final String SKIP = "skip(num)";
+ @Metadata(description = "The trim function trims the message body (or expression) by removing all leading and trailing white spaces.",
+ label = "function", displayName = "Trims the message body (or expression)")
+ public static final String TRIM = "trim(exp)";
@Metadata(description = "The collate function iterates the message body and groups the data into sub lists of specified size."
+ " This can be used with the Splitter EIP to split a message body and group/batch"
+ " the split sub message into a group of N sub lists.",
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
index 013f75238880..4cbb82037970 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
@@ -180,6 +180,46 @@ public final class SimpleExpressionBuilder {
};
}
+ /**
+ * Trims the given expressions (uses message body if expression is null)
+ */
+ public static Expression trimExpression(final String expression) {
+ return new ExpressionAdapter() {
+ private Expression exp;
+
+ @Override
+ public void init(CamelContext context) {
+ if (expression != null) {
+ exp = context.resolveLanguage("simple").createExpression(expression);
+ exp.init(context);
+ }
+ }
+
+ @Override
+ public Object evaluate(Exchange exchange) {
+ String value;
+ if (exp != null) {
+ value = exp.evaluate(exchange, String.class);
+ } else {
+ value = exchange.getMessage().getBody(String.class);
+ }
+ if (value != null) {
+ value = value.trim();
+ }
+ return value;
+ }
+
+ @Override
+ public String toString() {
+ if (expression != null) {
+ return "trim(" + expression + ")";
+ } else {
+ return "trim()";
+ }
+ }
+ };
+ }
+
/**
* A ternary condition expression
*/
diff --git a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index 07d204a65242..9c8b6cd1a3c0 100644
--- a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++ b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -848,6 +848,17 @@ public class SimpleFunctionExpression extends LiteralExpression {
return SimpleExpressionBuilder.joinExpression(exp, separator, prefix);
}
+ // trim function
+ remainder = ifStartsWithReturnRemainder("trim(", function);
+ if (remainder != null) {
+ String exp = null;
+ String value = StringHelper.before(remainder, ")");
+ if (ObjectHelper.isNotEmpty(value)) {
+ exp = StringHelper.removeQuotes(value);
+ }
+ return SimpleExpressionBuilder.trimExpression(exp);
+ }
+
// messageHistory function
remainder = ifStartsWithReturnRemainder("messageHistory", function);
if (remainder != null) {
@@ -1170,7 +1181,7 @@ public class SimpleFunctionExpression extends LiteralExpression {
}
// miscellaneous functions
- String misc = createCodeExpressionMisc(function);
+ String misc = createCodeExpressionMisc(camelContext, function);
if (misc != null) {
return misc;
}
@@ -1800,7 +1811,7 @@ public class SimpleFunctionExpression extends LiteralExpression {
return factory.get().createCode(camelContext, function, token.getIndex());
}
- private String createCodeExpressionMisc(String function) {
+ private String createCodeExpressionMisc(CamelContext camelContext, String function) {
String remainder;
// substring function
@@ -1891,6 +1902,31 @@ public class SimpleFunctionExpression extends LiteralExpression {
return "skip(exchange, " + values.trim() + ")";
}
+ // trim function
+ remainder = ifStartsWithReturnRemainder("trim(", function);
+ if (remainder != null) {
+ String exp = null;
+ String values = StringHelper.beforeLast(remainder, ")");
+ if (ObjectHelper.isNotEmpty(values)) {
+ String[] tokens = codeSplitSafe(values, ',', true, true);
+ if (tokens.length != 1) {
+ throw new SimpleParserException(
+ "Valid syntax: ${trim(exp)} was: " + function, token.getIndex());
+ }
+ // single quotes should be double quotes
+ String s = tokens[0];
+ if (StringHelper.isSingleQuoted(s)) {
+ s = StringHelper.removeLeadingAndEndingQuotes(s);
+ s = StringQuoteHelper.doubleQuote(s);
+ }
+ exp = s;
+ }
+ if (ObjectHelper.isEmpty(exp)) {
+ exp = "null";
+ }
+ return "Object o = " + exp + ";\n return trim(exchange, o);";
+ }
+
// collate function
remainder = ifStartsWithReturnRemainder("collate(", function);
if (remainder != null) {
diff --git a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 9350ff2261ee..ed44c3276c26 100644
--- a/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -2397,6 +2397,28 @@ public class SimpleTest extends LanguageTestSupport {
assertNull(s);
}
+ @Test
+ public void testTrim() {
+ exchange.getMessage().setBody(" Hello World ");
+
+ Expression expression = context.resolveLanguage("simple").createExpression("${trim()}");
+ String s = expression.evaluate(exchange, String.class);
+ assertEquals("Hello World", s);
+
+ expression = context.resolveLanguage("simple").createExpression("${trim(${body})}");
+ s = expression.evaluate(exchange, String.class);
+ assertEquals("Hello World", s);
+
+ expression = context.resolveLanguage("simple").createExpression("${trim(' Hi '')}");
+ s = expression.evaluate(exchange, String.class);
+ assertEquals("Hi", s);
+
+ exchange.getMessage().setHeader("beer", " Carlsberg");
+ expression = context.resolveLanguage("simple").createExpression("${trim(${header.beer})}");
+ s = expression.evaluate(exchange, String.class);
+ assertEquals("Carlsberg", s);
+ }
+
@Test
public void testNewEmpty() {
assertExpressionCreateNewEmpty("list", List.class, v -> ((List) v).isEmpty());