This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 25c0c0efed50 camel-core - Add abs function to simple language
25c0c0efed50 is described below
commit 25c0c0efed50ce1c4e44e005c0bc8f18b4e93752
Author: Claus Ibsen <[email protected]>
AuthorDate: Tue Jan 20 07:09:07 2026 +0100
camel-core - Add abs function to simple language
---
.../org/apache/camel/catalog/languages/simple.json | 21 +++++------
.../language/csimple/joor/OriginalSimpleTest.java | 27 ++++++++++++++
.../org/apache/camel/language/simple/simple.json | 21 +++++------
.../modules/languages/pages/simple-language.adoc | 1 +
.../camel/language/csimple/CSimpleHelper.java | 13 +++++++
.../camel/language/simple/SimpleConstants.java | 3 ++
.../language/simple/SimpleExpressionBuilder.java | 41 ++++++++++++++++++++++
.../simple/ast/SimpleFunctionExpression.java | 39 +++++++++++++++++++-
.../apache/camel/language/simple/SimpleTest.java | 27 ++++++++++++++
9 files changed, 172 insertions(+), 21 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/simple.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/simple.json
index 41b617a2bf2a..8c653a379aae 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/simple.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/simple.json
@@ -96,15 +96,16 @@
"iif(predicate,trueExp,falseExp)": { "index": 70, "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": 71, "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": 72, "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": 73, "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": 74, "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": 75, "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": 76, "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": 77, "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": 78, "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": 79, "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": 80, "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": "}" },
- "base64Encode(exp)": { "index": 81, "kind": "function", "displayName":
"Base64 Encode", "group": "function", "label": "function", "required": false,
"javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "Base64 encodes the
message body (or expression)", "ognl": false, "suffix": "}" },
- "base64Decode(exp)": { "index": 82, "kind": "function", "displayName":
"Base64 Decode", "group": "function", "label": "function", "required": false,
"javaType": "byte[]", "prefix": "${", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "Base64 decodes the
message body (or expression)", "ognl": false, "suffix": "}" }
+ "abs(exp)": { "index": 73, "kind": "function", "displayName": "Absolute
Number", "group": "function", "label": "function", "required": false,
"javaType": "Long", "prefix": "${", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Converts the message body
(or expression) to a long number and return the absolute value.", "ognl":
false, "suffix": "}" },
+ "attachments": { "index": 74, "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": 75, "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": 76, "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": 77, "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": 78, "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": 79, "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": 80, "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": 81, "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": "}" },
+ "base64Encode(exp)": { "index": 82, "kind": "function", "displayName":
"Base64 Encode", "group": "function", "label": "function", "required": false,
"javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "Base64 encodes the
message body (or expression)", "ognl": false, "suffix": "}" },
+ "base64Decode(exp)": { "index": 83, "kind": "function", "displayName":
"Base64 Decode", "group": "function", "label": "function", "required": false,
"javaType": "byte[]", "prefix": "${", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "Base64 decodes the
message body (or expression)", "ognl": false, "suffix": "}" }
}
}
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 7571f16174e4..59e489de5caf 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
@@ -2694,6 +2694,33 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertEquals(1, exchange.getVariables().size());
}
+ @Test
+ public void testAbs() {
+ exchange.getMessage().setBody("-987");
+
+ Expression expression =
context.resolveLanguage("csimple").createExpression("${abs()}");
+ Long l = expression.evaluate(exchange, Long.class);
+ assertEquals(987L, l);
+
+ expression =
context.resolveLanguage("csimple").createExpression("${abs()}");
+ Integer i = expression.evaluate(exchange, Integer.class);
+ assertEquals(987, i);
+
+ expression =
context.resolveLanguage("csimple").createExpression("${abs(${body})}");
+ String s = expression.evaluate(exchange, String.class);
+ assertEquals("987", s);
+
+ exchange.getMessage().setHeader("myVal", "0");
+ expression =
context.resolveLanguage("csimple").createExpression("${abs(${header.myVal})}");
+ s = expression.evaluate(exchange, String.class);
+ assertEquals("0", s);
+
+ exchange.getMessage().setHeader("myVal", -222);
+ expression =
context.resolveLanguage("csimple").createExpression("${abs(${header.myVal})}");
+ s = expression.evaluate(exchange, String.class);
+ assertEquals("222", 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 41b617a2bf2a..8c653a379aae 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
@@ -96,15 +96,16 @@
"iif(predicate,trueExp,falseExp)": { "index": 70, "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": 71, "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": 72, "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": 73, "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": 74, "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": 75, "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": 76, "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": 77, "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": 78, "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": 79, "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": 80, "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": "}" },
- "base64Encode(exp)": { "index": 81, "kind": "function", "displayName":
"Base64 Encode", "group": "function", "label": "function", "required": false,
"javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "Base64 encodes the
message body (or expression)", "ognl": false, "suffix": "}" },
- "base64Decode(exp)": { "index": 82, "kind": "function", "displayName":
"Base64 Decode", "group": "function", "label": "function", "required": false,
"javaType": "byte[]", "prefix": "${", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "Base64 decodes the
message body (or expression)", "ognl": false, "suffix": "}" }
+ "abs(exp)": { "index": 73, "kind": "function", "displayName": "Absolute
Number", "group": "function", "label": "function", "required": false,
"javaType": "Long", "prefix": "${", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Converts the message body
(or expression) to a long number and return the absolute value.", "ognl":
false, "suffix": "}" },
+ "attachments": { "index": 74, "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": 75, "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": 76, "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": 77, "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": 78, "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": 79, "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": 80, "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": 81, "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": "}" },
+ "base64Encode(exp)": { "index": 82, "kind": "function", "displayName":
"Base64 Encode", "group": "function", "label": "function", "required": false,
"javaType": "String", "prefix": "${", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "Base64 encodes the
message body (or expression)", "ognl": false, "suffix": "}" },
+ "base64Decode(exp)": { "index": 83, "kind": "function", "displayName":
"Base64 Decode", "group": "function", "label": "function", "required": false,
"javaType": "byte[]", "prefix": "${", "deprecated": false, "deprecationNote":
"", "autowired": false, "secret": false, "description": "Base64 decodes the
message body (or expression)", "ognl": false, "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 da43bf51b13c..ac908913dc6a 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
@@ -126,6 +126,7 @@ NOTE: Some functions take 1 or more arguments enclosed in
parentheses, and argum
[width="100%",cols="10%,10%,80%",options="header",]
|====
|Function |Response Type |Description
+|`abs(exp)` | `Long` | Converts the message body (or expression) to a long
number and return the absolute value.
|`bean(name.method)` | `Object` | Invoking a bean expression using the
xref:components::bean-component.adoc[Bean] language. Specifying a method name,
you must use dot as the separator. We also support the ?method=methodname
syntax that is used by the xref:components::bean-component.adoc[Bean]
component. Camel will by default lookup a bean by the given name. However, if
you need to refer to a bean class (such as calling a static method), then you
can prefix with the type, such as `bean:ty [...]
|`body._OGNL_` | `Object` | The body invoked using a Camel _OGNL syntax_. For
example to invoke the `getCountryCode` on the message body, you can use
`${body.getCountryCode()}`. In the message body is a POJO then you can use a
short-hand syntax `${body.countryCode}`.
|`bodyAs(type)` | `<T>` | Converts the body to the given type determined by
its classname.
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 55f2a395f597..8247c789f591 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
@@ -832,6 +832,19 @@ public final class CSimpleHelper {
return CamelContextHelper.mandatoryLookup(exchange.getContext(),
generator, UuidGenerator.class);
}
+ public static Long abs(Exchange exchange, Object value) {
+ Long body;
+ if (value != null) {
+ body =
exchange.getContext().getTypeConverter().tryConvertTo(Long.class, exchange,
value);
+ } else {
+ body = exchange.getMessage().getBody(Long.class);
+ }
+ if (body != null) {
+ body = Math.abs(body);
+ }
+ return body;
+ }
+
public static String trim(Exchange exchange, Object value) {
String body;
if (value != null) {
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 a5986e630bba..d8d760d5f564 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
@@ -268,6 +268,9 @@ public final class SimpleConstants {
@Metadata(description = "The map function creates a LinkedHashMap with the
given set of pairs.",
label = "function", javaType = "java.util.LinkedHashMap",
displayName = "Create Map of pairs")
public static final String MAP = "map(key1,value1,...)";
+ @Metadata(description = "Converts the message body (or expression) to a
long number and return the absolute value.",
+ label = "function", javaType = "Long", displayName = "Absolute
Number")
+ public static final String ABS = "abs(exp)";
@Metadata(description = "All the attachments as a
Map<String,DataHandler.", javaType = "java.util.Map", label = "function")
public static final String ATTACHMENTS = "attachments";
@Metadata(description = "The number of attachments. Is 0 if there are no
attachments.", javaType = "int",
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 e756cd2a0696..030024c92a3d 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
@@ -248,6 +248,47 @@ public final class SimpleExpressionBuilder {
};
}
+ /**
+ * Converts the given expressions to a number and return the absolute
value (uses message body if expression is
+ * null)
+ */
+ public static Expression absExpression(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) {
+ Long value;
+ if (exp != null) {
+ value = exp.evaluate(exchange, Long.class);
+ } else {
+ value = exchange.getMessage().getBody(Long.class);
+ }
+ if (value != null) {
+ value = Math.abs(value);
+ }
+ return value;
+ }
+
+ @Override
+ public String toString() {
+ if (expression != null) {
+ return "abs(" + expression + ")";
+ } else {
+ return "abs()";
+ }
+ }
+ };
+ }
+
/**
* Trims the given expressions (uses message body if expression is null)
*/
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 1fe12a9bbee6..c3b153f1c0bf 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
@@ -1028,6 +1028,17 @@ public class SimpleFunctionExpression extends
LiteralExpression {
return SimpleExpressionBuilder.splitStringExpression(exp,
separator);
}
+ // abs function
+ remainder = ifStartsWithReturnRemainder("abs(", function);
+ if (remainder != null) {
+ String exp = null;
+ String value = StringHelper.beforeLast(remainder, ")");
+ if (ObjectHelper.isNotEmpty(value)) {
+ exp = StringHelper.removeQuotes(value);
+ }
+ return SimpleExpressionBuilder.absExpression(exp);
+ }
+
// trim function
remainder = ifStartsWithReturnRemainder("trim(", function);
if (remainder != null) {
@@ -2525,10 +2536,36 @@ public class SimpleFunctionExpression extends
LiteralExpression {
// separator must be in double quotes
separator = StringHelper.removeLeadingAndEndingQuotes(separator);
separator = separator != null ?
StringQuoteHelper.doubleQuote(separator) : "null";
- return "Object value = " + tokens[0] + ";\n " + "Object
width = " + tokens[1] + ";\n String separator = " + separator
+ return "Object value = " + tokens[0] + ";\n " + "Object
width = " + tokens[1]
+ + ";\n String separator = " + separator
+ ";\n return pad(exchange, value, width,
separator);";
}
+ // abs function
+ remainder = ifStartsWithReturnRemainder("abs(", 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: ${abs(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 abs(exchange, o);";
+ }
+
// trim function
remainder = ifStartsWithReturnRemainder("trim(", 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 0067daa2b7c2..a53049877c1b 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
@@ -2968,6 +2968,33 @@ public class SimpleTest extends LanguageTestSupport {
assertTrue(isEmptyAssertion.test(value));
}
+ @Test
+ public void testAbs() {
+ exchange.getMessage().setBody("-987");
+
+ Expression expression =
context.resolveLanguage("simple").createExpression("${abs()}");
+ Long l = expression.evaluate(exchange, Long.class);
+ assertEquals(987L, l);
+
+ expression =
context.resolveLanguage("simple").createExpression("${abs()}");
+ Integer i = expression.evaluate(exchange, Integer.class);
+ assertEquals(987, i);
+
+ expression =
context.resolveLanguage("simple").createExpression("${abs(${body})}");
+ String s = expression.evaluate(exchange, String.class);
+ assertEquals("987", s);
+
+ exchange.getMessage().setHeader("myVal", "0");
+ expression =
context.resolveLanguage("simple").createExpression("${abs(${header.myVal})}");
+ s = expression.evaluate(exchange, String.class);
+ assertEquals("0", s);
+
+ exchange.getMessage().setHeader("myVal", -222);
+ expression =
context.resolveLanguage("simple").createExpression("${abs(${header.myVal})}");
+ s = expression.evaluate(exchange, String.class);
+ assertEquals("222", s);
+ }
+
@Override
protected String getLanguageName() {
return "simple";
