[camel] branch camel-4.0.x updated: CAMEL-20032: camel-yaml-dsl - Choice should not have steps in schema (#11813)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-4.0.x by this push:
     new 08722f284c7 CAMEL-20032: camel-yaml-dsl - Choice should not have steps 
in schema (#11813)
08722f284c7 is described below

commit 08722f284c7f64ae73571b6a1c334dcb175b6b2c
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Oct 23 15:13:50 2023 +0200

    CAMEL-20032: camel-yaml-dsl - Choice should not have steps in schema 
(#11813)
---
 .../camel/dsl/yaml/deserializers/ModelDeserializers.java      |  5 -----
 .../camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java   | 11 ++++++++++-
 .../src/generated/resources/schema/camelYamlDsl.json          |  6 ------
 3 files changed, 10 insertions(+), 12 deletions(-)

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 16ef6e4fe81..8a1fde1011c 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
@@ -1837,7 +1837,6 @@ public final class ModelDeserializers extends 
YamlDeserializerSupport {
                     @YamlProperty(name = "inherit-error-handler", type = 
"boolean"),
                     @YamlProperty(name = "otherwise", type = 
"object:org.apache.camel.model.OtherwiseDefinition", description = "Sets the 
otherwise node", displayName = "Otherwise"),
                     @YamlProperty(name = "precondition", type = "boolean", 
description = "Indicates whether this Choice EIP is in precondition mode or 
not. If so its branches (when/otherwise) are evaluated during startup to keep 
at runtime only the branch that matched.", displayName = "Precondition"),
-                    @YamlProperty(name = "steps", type = 
"array:org.apache.camel.model.ProcessorDefinition"),
                     @YamlProperty(name = "when", type = 
"array:org.apache.camel.model.WhenDefinition", description = "Sets the when 
nodes", displayName = "When")
             }
     )
@@ -1890,10 +1889,6 @@ public final class ModelDeserializers extends 
YamlDeserializerSupport {
                     target.setDescription(val);
                     break;
                 }
-                case "steps": {
-                    setSteps(target, node);
-                    break;
-                }
                 default: {
                     return false;
                 }
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
index 928498d1ef0..e01c5f3363e 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
@@ -534,7 +534,7 @@ public class GenerateYamlDeserializersMojo extends 
GenerateYamlSupportMojo {
                             .build());
         }
 
-        if (implementType(info, OUTPUT_NODE_CLASS)) {
+        if (shouldHaveSteps(info)) {
             caseAdded = true;
 
             setProperty.beginControlFlow("case \"steps\":");
@@ -1235,4 +1235,13 @@ public class GenerateYamlDeserializersMojo extends 
GenerateYamlSupportMojo {
 
         return true;
     }
+
+    private boolean shouldHaveSteps(ClassInfo info) {
+        // choice should not have steps
+        if ("ChoiceDefinition".equals(info.simpleName())) {
+            return false;
+        }
+        return implementType(info, OUTPUT_NODE_CLASS);
+    }
+
 }
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 9f14b8b194b..0d946deca50 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
@@ -578,12 +578,6 @@
             "title" : "Precondition",
             "description" : "Indicates whether this Choice EIP is in 
precondition mode or not. If so its branches (when/otherwise) are evaluated 
during startup to keep at runtime only the branch that matched."
           },
-          "steps" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : 
"#/items/definitions/org.apache.camel.model.ProcessorDefinition"
-            }
-          },
           "when" : {
             "type" : "array",
             "title" : "When",