[CAMEL-19479] Add threadId to simple language (#10475)

* [CAMEL-19479] Add `threadId` to simple language * [CAMEL-19479] Adding documentation * [CAMEL-19479] Code formatting --------- Co-authored-by: Adriano Machado <[email protected]>
apache · Jun 27, 2023 · b474dcf · b474dcf
1 parent e689d6f
commit b474dcf
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 2 deletions.
diff --git a/...csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java b/...csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
@@ -245,6 +245,13 @@ public void testTrimSimpleExpressions() {
         assertExpression("\n${in.body}\r".trim(), "<hello id='m123'>world!</hello>");
     }
 
+    @Test
+    public void testSimpleThreadId() {
+        long id = Thread.currentThread().getId();
+        assertExpression("${threadId}", id);
+        assertExpression("The id is ${threadId}", "The id is " + id);
+    }
+
     @Test
     public void testSimpleThreadName() {
         String name = Thread.currentThread().getName();

diff --git a/...camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc b/...camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
@@ -186,6 +186,9 @@ Exchange is being routed.
 |stepId |String |Returns the id of the current step the
 Exchange is being routed.
 
+|threadId |String |Returns the id of the current thread. Can be used for
+logging purpose.
+
 |threadName |String |Returns the name of the current thread. Can be used for
 logging purpose.
 

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
@@ -216,6 +216,10 @@ public static String threadName() {
         return Thread.currentThread().getName();
     }
 
+    public static long threadId() {
+        return Thread.currentThread().getId();
+    }
+
     public static String hostName() {
         return InetAddressUtil.getLocalHostNameSafe();
     }

diff --git a/...anguages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java b/...anguages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -439,6 +439,8 @@ private Expression createSimpleExpressionDirectly(CamelContext camelContext, Str
             return ExpressionBuilder.exchangeExceptionMessageExpression();
         } else if (ObjectHelper.equal(expression, "exception.stacktrace")) {
             return ExpressionBuilder.exchangeExceptionStackTraceExpression();
+        } else if (ObjectHelper.equal(expression, "threadId")) {
+            return ExpressionBuilder.threadIdExpression();
         } else if (ObjectHelper.equal(expression, "threadName")) {
             return ExpressionBuilder.threadNameExpression();
         } else if (ObjectHelper.equal(expression, "hostname")) {
@@ -846,6 +848,8 @@ public String createCodeDirectly(String expression) throws SimpleParserException
             return "exceptionMessage(exchange)";
         } else if (ObjectHelper.equal(expression, "exception.stacktrace")) {
             return "exceptionStacktrace(exchange)";
+        } else if (ObjectHelper.equal(expression, "threadId")) {
+            return "threadId()";
         } else if (ObjectHelper.equal(expression, "threadName")) {
             return "threadName()";
         } else if (ObjectHelper.equal(expression, "hostname")) {

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
@@ -244,6 +244,13 @@ public void testTrimSimpleExpressions() throws Exception {
         assertExpression("\n${in.body}\r".trim(), "<hello id='m123'>world!</hello>");
     }
 
+    @Test
+    public void testSimpleThreadId() throws Exception {
+        long id = Thread.currentThread().getId();
+        assertExpression("${threadId}", id);
+        assertExpression("The id is ${threadId}", "The id is " + id);
+    }
+
     @Test
     public void testSimpleThreadName() throws Exception {
         String name = Thread.currentThread().getName();
@@ -337,7 +344,7 @@ public void testOGNLBodyListAndMap() throws Exception {
     @Test
     public void testOGNLBodyEmptyList() throws Exception {
         Map<String, List<String>> map = new HashMap<>();
-        map.put("list", new ArrayList<String>());
+        map.put("list", new ArrayList<>());
 
         exchange.getIn().setBody(map);
 

diff --git a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -992,6 +992,24 @@ public static Expression singleInputExpression(String headerName, String propert
         return exp;
     }
 
+    /**
+     * Returns the expression for the current thread id
+     */
+
+    public static Expression threadIdExpression() {
+        return new ExpressionAdapter() {
+            @Override
+            public Object evaluate(Exchange exchange) {
+                return Thread.currentThread().getId();
+            }
+
+            @Override
+            public String toString() {
+                return "threadId";
+            }
+        };
+    }
+
     /**
      * Returns the expression for the current thread name
      */

diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -80,7 +80,7 @@
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
         </dependency>
-	<dependency>
+        <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-shared-utils</artifactId>
             <version>${maven-shared-utils-plugin-version}</version>