You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2023/12/02 01:53:10 UTC
(camel-quarkus) 03/14: Fixed Joor because of CAMEL-20137
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 777b5f18a1c393e2089c5f77baab0b99c9e85542
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Wed Nov 22 11:02:31 2023 +0100
Fixed Joor because of CAMEL-20137
---
docs/modules/ROOT/examples/languages/{joor.yml => java.yml} | 8 ++++----
docs/modules/ROOT/examples/languages/joor.yml | 2 +-
docs/modules/ROOT/pages/reference/extensions/joor.adoc | 9 +++++----
.../quarkus/component/joor/deployment/JoorProcessor.java | 12 ++++++------
.../component/joor/runtime/JoorExpressionRecorder.java | 10 +++++-----
.../apache/camel/quarkus/component/joor/it/JoorRoute.java | 6 +++---
6 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/docs/modules/ROOT/examples/languages/joor.yml b/docs/modules/ROOT/examples/languages/java.yml
similarity index 69%
copy from docs/modules/ROOT/examples/languages/joor.yml
copy to docs/modules/ROOT/examples/languages/java.yml
index 2d199ab3dd..1ae6c0ce4e 100644
--- a/docs/modules/ROOT/examples/languages/joor.yml
+++ b/docs/modules/ROOT/examples/languages/java.yml
@@ -4,10 +4,10 @@ cqArtifactId: camel-quarkus-joor
cqArtifactIdBase: joor
cqNativeSupported: true
cqStatus: Stable
-cqDeprecated: false
+cqDeprecated: true
cqJvmSince: 2.0.0
cqNativeSince: 3.2.0
-cqCamelPartName: joor
-cqCamelPartTitle: jOOR
-cqCamelPartDescription: Evaluates a jOOR (Java compiled once at runtime) expression.
+cqCamelPartName: java
+cqCamelPartTitle: Java
+cqCamelPartDescription: Evaluates a Java (Java compiled once at runtime) expression.
cqExtensionPageTitle: jOOR
diff --git a/docs/modules/ROOT/examples/languages/joor.yml b/docs/modules/ROOT/examples/languages/joor.yml
index 2d199ab3dd..c0448be9f2 100644
--- a/docs/modules/ROOT/examples/languages/joor.yml
+++ b/docs/modules/ROOT/examples/languages/joor.yml
@@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-joor
cqArtifactIdBase: joor
cqNativeSupported: true
cqStatus: Stable
-cqDeprecated: false
+cqDeprecated: true
cqJvmSince: 2.0.0
cqNativeSince: 3.2.0
cqCamelPartName: joor
diff --git a/docs/modules/ROOT/pages/reference/extensions/joor.adoc b/docs/modules/ROOT/pages/reference/extensions/joor.adoc
index e8af9d47a0..1cfca00282 100644
--- a/docs/modules/ROOT/pages/reference/extensions/joor.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/joor.adoc
@@ -6,15 +6,15 @@
:cq-artifact-id: camel-quarkus-joor
:cq-native-supported: true
:cq-status: Stable
-:cq-status-deprecation: Stable
+:cq-status-deprecation: Stable Deprecated
:cq-description: Evaluate a jOOR (Java compiled once at runtime) expression language.
-:cq-deprecated: false
+:cq-deprecated: true
:cq-jvm-since: 2.0.0
:cq-native-since: 3.2.0
ifeval::[{doc-show-badges} == true]
[.badges]
-[.badge-key]##JVM since##[.badge-supported]##2.0.0## [.badge-key]##Native since##[.badge-supported]##3.2.0##
+[.badge-key]##JVM since##[.badge-supported]##2.0.0## [.badge-key]##Native since##[.badge-supported]##3.2.0## [.badge-key]##⚠️##[.badge-unsupported]##Deprecated##
endif::[]
Evaluate a jOOR (Java compiled once at runtime) expression language.
@@ -22,9 +22,10 @@ Evaluate a jOOR (Java compiled once at runtime) expression language.
[id="extensions-joor-whats-inside"]
== What's inside
+* xref:{cq-camel-components}:languages:java-language.adoc[Java language]
* xref:{cq-camel-components}:languages:joor-language.adoc[jOOR language]
-Please refer to the above link for usage and configuration details.
+Please refer to the above links for usage and configuration details.
[id="extensions-joor-maven-coordinates"]
== Maven coordinates
diff --git a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
index 03ef3755a7..392d824cad 100644
--- a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
+++ b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
@@ -39,9 +39,9 @@ import org.apache.camel.CamelContext;
import org.apache.camel.dsl.java.joor.CompilationUnit;
import org.apache.camel.dsl.java.joor.MultiCompile;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.language.joor.JavaLanguage;
import org.apache.camel.language.joor.JoorCompiler;
import org.apache.camel.language.joor.JoorExpression;
-import org.apache.camel.language.joor.JoorLanguage;
import org.apache.camel.language.joor.JoorScriptingCompiler;
import org.apache.camel.quarkus.component.joor.runtime.JoorExpressionCompiler;
import org.apache.camel.quarkus.component.joor.runtime.JoorExpressionConfig;
@@ -76,17 +76,17 @@ class JoorProcessor {
BuildProducer<JoorExpressionSourceBuildItem> producer) throws Exception {
if (result.isSuccess()) {
List<ExpressionBuildItem> joorExpressions = expressions.stream()
- .filter(exp -> "joor".equals(exp.getLanguage()))
+ .filter(exp -> "java".equals(exp.getLanguage()))
.collect(Collectors.toList());
List<ScriptBuildItem> joorScripts = scripts.stream()
- .filter(exp -> "joor".equals(exp.getLanguage()))
+ .filter(exp -> "java".equals(exp.getLanguage()))
.collect(Collectors.toList());
if (joorExpressions.isEmpty() && joorScripts.isEmpty()) {
return;
}
// Don't close it as it won't be started and some log entries are added on close/stop
CamelContext ctx = new DefaultCamelContext();
- try (JoorLanguage language = new JoorLanguage()) {
+ try (JavaLanguage language = new JavaLanguage()) {
language.setCamelContext(ctx);
language.setSingleQuotes(config.singleQuotes);
config.configResource.ifPresent(language::setConfigResource);
@@ -183,7 +183,7 @@ class JoorProcessor {
source.getClassName());
}
}
- final RuntimeValue<JoorLanguage> language = recorder.languageNewInstance(config, expressionCompilerBuilder,
+ final RuntimeValue<JavaLanguage> language = recorder.languageNewInstance(config, expressionCompilerBuilder,
expressionScriptingCompilerBuilder);
if (config.resultType.isPresent()) {
@@ -192,7 +192,7 @@ class JoorProcessor {
config.resultType.get());
}
- return new CamelBeanBuildItem("joor", JoorLanguage.class.getName(), language);
+ return new CamelBeanBuildItem("java", JavaLanguage.class.getName(), language);
}
return null;
}
diff --git a/extensions/joor/runtime/src/main/java/org/apache/camel/quarkus/component/joor/runtime/JoorExpressionRecorder.java b/extensions/joor/runtime/src/main/java/org/apache/camel/quarkus/component/joor/runtime/JoorExpressionRecorder.java
index 21a5c71e36..64a5755a16 100644
--- a/extensions/joor/runtime/src/main/java/org/apache/camel/quarkus/component/joor/runtime/JoorExpressionRecorder.java
+++ b/extensions/joor/runtime/src/main/java/org/apache/camel/quarkus/component/joor/runtime/JoorExpressionRecorder.java
@@ -19,24 +19,24 @@ package org.apache.camel.quarkus.component.joor.runtime;
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.runtime.annotations.Recorder;
import org.apache.camel.CamelContext;
-import org.apache.camel.language.joor.JoorLanguage;
+import org.apache.camel.language.joor.JavaLanguage;
import org.apache.camel.language.joor.JoorMethod;
import org.apache.camel.language.joor.JoorScriptingMethod;
@Recorder
public class JoorExpressionRecorder {
- public RuntimeValue<JoorLanguage> languageNewInstance(JoorExpressionConfig config,
+ public RuntimeValue<JavaLanguage> languageNewInstance(JoorExpressionConfig config,
RuntimeValue<JoorExpressionCompiler.Builder> compilerBuilder,
RuntimeValue<JoorExpressionScriptingCompiler.Builder> scriptingCompilerBuilder) {
- RuntimeValue<JoorLanguage> language = new RuntimeValue<>(
- new JoorLanguage(compilerBuilder.getValue().build(), scriptingCompilerBuilder.getValue().build()));
+ RuntimeValue<JavaLanguage> language = new RuntimeValue<>(
+ new JavaLanguage(compilerBuilder.getValue().build(), scriptingCompilerBuilder.getValue().build()));
language.getValue().setSingleQuotes(config.singleQuotes);
config.configResource.ifPresent(language.getValue()::setConfigResource);
return language;
}
- public void setResultType(RuntimeValue<JoorLanguage> language, String className) {
+ public void setResultType(RuntimeValue<JavaLanguage> language, String className) {
try {
language.getValue().setResultType(Class.forName(className, true, Thread.currentThread().getContextClassLoader()));
} catch (Exception e) {
diff --git a/integration-tests/joor/src/main/java/org/apache/camel/quarkus/component/joor/it/JoorRoute.java b/integration-tests/joor/src/main/java/org/apache/camel/quarkus/component/joor/it/JoorRoute.java
index 5475697aed..6cf9731207 100644
--- a/integration-tests/joor/src/main/java/org/apache/camel/quarkus/component/joor/it/JoorRoute.java
+++ b/integration-tests/joor/src/main/java/org/apache/camel/quarkus/component/joor/it/JoorRoute.java
@@ -24,7 +24,7 @@ public class JoorRoute extends RouteBuilder {
public void configure() {
routeTemplate("whereTo")
.templateParameter("bar")
- .templateBean("myBar", "joor", "resource:classpath:bean.txt")
+ .templateBean("myBar", "java", "resource:classpath:bean.txt")
.from("kamelet:source")
.to("bean:{{myBar}}");
@@ -32,10 +32,10 @@ public class JoorRoute extends RouteBuilder {
.kamelet("whereTo?bar=Shamrock");
from("direct:joorHello")
- .transform().joor("'Hello ' + body + ' from jOOR!'");
+ .transform().java("'Hello ' + body + ' from jOOR!'");
from("direct:predicate")
.choice()
- .when().joor("((int) body) / 2 > 10")
+ .when().java("((int) body) / 2 > 10")
.setBody().constant("High").endChoice()
.otherwise()
.setBody().constant("Low").endChoice();