You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/12/17 14:23:46 UTC
[camel] 08/09: CAMEL-13010: Deprecate camel-script
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fca8c431db6dd8b180bdef5783b79da53ad66a6e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 17 12:35:45 2018 +0100
CAMEL-13010: Deprecate camel-script
Conflicts:
camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
components/readme.adoc
---
.../src/main/java/org/apache/camel/builder/ExpressionClause.java | 2 ++
.../main/java/org/apache/camel/builder/ExpressionClauseSupport.java | 2 ++
.../java/org/apache/camel/model/language/JavaScriptExpression.java | 6 +++++-
components/camel-script/pom.xml | 2 +-
components/camel-script/src/main/docs/javaScript-language.adoc | 5 +++--
components/readme.adoc | 2 +-
6 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
index ae81c7b..705caba 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -420,7 +420,9 @@ public class ExpressionClause<T> extends ExpressionDefinition {
*
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
+ * @deprecated JavaScript is deprecated in Java 11 onwards
*/
+ @Deprecated
public T javaScript(String text) {
return delegate.javaScript(text);
}
diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index f972764..cc6a502 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -292,7 +292,9 @@ public class ExpressionClauseSupport<T> {
*
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
+ * @deprecated JavaScript is deprecated in Java 11 onwards
*/
+ @Deprecated
public T javaScript(String text) {
return expression(new JavaScriptExpression(text));
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java b/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
index a29b172..e048c08 100644
--- a/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
@@ -24,10 +24,14 @@ import org.apache.camel.spi.Metadata;
/**
* To use JavaScript in Camel expressions or predicates.
+ *
+ * @deprecated JavaScript is deprecated in Java 11 onwards
*/
-@Metadata(firstVersion = "1.0.0", label = "language,script", title = "JavaScript")
+@Metadata(firstVersion = "1.0.0", label = "language,script", title = "JavaScript",
+ deprecationNode = "JavaScript is deprecated in Java 11 onwards")
@XmlRootElement(name = "javaScript")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated
public class JavaScriptExpression extends ExpressionDefinition {
public JavaScriptExpression() {
diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml
index 648b966..c5de32d 100644
--- a/components/camel-script/pom.xml
+++ b/components/camel-script/pom.xml
@@ -28,7 +28,7 @@
<artifactId>camel-script</artifactId>
<packaging>jar</packaging>
- <name>Camel :: Script</name>
+ <name>Camel :: Script (deprecated)</name>
<description>Camel Script support</description>
<properties>
diff --git a/components/camel-script/src/main/docs/javaScript-language.adoc b/components/camel-script/src/main/docs/javaScript-language.adoc
index a554867..fbf90f6 100644
--- a/components/camel-script/src/main/docs/javaScript-language.adoc
+++ b/components/camel-script/src/main/docs/javaScript-language.adoc
@@ -1,7 +1,8 @@
-[[javaScript-language]]
-== JavaScript Language
+== JavaScript Language (deprecated)
*Available as of Camel version 1.0*
+*Available as of Camel version 1.0*
+
Camel supports
http://en.wikipedia.org/wiki/JavaScript[JavaScript/ECMAScript] among
diff --git a/components/readme.adoc b/components/readme.adoc
index 2c4e883..8b48140 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1006,7 +1006,7 @@ Number of Languages: 18 in 9 JAR artifacts (0 deprecated)
| link:camel-hl7/src/main/docs/terser-language.adoc[HL7 Terser] (camel-hl7) | 2.11 | To use HL7 terser scripts in Camel expressions or predicates.
-| link:camel-script/src/main/docs/javaScript-language.adoc[JavaScript] (camel-script) | 1.0 | To use JavaScript in Camel expressions or predicates.
+| link:camel-script/src/main/docs/javaScript-language.adoc[JavaScript] (camel-script) | 1.0 | *deprecated* To use JavaScript in Camel expressions or predicates.
| link:camel-jsonpath/src/main/docs/jsonpath-language.adoc[JsonPath] (camel-jsonpath) | 2.13 | To use JsonPath in Camel expressions or predicates.