(camel) 01/04: CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way.

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch lang5
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 2b4582724ffe3c3be04bf4d5e143bd59ddb2e589
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Feb 3 13:06:53 2024 +0100

    CAMEL-20378: Languages should be thread-safe and be configured only via 
properties array, all in the same way.
---
 .../org/apache/camel/language/csimple/CSimpleLanguage.java   |  2 +-
 .../camel/support/SingleInputTypedLanguageSupport.java       |  4 ++--
 .../java/org/apache/camel/support/TypedLanguageSupport.java  | 12 +-----------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git 
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
 
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
index 648974bdc09..0c38af295e0 100644
--- 
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
+++ 
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleLanguage.java
@@ -150,7 +150,7 @@ public class CSimpleLanguage extends TypedLanguageSupport 
implements StaticServi
 
     @Override
     public Expression createExpression(String expression, Object[] properties) 
{
-        Class<?> resultType = property(Class.class, properties, 0, 
getResultType());
+        Class<?> resultType = property(Class.class, properties, 0, null);
         if (Boolean.class == resultType || boolean.class == resultType) {
             // we want it compiled as a predicate
             return (Expression) createPredicate(expression);
diff --git 
a/core/camel-support/src/main/java/org/apache/camel/support/SingleInputTypedLanguageSupport.java
 
b/core/camel-support/src/main/java/org/apache/camel/support/SingleInputTypedLanguageSupport.java
index c57f2055344..caf18859500 100644
--- 
a/core/camel-support/src/main/java/org/apache/camel/support/SingleInputTypedLanguageSupport.java
+++ 
b/core/camel-support/src/main/java/org/apache/camel/support/SingleInputTypedLanguageSupport.java
@@ -39,7 +39,7 @@ public abstract class SingleInputTypedLanguageSupport extends 
TypedLanguageSuppo
 
     @Override
     public Expression createExpression(String expression, Object[] properties) 
{
-        Class<?> type = property(Class.class, properties, 0, getResultType());
+        Class<?> type = property(Class.class, properties, 0, null);
         String variable = property(String.class, properties, 1, null);
         String header = property(String.class, properties, 2, null);
         String property = property(String.class, properties, 3, null);
@@ -52,7 +52,7 @@ public abstract class SingleInputTypedLanguageSupport extends 
TypedLanguageSuppo
 
     @Override
     public Predicate createPredicate(String expression, Object[] properties) {
-        Class<?> type = property(Class.class, properties, 0, getResultType());
+        Class<?> type = property(Class.class, properties, 0, null);
         String variable = property(String.class, properties, 1, null);
         String header = property(String.class, properties, 2, null);
         String property = property(String.class, properties, 3, null);
diff --git 
a/core/camel-support/src/main/java/org/apache/camel/support/TypedLanguageSupport.java
 
b/core/camel-support/src/main/java/org/apache/camel/support/TypedLanguageSupport.java
index 921f1d1c5b7..5bd2b4bbe92 100644
--- 
a/core/camel-support/src/main/java/org/apache/camel/support/TypedLanguageSupport.java
+++ 
b/core/camel-support/src/main/java/org/apache/camel/support/TypedLanguageSupport.java
@@ -25,19 +25,9 @@ import org.apache.camel.support.builder.ExpressionBuilder;
  */
 public abstract class TypedLanguageSupport extends LanguageSupport {
 
-    private Class<?> resultType;
-
-    public Class<?> getResultType() {
-        return resultType;
-    }
-
-    public void setResultType(Class<?> resultType) {
-        this.resultType = resultType;
-    }
-
     @Override
     public Expression createExpression(String expression, Object[] properties) 
{
-        Class<?> type = property(Class.class, properties, 0, getResultType());
+        Class<?> type = property(Class.class, properties, 0, null);
         if (type == null || type == Object.class) {
             return createExpression(expression);
         }