You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2018/12/17 11:36:01 UTC
[camel] branch master updated: CAMEL-13010: Deprecate camel-script
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 475abd7 CAMEL-13010: Deprecate camel-script
475abd7 is described below
commit 475abd77f3858ab58d15a65ef2da4327ff0b2664
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 17 12:35:45 2018 +0100
CAMEL-13010: Deprecate camel-script
---
.../src/main/java/org/apache/camel/builder/ExpressionClause.java | 9 +++++++++
.../java/org/apache/camel/builder/ExpressionClauseSupport.java | 2 ++
.../org/apache/camel/model/language/JavaScriptExpression.java | 7 +++++--
components/camel-script/pom.xml | 2 +-
components/camel-script/src/main/docs/javaScript-language.adoc | 7 ++++---
components/readme.adoc | 4 ++--
6 files changed, 23 insertions(+), 8 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 2faa284..4654a31 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
@@ -432,6 +432,7 @@ public class ExpressionClause<T> extends ExpressionDefinition {
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T el(String text) {
return delegate.el(text);
}
@@ -454,7 +455,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);
}
@@ -571,6 +574,7 @@ public class ExpressionClause<T> extends ExpressionDefinition {
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T jxpath(String text) {
return delegate.jxpath(text);
}
@@ -582,6 +586,7 @@ public class ExpressionClause<T> extends ExpressionDefinition {
* @param lenient to configure whether lenient is in use or not
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T jxpath(String text, boolean lenient) {
return delegate.jxpath(text, lenient);
}
@@ -615,6 +620,7 @@ public class ExpressionClause<T> extends ExpressionDefinition {
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T php(String text) {
return delegate.php(text);
}
@@ -626,6 +632,7 @@ public class ExpressionClause<T> extends ExpressionDefinition {
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T python(String text) {
return delegate.python(text);
}
@@ -648,6 +655,7 @@ public class ExpressionClause<T> extends ExpressionDefinition {
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T ruby(String text) {
return delegate.ruby(text);
}
@@ -659,6 +667,7 @@ public class ExpressionClause<T> extends ExpressionDefinition {
* @param text the expression to be evaluated
* @return the builder to continue processing the DSL
*/
+ @Deprecated
public T sql(String text) {
return delegate.sql(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 a5ffc3e..3c93261 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
@@ -333,7 +333,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 160161a..ea169dc 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
@@ -25,11 +25,14 @@ import org.apache.camel.spi.Metadata;
/**
* To use JavaScript in Camel expressions or predicates.
*
- * @version
+ * @deprecated JavaScript is deprecated in Java 11 onwards
+ * @version
*/
-@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 74608c1..d0e6149 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 8bdac4f..9955f88 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
@@ -200,4 +201,4 @@ the download page for the latest versions).
<artifactId>camel-script</artifactId>
<version>x.x.x</version>
</dependency>
----------------------------------------
+---------------------------------------
\ No newline at end of file
diff --git a/components/readme.adoc b/components/readme.adoc
index a810db3..ddd26c8 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1059,7 +1059,7 @@ Expression Languages
^^^^^^^^^^^^^^^^^^^^
// languages: START
-Number of Languages: 24 in 12 JAR artifacts (6 deprecated)
+Number of Languages: 24 in 12 JAR artifacts (7 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -1081,7 +1081,7 @@ Number of Languages: 24 in 12 JAR artifacts (6 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.