[camel] 01/07: CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.

[davsclaus]

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

commit 077078a7f9b29adf6e6c86f0d4862a35e2cbdf8d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Oct 13 20:25:50 2021 +0200

    CAMEL-17079: Deprecate SimpleBuilder and migrate to not use it anymore.
---
 .../datasonnet/CamelDatasonnetJavaDslTest.java      |  4 ++--
 .../org/apache/camel/builder/BuilderSupport.java    | 21 +++++++++++++--------
 .../org/apache/camel/builder/SimpleBuilder.java     |  1 +
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git 
a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetJavaDslTest.java
 
b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetJavaDslTest.java
index 6f6a768..7dd4571 100644
--- 
a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetJavaDslTest.java
+++ 
b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetJavaDslTest.java
@@ -63,8 +63,8 @@ public class CamelDatasonnetJavaDslTest extends 
CamelTestSupport {
                 from("direct:basicTransform")
                         .routeId("basicTransform")
                         .setProperty("test", constant("HelloWorld"))
-                        .setProperty("count", 
simple("1").resultType(Integer.class))
-                        .setProperty("isActive", 
simple("true").resultType(Boolean.class))
+                        .setProperty("count", simple("1", Integer.class))
+                        .setProperty("isActive", simple("true", Boolean.class))
                         .setProperty("1. Full Name", constant("DataSonnet"))
                         
.transform(datasonnet("resource:classpath:simpleMapping.ds", String.class)
                                 
.bodyMediaType(MediaTypes.APPLICATION_JSON_VALUE)
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 97ea58d..31eb93b 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
@@ -28,6 +28,7 @@ import org.apache.camel.NoSuchEndpointException;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.model.language.ExchangePropertyExpression;
 import org.apache.camel.model.language.HeaderExpression;
+import org.apache.camel.model.language.SimpleExpression;
 import org.apache.camel.model.language.XPathExpression;
 import org.apache.camel.support.builder.Namespaces;
 import org.apache.camel.util.ObjectHelper;
@@ -177,29 +178,33 @@ public abstract class BuilderSupport implements 
CamelContextAware {
     /**
      * Returns a simple expression value builder
      */
-    public SimpleBuilder simple(String value) {
-        return SimpleBuilder.simple(value);
+    public ValueBuilder simple(String value) {
+        return simple(value, null);
     }
 
     /**
      * Returns a simple expression value builder
      */
-    public SimpleBuilder simple(String value, Class<?> resultType) {
-        return SimpleBuilder.simple(value, resultType);
+    public ValueBuilder simple(String value, Class<?> resultType) {
+        SimpleExpression exp = new SimpleExpression(value);
+        exp.setResultType(resultType);
+        return new ValueBuilder(exp);
     }
 
     /**
      * Returns a simple expression value builder, using String.format style
      */
-    public SimpleBuilder simpleF(String format, Object... values) {
-        return SimpleBuilder.simpleF(format, values);
+    public ValueBuilder simpleF(String format, Object... values) {
+        String exp = String.format(format, values);
+        return simple(exp);
     }
 
     /**
      * Returns a simple expression value builder, using String.format style
      */
-    public SimpleBuilder simpleF(String format, Class<?> resultType, Object... 
values) {
-        return SimpleBuilder.simpleF(format, resultType, values);
+    public ValueBuilder simpleF(String format, Class<?> resultType, Object... 
values) {
+        String exp = String.format(format, values);
+        return simple(exp, resultType);
     }
 
     /**
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/builder/SimpleBuilder.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/builder/SimpleBuilder.java
index 0f22e3b..2d631f2 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/builder/SimpleBuilder.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/builder/SimpleBuilder.java
@@ -29,6 +29,7 @@ import org.apache.camel.spi.Language;
  * This builder is available in the Java DSL from the {@link RouteBuilder} 
which means that using simple language for
  * {@link Expression}s or {@link Predicate}s is very easy with the help of 
this builder.
  */
+@Deprecated
 public class SimpleBuilder implements Predicate, Expression, 
ExpressionResultTypeAware {
 
     private String text;