[camel] branch master updated: CAMEL-15713: camel-joor - optimize a little bit

[davsclaus]

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 152e507  CAMEL-15713: camel-joor - optimize a little bit
152e507 is described below

commit 152e50744cdfa3ebfbafd3f2b4f9ef429988fb70
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Oct 21 10:49:37 2020 +0200

    CAMEL-15713: camel-joor - optimize a little bit
---
 .../org/apache/camel/language/joor/JoorCompiler.java    |  8 ++++----
 .../java/org/apache/camel/language/joor/JoorHelper.java | 17 +++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git 
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorCompiler.java
 
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorCompiler.java
index 84ad995..e68d196 100644
--- 
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorCompiler.java
+++ 
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorCompiler.java
@@ -208,14 +208,14 @@ public class JoorCompiler extends ServiceSupport 
implements StaticService {
 
     private String staticHelper(String script) {
         Matcher matcher = BODY_AS_PATTERN.matcher(script);
-        script = matcher.replaceAll("$1(exchange, $2$3)");
+        script = matcher.replaceAll("$1(message, $2$3)");
         matcher = BODY_AS_PATTERN_NO_CLASS.matcher(script);
-        script = matcher.replaceAll("$1(exchange, $2.class)");
+        script = matcher.replaceAll("$1(message, $2.class)");
 
         matcher = HEADER_AS_PATTERN.matcher(script);
-        script = matcher.replaceAll("$1(exchange, $2$3)");
+        script = matcher.replaceAll("$1(message, $2$3)");
         matcher = HEADER_AS_PATTERN_NO_CLASS.matcher(script);
-        script = matcher.replaceAll("$1(exchange, $2.class)");
+        script = matcher.replaceAll("$1(message, $2.class)");
 
         matcher = EXCHANGE_PROPERTY_AS_PATTERN.matcher(script);
         script = matcher.replaceAll("$1(exchange, $2$3)");
diff --git 
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorHelper.java
 
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorHelper.java
index df0a7b7..8359612 100644
--- 
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorHelper.java
+++ 
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JoorHelper.java
@@ -19,6 +19,7 @@ package org.apache.camel.language.joor;
 import java.util.Optional;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.Message;
 
 /**
  * A set of helper as static imports for the Camel jOOR language.
@@ -28,20 +29,20 @@ public final class JoorHelper {
     private JoorHelper() {
     }
 
-    public static <T> T bodyAs(Exchange exchange, Class<T> type) {
-        return exchange.getMessage().getBody(type);
+    public static <T> T bodyAs(Message message, Class<T> type) {
+        return message.getBody(type);
     }
 
-    public static <T> Optional<T> optionalBodyAs(Exchange exchange, Class<T> 
type) {
-        return Optional.ofNullable(exchange.getMessage().getBody(type));
+    public static <T> Optional<T> optionalBodyAs(Message message, Class<T> 
type) {
+        return Optional.ofNullable(message.getBody(type));
     }
 
-    public static <T> T headerAs(Exchange exchange, String name, Class<T> 
type) {
-        return exchange.getMessage().getHeader(name, type);
+    public static <T> T headerAs(Message message, String name, Class<T> type) {
+        return message.getHeader(name, type);
     }
 
-    public static <T> Optional<T> optionalHeaderAs(Exchange exchange, String 
name, Class<T> type) {
-        return Optional.ofNullable(exchange.getMessage().getHeader(name, 
type));
+    public static <T> Optional<T> optionalHeaderAs(Message message, String 
name, Class<T> type) {
+        return Optional.ofNullable(message.getHeader(name, type));
     }
 
     public static <T> T exchangePropertyAs(Exchange exchange, String name, 
Class<T> type) {