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 c81edbdc3f1 CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way. c81edbdc3f1 is described below commit c81edbdc3f163e018466a9d723fd474f16f2b8cd Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Feb 6 09:45:38 2024 +0100 CAMEL-20378: Languages should be thread-safe and be configured only via properties array, all in the same way. --- .../camel/reifier/language/ExpressionReifier.java | 6 ++-- .../reifier/language/JqExpressionReifier.java | 35 ---------------------- 2 files changed, 2 insertions(+), 39 deletions(-) diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java index 4d80ecfa8cc..91e7a7d635b 100644 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java +++ b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/ExpressionReifier.java @@ -113,8 +113,6 @@ public class ExpressionReifier<T extends ExpressionDefinition> extends AbstractR return new JavaExpressionReifier(camelContext, definition); } else if (definition instanceof JoorExpression) { return new JoorExpressionReifier(camelContext, definition); - } else if (definition instanceof JqExpression) { - return new JqExpressionReifier(camelContext, definition); } else if (definition instanceof JsonPathExpression) { return new JsonPathExpressionReifier(camelContext, definition); } else if (definition instanceof MethodCallExpression) { @@ -129,10 +127,10 @@ public class ExpressionReifier<T extends ExpressionDefinition> extends AbstractR return new XPathExpressionReifier(camelContext, definition); } else if (definition instanceof XQueryExpression) { return new XQueryExpressionReifier(camelContext, definition); - } else if (definition instanceof SingleInputTypedExpressionDefinition) { - return new SingleInputTypedExpressionReifier<>(camelContext, definition); } else if (definition instanceof WasmExpression) { return new WasmExpressionReifier(camelContext, definition); + } else if (definition instanceof SingleInputTypedExpressionDefinition) { + return new SingleInputTypedExpressionReifier<>(camelContext, definition); } else if (definition instanceof TypedExpressionDefinition) { return new TypedExpressionReifier<>(camelContext, definition); } else if (definition != null) { diff --git a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/JqExpressionReifier.java b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/JqExpressionReifier.java deleted file mode 100644 index a712799a09d..00000000000 --- a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/JqExpressionReifier.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.reifier.language; - -import org.apache.camel.CamelContext; -import org.apache.camel.model.language.ExpressionDefinition; -import org.apache.camel.model.language.JqExpression; - -public class JqExpressionReifier extends SingleInputTypedExpressionReifier<JqExpression> { - - public JqExpressionReifier(CamelContext camelContext, ExpressionDefinition definition) { - super(camelContext, definition); - } - - @Override - public boolean isResolveOptionalExternalScriptEnabled() { - // we handle this in camel-jq - return false; - } - -}