(camel) 01/02: camel-yaml-dsl - Fix some model stuff

[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 67b632ed28cd4896424cc14b910d3c01a7790bb6
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Dec 8 13:13:28 2023 +0100

    camel-yaml-dsl - Fix some model stuff
---
 .../ErrorHandlerBuilderDeserializer.java           | 24 +++++++++++-----------
 .../yaml/deserializers/KameletDeserializer.java    |  4 ----
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ErrorHandlerBuilderDeserializer.java
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ErrorHandlerBuilderDeserializer.java
index e1b0ed08426..545fc9e300e 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ErrorHandlerBuilderDeserializer.java
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/ErrorHandlerBuilderDeserializer.java
@@ -48,24 +48,24 @@ import static 
org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.setDeseri
           nodes = { "error-handler", "errorHandler" },
           order = YamlDeserializerResolver.ORDER_DEFAULT,
           properties = {
-                  @YamlProperty(name = "dead-letter-channel",
+                  @YamlProperty(name = "deadLetterChannel",
                                 type = 
"object:org.apache.camel.model.errorhandler.DeadLetterChannelDefinition",
-                                oneOf = "error-handler"),
-                  @YamlProperty(name = "default-error-handler",
+                                oneOf = "errorHandler"),
+                  @YamlProperty(name = "defaultErrorHandler",
                                 type = 
"object:org.apache.camel.model.errorhandler.DefaultErrorHandlerDefinition",
-                                oneOf = "error-handler"),
-                  @YamlProperty(name = "jta-transaction-error-handler",
+                                oneOf = "errorHandler"),
+                  @YamlProperty(name = "jtaTransactionErrorHandler",
                                 type = 
"object:org.apache.camel.model.errorhandler.JtaTransactionErrorHandlerDefinition",
-                                oneOf = "error-handler"),
-                  @YamlProperty(name = "no-error-handler",
+                                oneOf = "errorHandler"),
+                  @YamlProperty(name = "noErrorHandler",
                                 type = 
"object:org.apache.camel.model.errorhandler.NoErrorHandlerDefinition",
-                                oneOf = "error-handler"),
-                  @YamlProperty(name = "ref-error-handler",
+                                oneOf = "errorHandler"),
+                  @YamlProperty(name = "refErrorHandler",
                                 type = 
"object:org.apache.camel.model.errorhandler.RefErrorHandlerDefinition",
-                                oneOf = "error-handler"),
-                  @YamlProperty(name = "spring-transaction-error-handler",
+                                oneOf = "errorHandler"),
+                  @YamlProperty(name = "springTransactionErrorHandler",
                                 type = 
"object:org.apache.camel.model.errorhandler.SpringTransactionErrorHandlerDefinition",
-                                oneOf = "error-handler"),
+                                oneOf = "errorHandler"),
           })
 public class ErrorHandlerBuilderDeserializer implements ConstructNode {
 
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java
index 5d7fa5cc2b9..04aa2110d86 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/KameletDeserializer.java
@@ -36,7 +36,6 @@ import org.snakeyaml.engine.v2.nodes.NodeTuple;
           order = YamlDeserializerResolver.ORDER_DEFAULT,
           nodes = "kamelet",
           properties = {
-                  @YamlProperty(name = "inheritErrorHandler", type = 
"boolean"),
                   @YamlProperty(name = "name", type = "string", required = 
true),
                   @YamlProperty(name = "parameters", type = "object"),
                   @YamlProperty(name = "steps", type = 
"array:org.apache.camel.model.ProcessorDefinition")
@@ -81,9 +80,6 @@ public class KameletDeserializer extends 
YamlDeserializerBase<KameletDefinition>
                 case "name":
                     name = asText(val);
                     break;
-                case "inheritErrorHandler":
-                    target.setInheritErrorHandler(asBoolean(val));
-                    break;
                 case "parameters":
                     parameters = asScalarMap(tuple.getValueNode());
                     break;