This is an automated email from the ASF dual-hosted git repository.
gnodet 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 b8f577ad70b5 CAMEL-23151: Deprecate csimple language (#21948)
b8f577ad70b5 is described below
commit b8f577ad70b50ac22a1269205b8f782f7f113e76
Author: Guillaume Nodet <[email protected]>
AuthorDate: Thu Mar 12 18:13:08 2026 +0100
CAMEL-23151: Deprecate csimple language (#21948)
Deprecate the CSimple (compiled simple) language and the
camel-csimple-joor module. Users should migrate to the standard
Simple language which offers equivalent functionality.
- Add @Deprecated(since = "4.19") to all csimple classes, builders,
reifier and route parser model
- Add (deprecated) suffix to pom.xml names and doc page titles
- Add deprecationNote to CSimpleExpression model metadata
- Update upgrade guide with migration instructions
- Regenerate all catalog, DSL, and schema files
Co-authored-by: Claude Opus 4.6 <[email protected]>
---
.../org/apache/camel/catalog/languages/csimple.json | 2 +-
.../resources/org/apache/camel/catalog/models/csimple.json | 2 +-
.../org/apache/camel/catalog/others/csimple-joor.json | 2 +-
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
.../org/apache/camel/catalog/schemas/camel-xml-io.xsd | 2 +-
catalog/camel-csimple-maven-plugin/pom.xml | 2 +-
.../camel/parser/model/CamelCSimpleExpressionDetails.java | 1 +
components/camel-csimple-joor/pom.xml | 2 +-
.../META-INF/services/org/apache/camel/other.properties | 2 +-
.../src/generated/resources/csimple-joor.json | 2 +-
.../camel-csimple-joor/src/main/docs/csimple-joor.adoc | 11 +++++++++--
.../camel/language/csimple/joor/JoorCSimpleCompiler.java | 1 +
.../org/apache/camel/language/csimple/csimple.json | 2 +-
.../docs/modules/languages/pages/csimple-language.adoc | 11 +++++++++--
.../camel/language/csimple/CSimpleCodeGenerator.java | 1 +
.../org/apache/camel/language/csimple/CSimpleCompiler.java | 1 +
.../apache/camel/language/csimple/CSimpleException.java | 1 +
.../apache/camel/language/csimple/CSimpleExpression.java | 1 +
.../camel/language/csimple/CSimpleExpressionParser.java | 1 +
.../camel/language/csimple/CSimpleGeneratedCode.java | 1 +
.../org/apache/camel/language/csimple/CSimpleHelper.java | 1 +
.../org/apache/camel/language/csimple/CSimpleLanguage.java | 1 +
.../org/apache/camel/language/csimple/CSimpleMethod.java | 1 +
.../camel/language/csimple/CSimplePredicateParser.java | 1 +
.../org/apache/camel/language/csimple/CSimpleSupport.java | 1 +
.../META-INF/org/apache/camel/model/language/csimple.json | 2 +-
.../src/main/java/org/apache/camel/builder/Builder.java | 6 ++++++
.../main/java/org/apache/camel/builder/BuilderSupport.java | 6 ++++++
.../java/org/apache/camel/builder/ExpressionClause.java | 6 ++++++
.../org/apache/camel/builder/ExpressionClauseSupport.java | 14 +++++++++-----
.../org/apache/camel/builder/LanguageBuilderFactory.java | 6 ++++++
.../org/apache/camel/model/language/CSimpleExpression.java | 5 ++++-
.../camel/reifier/language/CSimpleExpressionReifier.java | 1 +
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc | 6 ++++++
.../camel/dsl/yaml/deserializers/ModelDeserializers.java | 2 +-
.../src/generated/resources/schema/camelYamlDsl.json | 1 +
36 files changed, 88 insertions(+), 22 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/csimple.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/csimple.json
index 2049f82683c2..b63b2f7532c8 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/csimple.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/csimple.json
@@ -4,7 +4,7 @@
"name": "csimple",
"title": "CSimple",
"description": "Evaluate a compiled simple expression.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "3.7.0",
"label": "language,java",
"javaType": "org.apache.camel.language.csimple.CSimpleLanguage",
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/csimple.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/csimple.json
index b214faf6b80b..cf91c79f33a3 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/csimple.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/csimple.json
@@ -4,7 +4,7 @@
"name": "csimple",
"title": "CSimple",
"description": "Evaluate a compiled simple expression.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "3.7.0",
"label": "language,java",
"javaType": "org.apache.camel.model.language.CSimpleExpression",
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/csimple-joor.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/csimple-joor.json
index e027725e0c53..f5ba8bff6142 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/csimple-joor.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/csimple-joor.json
@@ -4,7 +4,7 @@
"name": "csimple-joor",
"title": "CSimple jOOR",
"description": "jOOR compiler for csimple language",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "3.7.0",
"label": "language,java",
"supportLevel": "Stable",
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 668cc3f5c349..35334a80ae23 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -259,7 +259,7 @@ Encrypt and decrypt messages using Java Cryptography
Extension (JCE).
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Evaluate a compiled simple expression.
+Deprecated: Evaluate a compiled simple expression.
]]>
</xs:documentation>
</xs:annotation>
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
index fae166cc034d..7366738ab1b5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-xml-io.xsd
@@ -232,7 +232,7 @@ Encrypt and decrypt messages using Java Cryptography
Extension (JCE).
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Evaluate a compiled simple expression.
+Deprecated: Evaluate a compiled simple expression.
]]>
</xs:documentation>
</xs:annotation>
diff --git a/catalog/camel-csimple-maven-plugin/pom.xml
b/catalog/camel-csimple-maven-plugin/pom.xml
index fb932c734c40..8bc41492cb4e 100644
--- a/catalog/camel-csimple-maven-plugin/pom.xml
+++ b/catalog/camel-csimple-maven-plugin/pom.xml
@@ -30,7 +30,7 @@
<artifactId>camel-csimple-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>Camel :: Catalog :: CSimple Maven Plugin</name>
+ <name>Camel :: Catalog :: CSimple Maven Plugin (deprecated)</name>
<description>Maven plugin to source code generate csimple
language</description>
<dependencies>
diff --git
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelCSimpleExpressionDetails.java
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelCSimpleExpressionDetails.java
index 9ccc14671a69..cd93d9e60ca9 100644
---
a/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelCSimpleExpressionDetails.java
+++
b/catalog/camel-route-parser/src/main/java/org/apache/camel/parser/model/CamelCSimpleExpressionDetails.java
@@ -19,6 +19,7 @@ package org.apache.camel.parser.model;
/**
* Details about a parsed and discovered Camel compile simple expression.
*/
+@Deprecated(since = "4.19")
public class CamelCSimpleExpressionDetails extends LanguageExpressionDetails {
private String csimple;
diff --git a/components/camel-csimple-joor/pom.xml
b/components/camel-csimple-joor/pom.xml
index 2e1116bbf866..b921d16591e5 100644
--- a/components/camel-csimple-joor/pom.xml
+++ b/components/camel-csimple-joor/pom.xml
@@ -29,7 +29,7 @@
<artifactId>camel-csimple-joor</artifactId>
<packaging>jar</packaging>
- <name>Camel :: csimple jOOR</name>
+ <name>Camel :: csimple jOOR (deprecated)</name>
<description>jOOR compiler for csimple language</description>
<properties>
diff --git
a/components/camel-csimple-joor/src/generated/resources/META-INF/services/org/apache/camel/other.properties
b/components/camel-csimple-joor/src/generated/resources/META-INF/services/org/apache/camel/other.properties
index de0d361fe456..1b555c789946 100644
---
a/components/camel-csimple-joor/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++
b/components/camel-csimple-joor/src/generated/resources/META-INF/services/org/apache/camel/other.properties
@@ -3,5 +3,5 @@ name=csimple-joor
groupId=org.apache.camel
artifactId=camel-csimple-joor
version=4.19.0-SNAPSHOT
-projectName=Camel :: csimple jOOR
+projectName=Camel :: csimple jOOR (deprecated)
projectDescription=jOOR compiler for csimple language
diff --git
a/components/camel-csimple-joor/src/generated/resources/csimple-joor.json
b/components/camel-csimple-joor/src/generated/resources/csimple-joor.json
index e027725e0c53..f5ba8bff6142 100644
--- a/components/camel-csimple-joor/src/generated/resources/csimple-joor.json
+++ b/components/camel-csimple-joor/src/generated/resources/csimple-joor.json
@@ -4,7 +4,7 @@
"name": "csimple-joor",
"title": "CSimple jOOR",
"description": "jOOR compiler for csimple language",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "3.7.0",
"label": "language,java",
"supportLevel": "Stable",
diff --git a/components/camel-csimple-joor/src/main/docs/csimple-joor.adoc
b/components/camel-csimple-joor/src/main/docs/csimple-joor.adoc
index 88e543fb148e..14339e374ed6 100644
--- a/components/camel-csimple-joor/src/main/docs/csimple-joor.adoc
+++ b/components/camel-csimple-joor/src/main/docs/csimple-joor.adoc
@@ -1,16 +1,23 @@
-= CSimple jOOR Component
+= CSimple jOOR Component (deprecated)
:doctitle: CSimple jOOR
:shortname: csimple-joor
:artifactid: camel-csimple-joor
:description: jOOR compiler for csimple language
:since: 3.7
-:supportlevel: Stable
+:supportlevel: Stable-deprecated
+:deprecated: *deprecated*
:tabs-sync-option:
//Manually maintained attributes
:camel-spring-boot-name: csimple-joor
*Since Camel {since}*
+[WARNING]
+====
+The CSimple (compiled simple) language and the camel-csimple-joor component
are *deprecated* (since Camel 4.19) and will be removed in a future release.
+Use the xref:languages:simple-language.adoc[Simple] language instead.
+====
+
The CSimple (compiled simple) expression language can either be source code
generated and compiled together
with your application using the regular Java compiler. Or compiled at runtime
using jOOR during bootstrap.
diff --git
a/components/camel-csimple-joor/src/main/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompiler.java
b/components/camel-csimple-joor/src/main/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompiler.java
index 1fa390fd4e7d..9b92f1809587 100644
---
a/components/camel-csimple-joor/src/main/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompiler.java
+++
b/components/camel-csimple-joor/src/main/java/org/apache/camel/language/csimple/joor/JoorCSimpleCompiler.java
@@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory;
/**
* jOOR compiler for csimple language.
*/
+@Deprecated(since = "4.19")
@JdkService(CSimpleCompiler.FACTORY)
public class JoorCSimpleCompiler extends ServiceSupport implements
CSimpleCompiler, CamelContextAware, StaticService {
diff --git
a/core/camel-core-languages/src/generated/resources/META-INF/org/apache/camel/language/csimple/csimple.json
b/core/camel-core-languages/src/generated/resources/META-INF/org/apache/camel/language/csimple/csimple.json
index 2049f82683c2..b63b2f7532c8 100644
---
a/core/camel-core-languages/src/generated/resources/META-INF/org/apache/camel/language/csimple/csimple.json
+++
b/core/camel-core-languages/src/generated/resources/META-INF/org/apache/camel/language/csimple/csimple.json
@@ -4,7 +4,7 @@
"name": "csimple",
"title": "CSimple",
"description": "Evaluate a compiled simple expression.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "3.7.0",
"label": "language,java",
"javaType": "org.apache.camel.language.csimple.CSimpleLanguage",
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
index 34e649be84dd..f3ffa0b46d4e 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
@@ -1,10 +1,11 @@
-= CSimple Language
+= CSimple Language (deprecated)
:doctitle: CSimple
:shortname: csimple
:artifactid: camel-core-languages
:description: Evaluate a compiled simple expression.
:since: 3.7
-:supportlevel: Stable
+:supportlevel: Stable-deprecated
+:deprecated: *deprecated*
:tabs-sync-option:
//Manually maintained attributes
:camel-spring-boot-name: core
@@ -12,6 +13,12 @@
*Since Camel {since}*
+[WARNING]
+====
+The CSimple (compiled simple) language is *deprecated* (since Camel 4.19) and
will be removed in a future release.
+Use the xref:simple-language.adoc[Simple] language instead.
+====
+
The CSimple language is *compiled* xref:simple-language.adoc[Simple] language.
== Different between CSimple and Simple
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleCodeGenerator.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleCodeGenerator.java
index ea976ede2bac..d717da9c9ce0 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleCodeGenerator.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleCodeGenerator.java
@@ -31,6 +31,7 @@ import org.apache.camel.util.StringHelper;
*
* @see CSimpleGeneratedCode
*/
+@Deprecated(since = "4.19")
public class CSimpleCodeGenerator implements CamelContextAware {
private static final AtomicInteger UUID = new AtomicInteger();
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleCompiler.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleCompiler.java
index 246b8ef8ac33..3c229991d4d8 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleCompiler.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleCompiler.java
@@ -21,6 +21,7 @@ import org.apache.camel.CamelContext;
/**
* SPI plugin for custom compilers to use at runtime.
*/
+@Deprecated(since = "4.19")
public interface CSimpleCompiler {
/**
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleException.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleException.java
index e1502472a932..6a4609959aa7 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleException.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleException.java
@@ -21,6 +21,7 @@ import org.apache.camel.RuntimeCamelException;
/**
* General csimple exception.
*/
+@Deprecated(since = "4.19")
public class CSimpleException extends RuntimeCamelException {
private final String expression;
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpression.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpression.java
index 46d383e0d245..87eb782f2db0 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpression.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpression.java
@@ -23,6 +23,7 @@ import org.apache.camel.Predicate;
/**
* CSimple for {@link Expression} or {@link Predicate}.
*/
+@Deprecated(since = "4.19")
public interface CSimpleExpression extends Expression, Predicate {
/**
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpressionParser.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpressionParser.java
index bc06af83f13a..11d091221530 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpressionParser.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleExpressionParser.java
@@ -22,6 +22,7 @@ import
org.apache.camel.language.simple.SimpleExpressionParser;
/**
* Expression parser for csimple.
*/
+@Deprecated(since = "4.19")
public class CSimpleExpressionParser {
public String parseExpression(String expression) {
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleGeneratedCode.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleGeneratedCode.java
index 1d88a8c52035..faf07d6bdc9a 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleGeneratedCode.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleGeneratedCode.java
@@ -19,6 +19,7 @@ package org.apache.camel.language.csimple;
/**
* Generated csimple code.
*/
+@Deprecated(since = "4.19")
public final class CSimpleGeneratedCode {
private final String fqn;
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
index 8d66f869d6bb..adf74c990b99 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
@@ -73,6 +73,7 @@ import static org.apache.camel.util.StringHelper.between;
/**
* A set of helper as static imports for the Camel compiled simple language.
*/
+@Deprecated(since = "4.19")
public final class CSimpleHelper {
// this is special for the range operator where you define the range as
from..to (where from and to are numbers)
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 e9352d1d4f59..a305668b1a80 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
@@ -43,6 +43,7 @@ import org.apache.camel.util.StringHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated(since = "4.19")
@Language("csimple")
public class CSimpleLanguage extends TypedLanguageSupport implements
StaticService {
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleMethod.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleMethod.java
index 2dfa1195aa7a..ae576e91503b 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleMethod.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleMethod.java
@@ -26,6 +26,7 @@ import org.apache.camel.Message;
*
* @see CSimpleExpression
*/
+@Deprecated(since = "4.19")
public interface CSimpleMethod {
Object evaluate(CamelContext context, Exchange exchange, Message message,
Object body)
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimplePredicateParser.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimplePredicateParser.java
index b2ce514f1113..2487e46a5d3a 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimplePredicateParser.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimplePredicateParser.java
@@ -22,6 +22,7 @@ import org.apache.camel.language.simple.SimplePredicateParser;
/**
* Predicate parser for csimple.
*/
+@Deprecated(since = "4.19")
public class CSimplePredicateParser {
public String parsePredicate(String predicate) {
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleSupport.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleSupport.java
index 4fa20e20c736..ba3aaec0b66d 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleSupport.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleSupport.java
@@ -24,6 +24,7 @@ import org.apache.camel.util.ObjectHelper;
/**
* Base class for source code generateed csimple expressions.
*/
+@Deprecated(since = "4.19")
public abstract class CSimpleSupport implements CSimpleExpression,
CSimpleMethod {
@Override
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/language/csimple.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/language/csimple.json
index b214faf6b80b..cf91c79f33a3 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/language/csimple.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/language/csimple.json
@@ -4,7 +4,7 @@
"name": "csimple",
"title": "CSimple",
"description": "Evaluate a compiled simple expression.",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "3.7.0",
"label": "language,java",
"javaType": "org.apache.camel.model.language.CSimpleExpression",
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/Builder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/Builder.java
index f73d1e1b1886..9f760f2b4061 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/builder/Builder.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/builder/Builder.java
@@ -148,7 +148,10 @@ public final class Builder {
/**
* Returns a csimple expression
+ *
+ * @deprecated use {@link #simple(String)} instead
*/
+ @Deprecated(since = "4.19")
public static ValueBuilder csimple(String value) {
Expression exp = new CSimpleExpression(value);
return new ValueBuilder(exp);
@@ -156,7 +159,10 @@ public final class Builder {
/**
* Returns a csimple expression
+ *
+ * @deprecated use {@link #simple(String, Class)} instead
*/
+ @Deprecated(since = "4.19")
public static ValueBuilder csimple(String value, Class<?> resultType) {
CSimpleExpression exp = new CSimpleExpression(value);
exp.setResultType(resultType);
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
index f21224a19287..ec5af4c7c10f 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/BuilderSupport.java
@@ -191,14 +191,20 @@ public abstract class BuilderSupport implements
CamelContextAware {
/**
* Returns a compiled simple expression value builder
+ *
+ * @deprecated use {@link #simple(String)} instead
*/
+ @Deprecated(since = "4.19")
public ValueBuilder csimple(String value) {
return Builder.csimple(value);
}
/**
* Returns a compiled simple expression value builder
+ *
+ * @deprecated use {@link #simple(String, Class)} instead
*/
+ @Deprecated(since = "4.19")
public ValueBuilder csimple(String value, Class<?> resultType) {
return Builder.csimple(value, resultType);
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java
index 1153965d230b..be75c8e76c03 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClause.java
@@ -605,14 +605,20 @@ public class ExpressionClause<T> implements Expression,
Predicate {
/**
* Returns a compiled simple expression value builder
+ *
+ * @deprecated use {@link #simple(String)} instead
*/
+ @Deprecated(since = "4.19")
public T csimple(String value) {
return delegate.csimple(value);
}
/**
* Returns a compile simple expression value builder
+ *
+ * @deprecated use {@link #simple(String, Class)} instead
*/
+ @Deprecated(since = "4.19")
public T csimple(String value, Class<?> resultType) {
return delegate.csimple(value, resultType);
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index 4dcfaebd62ff..29d4615d0c34 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -737,9 +737,11 @@ public class ExpressionClauseSupport<T> implements
ExpressionFactoryAware, Predi
/**
* Evaluates a compiled simple expression
*
- * @param text the expression to be evaluated
- * @return the builder to continue processing the DSL
+ * @param text the expression to be evaluated
+ * @return the builder to continue processing the DSL
+ * @deprecated use {@link #simple(String)} instead
*/
+ @Deprecated(since = "4.19")
public T csimple(String text) {
return expression(new CSimpleExpression(text));
}
@@ -747,10 +749,12 @@ public class ExpressionClauseSupport<T> implements
ExpressionFactoryAware, Predi
/**
* Evaluates a compiled simple expression
*
- * @param text the expression to be evaluated
- * @param resultType the return type expected by the expression
- * @return the builder to continue processing the DSL
+ * @param text the expression to be evaluated
+ * @param resultType the return type expected by the expression
+ * @return the builder to continue processing the DSL
+ * @deprecated use {@link #simple(String, Class)} instead
*/
+ @Deprecated(since = "4.19")
public T csimple(String text, Class<?> resultType) {
CSimpleExpression exp = new CSimpleExpression(text);
exp.setResultType(resultType);
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/LanguageBuilderFactory.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/LanguageBuilderFactory.java
index 17eb16f7b22e..9d4e799a9bd1 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/LanguageBuilderFactory.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/LanguageBuilderFactory.java
@@ -66,14 +66,20 @@ public final class LanguageBuilderFactory {
/**
* Uses the CSimple language
+ *
+ * @deprecated use simple instead
*/
+ @Deprecated(since = "4.19")
public CSimpleExpression.Builder csimple() {
return new CSimpleExpression.Builder();
}
/**
* Uses the CSimple language
+ *
+ * @deprecated use simple instead
*/
+ @Deprecated(since = "4.19")
public CSimpleExpression.Builder csimple(String expression) {
var builder = csimple();
builder.expression(expression);
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/language/CSimpleExpression.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/language/CSimpleExpression.java
index 58dd52a6695a..2c8cb85d81b7 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/language/CSimpleExpression.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/language/CSimpleExpression.java
@@ -27,9 +27,11 @@ import org.apache.camel.spi.Metadata;
/**
* Evaluate a compiled simple expression.
*/
-@Metadata(firstVersion = "3.7.0", label = "language,java", title = "CSimple")
+@Metadata(firstVersion = "3.7.0", label = "language,java", title = "CSimple",
+ deprecationNote = "Use the Simple language instead")
@XmlRootElement(name = "csimple")
@XmlAccessorType(XmlAccessType.FIELD)
+@Deprecated(since = "4.19")
public class CSimpleExpression extends TypedExpressionDefinition {
@XmlAttribute
@@ -99,6 +101,7 @@ public class CSimpleExpression extends
TypedExpressionDefinition {
* {@code Builder} is a specific builder for {@link CSimpleExpression}.
*/
@XmlTransient
+ @Deprecated(since = "4.19")
public static class Builder extends AbstractBuilder<Builder,
CSimpleExpression> {
private String trimResult;
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/CSimpleExpressionReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/CSimpleExpressionReifier.java
index 4c4b9817ea07..d20733603350 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/CSimpleExpressionReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/language/CSimpleExpressionReifier.java
@@ -20,6 +20,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.model.language.CSimpleExpression;
import org.apache.camel.model.language.ExpressionDefinition;
+@Deprecated(since = "4.19")
public class CSimpleExpressionReifier extends
TypedExpressionReifier<CSimpleExpression> {
public CSimpleExpressionReifier(CamelContext camelContext,
ExpressionDefinition definition) {
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
index f3daa3e7ed47..63aac1a1808a 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_19.adoc
@@ -147,6 +147,12 @@ After:
uri: mock:end
----
+=== camel-csimple (Deprecation)
+
+The `csimple` (compiled simple) language has been deprecated. Use the `simple`
language instead.
+The `camel-csimple-joor` module is also deprecated. The csimple language and
related modules
+will be removed in a future release.
+
=== camel-simple
In the simple language then init blocks syntax has changed to require that
each variable ends with a semicolon and new line (no trailing comments etc is
allowed)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 1e366f785328..f546c90fc5c8 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -1679,7 +1679,7 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
displayName = "CSimple",
description = "Evaluate a compiled simple expression.",
- deprecated = false,
+ deprecated = true,
properties = {
@YamlProperty(name = "expression", type = "string",
required = true, description = "The expression value in your chosen language
syntax", displayName = "Expression"),
@YamlProperty(name = "id", type = "string", description =
"Sets the id of this node", displayName = "Id"),
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index b917b8388fbf..16cb7fc3796b 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -12739,6 +12739,7 @@
"org.apache.camel.model.language.CSimpleExpression" : {
"title" : "CSimple",
"description" : "Evaluate a compiled simple expression.",
+ "deprecated" : true,
"oneOf" : [ {
"type" : "string"
}, {
