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


The following commit(s) were added to refs/heads/main by this push:
     new a964608  CAMEL-17585: Sage EIP - Options on Saga was not output in 
json metadata. Update model to be aligned how other EIPs does that.
a964608 is described below

commit a9646086f935e521490e11984a85c7ffaf9f0481
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Feb 2 12:26:11 2022 +0100

    CAMEL-17585: Sage EIP - Options on Saga was not output in json metadata. 
Update model to be aligned how other EIPs does that.
---
 .../org/apache/camel/spring/processor/saga.xml     | 10 ++---
 .../org/apache/camel/spring/processor/sagaRef.xml  |  8 ++--
 .../services/org/apache/camel/model.properties     |  1 +
 .../resources/org/apache/camel/model/jaxb.index    |  1 +
 .../resources/org/apache/camel/model/saga.json     |  2 +-
 .../org/apache/camel/model/sagaOption.json         | 20 ++++++++++
 .../org/apache/camel/model/PropertyDefinition.java |  4 +-
 .../org/apache/camel/model/SagaDefinition.java     |  2 +-
 .../apache/camel/model/SagaOptionDefinition.java   | 40 ++++++++------------
 .../java/org/apache/camel/reifier/SagaReifier.java |  2 +-
 .../java/org/apache/camel/xml/in/ModelParser.java  | 18 +++------
 .../ROOT/pages/camel-3x-upgrade-guide-3_16.adoc    | 36 ++++++++++++++++++
 .../dsl/yaml/deserializers/ModelDeserializers.java | 32 +++++++++++++---
 .../deserializers/ModelDeserializersResolver.java  |  2 +
 .../src/generated/resources/camel-yaml-dsl.json    | 27 ++++++++++---
 .../src/generated/resources/camelYamlDsl.json      | 24 +++++++++---
 .../org/apache/camel/dsl/yaml/SagaTest.groovy      | 44 +++++++++++-----------
 17 files changed, 183 insertions(+), 90 deletions(-)

diff --git 
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/saga.xml
 
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/saga.xml
index a4e52ca..6a70c04 100644
--- 
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/saga.xml
+++ 
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/saga.xml
@@ -33,12 +33,12 @@
       <saga>
         <compensation uri="mock:compensation" />
         <completion uri="mock:completion" />
-        <option optionName="myOptionKey">
+        <sagaOption name="myOptionKey">
           <constant>myOptionValue</constant>
-        </option>
-        <option optionName="myOptionKey2">
+        </sagaOption>
+        <sagaOption name="myOptionKey2">
           <constant>myOptionValue2</constant>
-        </option>
+        </sagaOption>
       </saga>
       <choice>
         <when>
@@ -49,8 +49,6 @@
       <to uri="mock:end"/>
     </route>
 
-
-
   </camelContext>
   <!-- END SNIPPET: example -->
 
diff --git 
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sagaRef.xml
 
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sagaRef.xml
index 35acf23..098a793 100644
--- 
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sagaRef.xml
+++ 
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sagaRef.xml
@@ -34,12 +34,12 @@
             <saga sagaServiceRef="mySagaService">
                 <compensation uri="mock:compensation"/>
                 <completion uri="mock:completion"/>
-                <option optionName="myOptionKey">
+                <sagaOption name="myOptionKey">
                     <constant>myOptionValue</constant>
-                </option>
-                <option optionName="myOptionKey2">
+                </sagaOption>
+                <sagaOption name="myOptionKey2">
                     <constant>myOptionValue2</constant>
-                </option>
+                </sagaOption>
             </saga>
             <choice>
                 <when>
diff --git 
a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
 
b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
index 9a24bbf..c50cf9d 100644
--- 
a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
+++ 
b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties
@@ -149,6 +149,7 @@ routes
 routingSlip
 rss
 saga
+sagaOption
 sample
 script
 security
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/jaxb.index
 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/jaxb.index
index 6eb596d..c14b73c 100644
--- 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/jaxb.index
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/jaxb.index
@@ -78,6 +78,7 @@ RoutesDefinition
 RoutingSlipDefinition
 SagaCompletionMode
 SagaDefinition
+SagaOptionDefinition
 SagaPropagation
 SamplingDefinition
 ScriptDefinition
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json
 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json
index 0da4305..cae9146 100644
--- 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json
@@ -17,7 +17,7 @@
     "timeout": { "kind": "attribute", "displayName": "Timeout", "required": 
false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Set the maximum amount of 
time for the Saga. After the timeout is expired, the saga will be compensated 
automatically (unless a different decision has been taken in the meantime)." },
     "compensation": { "kind": "element", "displayName": "Compensation", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.SagaActionUriDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "The compensation endpoint 
URI that must be called to compensate all changes done in the route. The route 
corresponding to the compensation URI must perform compensation and complete 
without error. If errors occur during compensation, the saga serv [...]
     "completion": { "kind": "element", "displayName": "Completion", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.SagaActionUriDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "The completion endpoint 
URI that will be called when the Saga is completed successfully. The route 
corresponding to the completion URI must perform completion tasks and terminate 
without error. If errors occur during completion, the saga service may c [...]
-    "option": { "kind": "element", "displayName": "Option", "required": false, 
"type": "array", "javaType": 
"java.util.List<org.apache.camel.model.SagaOptionDefinition>", "deprecated": 
false, "autowired": false, "secret": false, "description": "Allows to save 
properties of the current exchange in order to re-use them in a 
compensation\/completion callback route. Options are usually helpful e.g. to 
store and retrieve identifiers of objects that should be deleted in 
compensating actions. O [...]
+    "sagaOption": { "kind": "element", "displayName": "Saga Option", 
"required": false, "type": "array", "javaType": 
"java.util.List<org.apache.camel.model.SagaOptionDefinition>", "deprecated": 
false, "autowired": false, "secret": false, "description": "Allows to save 
properties of the current exchange in order to re-use them in a 
compensation\/completion callback route. Options are usually helpful e.g. to 
store and retrieve identifiers of objects that should be deleted in 
compensating a [...]
     "sagaServiceRef": { "kind": "attribute", "displayName": "Saga Service 
Ref", "required": false, "type": "string", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "description": 
"Refers to the id to lookup in the registry for the specific CamelSagaService 
to use." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/sagaOption.json
 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/sagaOption.json
new file mode 100644
index 0000000..ecd347d
--- /dev/null
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/sagaOption.json
@@ -0,0 +1,20 @@
+{
+  "model": {
+    "kind": "model",
+    "name": "sagaOption",
+    "title": "Saga Option",
+    "description": "Allows declaring options on Sagas",
+    "deprecated": false,
+    "label": "configuration",
+    "javaType": "org.apache.camel.model.SagaOptionDefinition",
+    "abstract": false,
+    "input": true,
+    "output": false
+  },
+  "properties": {
+    "expression": { "kind": "expression", "displayName": "Expression", 
"required": true, "type": "object", "javaType": 
"org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", 
"csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser", 
"joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", 
"spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, 
"autowired": false, "secret": false },
+    "name": { "kind": "attribute", "displayName": "Name", "required": true, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Name of the option. It 
identifies the name of the header where the value of the expression will be 
stored when the compensation or completion routes will be called." },
+    "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
+    "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
+  }
+}
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinition.java
index 4730894..ad83f1d 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinition.java
@@ -31,9 +31,9 @@ import org.apache.camel.spi.Metadata;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class PropertyDefinition {
     @XmlAttribute(required = true)
-    String key;
+    private String key;
     @XmlAttribute(required = true)
-    String value;
+    private String value;
 
     public PropertyDefinition() {
     }
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
index 3568c71..d871ae9 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
@@ -62,7 +62,7 @@ public class SagaDefinition extends 
OutputDefinition<SagaDefinition> {
     @XmlElement
     private SagaActionUriDefinition completion;
 
-    @XmlElement(name = "option")
+    @XmlElement(name = "sagaOption")
     private List<SagaOptionDefinition> options;
 
     @XmlAttribute
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
index d8fb627..6cc71cc 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
@@ -19,7 +19,7 @@ package org.apache.camel.model;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlRootElement;
 
 import org.apache.camel.Expression;
 import org.apache.camel.model.language.ExpressionDefinition;
@@ -29,49 +29,36 @@ import org.apache.camel.spi.Metadata;
  * Allows declaring options on Sagas
  */
 @Metadata(label = "configuration")
+@XmlRootElement(name = "sagaOption")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SagaOptionDefinition implements HasExpressionType {
+public class SagaOptionDefinition extends ExpressionNode {
 
     @XmlAttribute(required = true)
-    private String optionName;
-
-    @XmlElementRef
-    private ExpressionDefinition expression;
+    private String name;
 
     public SagaOptionDefinition() {
     }
 
-    public SagaOptionDefinition(String optionName, Expression expression) {
-        setOptionName(optionName);
+    public SagaOptionDefinition(String name, Expression expression) {
+        setName(name);
         setExpression(ExpressionNodeHelper.toExpressionDefinition(expression));
     }
 
     @Override
     public String toString() {
-        return "option:" + getOptionName() + "=" + getExpression();
+        return "option:" + getName() + "=" + getExpression();
     }
 
     /**
      * Name of the option. It identifies the name of the header where the 
value of the expression will be stored when
      * the compensation or completion routes will be called.
      */
-    public void setOptionName(String optionName) {
-        this.optionName = optionName;
-    }
-
-    public String getOptionName() {
-        return optionName;
-    }
-
-    public ExpressionDefinition getExpression() {
-        return expression;
+    public void setName(String name) {
+        this.name = name;
     }
 
-    /**
-     * The expression to be used to determine the value of the option.
-     */
-    public void setExpression(ExpressionDefinition expression) {
-        this.expression = expression;
+    public String getName() {
+        return name;
     }
 
     @Override
@@ -83,4 +70,9 @@ public class SagaOptionDefinition implements 
HasExpressionType {
     public void setExpressionType(ExpressionDefinition expressionType) {
         setExpression(expressionType);
     }
+
+    @Override
+    public String getShortName() {
+        return "sagaOption";
+    }
 }
diff --git 
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SagaReifier.java
 
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SagaReifier.java
index c7025e8..32d3c64 100644
--- 
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SagaReifier.java
+++ 
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SagaReifier.java
@@ -54,7 +54,7 @@ public class SagaReifier extends 
ProcessorReifier<SagaDefinition> {
         Map<String, Expression> optionsMap = new TreeMap<>();
         if (definition.getOptions() != null) {
             for (SagaOptionDefinition optionDef : definition.getOptions()) {
-                String optionName = optionDef.getOptionName();
+                String optionName = optionDef.getName();
                 Expression expr = optionDef.getExpression();
                 optionsMap.put(optionName, expr);
             }
diff --git 
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java 
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 34ffeb1..a4b0ff4 100644
--- 
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++ 
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -1247,7 +1247,7 @@ public class ModelParser extends BaseParser {
             switch (key) {
                 case "compensation": 
def.setCompensation(doParseSagaActionUriDefinition()); break;
                 case "completion": 
def.setCompletion(doParseSagaActionUriDefinition()); break;
-                case "option": doAdd(doParseSagaOptionDefinition(), 
def.getOptions(), def::setOptions); break;
+                case "sagaOption": doAdd(doParseSagaOptionDefinition(), 
def.getOptions(), def::setOptions); break;
                 default: return outputDefinitionElementHandler().accept(def, 
key);
             }
             return true;
@@ -1259,19 +1259,12 @@ public class ModelParser extends BaseParser {
     }
     protected SagaOptionDefinition doParseSagaOptionDefinition() throws 
IOException, XmlPullParserException {
         return doParse(new SagaOptionDefinition(), (def, key, val) -> {
-            if ("optionName".equals(key)) {
-                def.setOptionName(val);
-                return true;
-            }
-            return false;
-        }, (def, key) -> {
-            ExpressionDefinition v = doParseExpressionDefinitionRef(key);
-            if (v != null) { 
-                def.setExpression(v);
+            if ("name".equals(key)) {
+                def.setName(val);
                 return true;
             }
-            return false;
-        }, noValueHandler());
+            return processorDefinitionAttributeHandler().accept(def, key, val);
+        }, expressionNodeElementHandler(), noValueHandler());
     }
     protected SamplingDefinition doParseSamplingDefinition() throws 
IOException, XmlPullParserException {
         return doParse(new SamplingDefinition(), (def, key, val) -> {
@@ -3210,6 +3203,7 @@ public class ModelParser extends BaseParser {
             case "route": return doParseRouteDefinition();
             case "routingSlip": return doParseRoutingSlipDefinition();
             case "saga": return doParseSagaDefinition();
+            case "sagaOption": return doParseSagaOptionDefinition();
             case "sample": return doParseSamplingDefinition();
             case "script": return doParseScriptDefinition();
             case "setBody": return doParseSetBodyDefinition();
diff --git 
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
index 66d1a71..2199e5d 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_16.adoc
@@ -21,3 +21,39 @@ and the TypeConverterExistsLoggingLevel from `WARN` to 
`DEBUG`.
 Previously when Camel detected a duplicate type converter during startup, 
Camel would
 override the existing converter and log a WARN. A more correct behaviour would 
be
 to keep the existing and ignore the duplicate.
+
+=== Saga EIP
+
+Removed the deprecated `timeoutInMilliseconds` option, use `timeout` instead.
+
+Renamed `<option>` to `<sagaOption>` and `optionName` to `name`. When using 
XML DSL then this is affected as follows:
+
+[source,xml]
+----
+<saga sagaServiceRef="mySagaService">
+    <compensation uri="mock:compensation"/>
+    <completion uri="mock:completion"/>
+    <option optionName="myOptionKey">
+        <constant>myOptionValue</constant>
+    </option>
+    <option optionName="myOptionKey2">
+        <constant>myOptionValue2</constant>
+    </option>
+</saga>
+----
+
+To:
+
+[source,xml]
+----
+<saga sagaServiceRef="mySagaService">
+    <compensation uri="mock:compensation"/>
+    <completion uri="mock:completion"/>
+    <sagaOption name="myOptionKey">
+        <constant>myOptionValue</constant>
+    </sagaOption>
+    <sagaOption name="myOptionKey2">
+        <constant>myOptionValue2</constant>
+    </sagaOption>
+</saga>
+----
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 5e91c8c..8663c73 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
@@ -13458,8 +13458,8 @@ public final class ModelDeserializers extends 
YamlDeserializerSupport {
                     @YamlProperty(name = "description", type = "string"),
                     @YamlProperty(name = "id", type = "string"),
                     @YamlProperty(name = "inherit-error-handler", type = 
"boolean"),
-                    @YamlProperty(name = "option", type = 
"array:org.apache.camel.model.SagaOptionDefinition"),
                     @YamlProperty(name = "propagation", type = "string"),
+                    @YamlProperty(name = "saga-option", type = 
"array:org.apache.camel.model.SagaOptionDefinition"),
                     @YamlProperty(name = "saga-service-ref", type = "string"),
                     @YamlProperty(name = "steps", type = 
"array:org.apache.camel.model.ProcessorDefinition"),
                     @YamlProperty(name = "timeout", type = "string")
@@ -13499,7 +13499,7 @@ public final class ModelDeserializers extends 
YamlDeserializerSupport {
                     
target.setInheritErrorHandler(java.lang.Boolean.valueOf(val));
                     break;
                 }
-                case "option": {
+                case "saga-option": {
                     
java.util.List<org.apache.camel.model.SagaOptionDefinition> val = 
asFlatList(node, org.apache.camel.model.SagaOptionDefinition.class);
                     target.setOptions(val);
                     break;
@@ -13544,10 +13544,17 @@ public final class ModelDeserializers extends 
YamlDeserializerSupport {
     @YamlType(
             types = org.apache.camel.model.SagaOptionDefinition.class,
             order = 
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
+            nodes = {
+                    "saga-option",
+                    "sagaOption"
+            },
             properties = {
                     @YamlProperty(name = "__extends", type = 
"object:org.apache.camel.model.language.ExpressionDefinition"),
+                    @YamlProperty(name = "description", type = "string"),
                     @YamlProperty(name = "expression", type = 
"object:org.apache.camel.model.language.ExpressionDefinition"),
-                    @YamlProperty(name = "option-name", type = "string", 
required = true)
+                    @YamlProperty(name = "id", type = "string"),
+                    @YamlProperty(name = "inherit-error-handler", type = 
"boolean"),
+                    @YamlProperty(name = "name", type = "string", required = 
true)
             }
     )
     public static class SagaOptionDefinitionDeserializer extends 
YamlDeserializerBase<SagaOptionDefinition> {
@@ -13569,9 +13576,24 @@ public final class ModelDeserializers extends 
YamlDeserializerSupport {
                     target.setExpression(val);
                     break;
                 }
-                case "option-name": {
+                case "inherit-error-handler": {
+                    String val = asText(node);
+                    
target.setInheritErrorHandler(java.lang.Boolean.valueOf(val));
+                    break;
+                }
+                case "name": {
+                    String val = asText(node);
+                    target.setName(val);
+                    break;
+                }
+                case "id": {
                     String val = asText(node);
-                    target.setOptionName(val);
+                    target.setId(val);
+                    break;
+                }
+                case "description": {
+                    org.apache.camel.model.DescriptionDefinition val = 
asType(node, org.apache.camel.model.DescriptionDefinition.class);
+                    target.setDescription(val);
                     break;
                 }
                 default: {
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
index 78f5183..67216a3 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializersResolver.java
@@ -387,6 +387,8 @@ public final class ModelDeserializersResolver implements 
YamlDeserializerResolve
             case "org.apache.camel.model.SagaActionUriDefinition": return new 
ModelDeserializers.SagaActionUriDefinitionDeserializer();
             case "saga": return new 
ModelDeserializers.SagaDefinitionDeserializer();
             case "org.apache.camel.model.SagaDefinition": return new 
ModelDeserializers.SagaDefinitionDeserializer();
+            case "saga-option": return new 
ModelDeserializers.SagaOptionDefinitionDeserializer();
+            case "sagaOption": return new 
ModelDeserializers.SagaOptionDefinitionDeserializer();
             case "org.apache.camel.model.SagaOptionDefinition": return new 
ModelDeserializers.SagaOptionDefinitionDeserializer();
             case "sample": return new 
ModelDeserializers.SamplingDefinitionDeserializer();
             case "org.apache.camel.model.SamplingDefinition": return new 
ModelDeserializers.SamplingDefinitionDeserializer();
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index c8781ba..0288425 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -191,6 +191,12 @@
           "saga" : {
             "$ref" : 
"#/items/definitions/org.apache.camel.model.SagaDefinition"
           },
+          "saga-option" : {
+            "$ref" : 
"#/items/definitions/org.apache.camel.model.SagaOptionDefinition"
+          },
+          "sagaOption" : {
+            "$ref" : 
"#/items/definitions/org.apache.camel.model.SagaOptionDefinition"
+          },
           "sample" : {
             "$ref" : 
"#/items/definitions/org.apache.camel.model.SamplingDefinition"
           },
@@ -2662,15 +2668,15 @@
           "inherit-error-handler" : {
             "type" : "boolean"
           },
-          "option" : {
+          "propagation" : {
+            "type" : "string"
+          },
+          "saga-option" : {
             "type" : "array",
             "items" : {
               "$ref" : 
"#/items/definitions/org.apache.camel.model.SagaOptionDefinition"
             }
           },
-          "propagation" : {
-            "type" : "string"
-          },
           "saga-service-ref" : {
             "type" : "string"
           },
@@ -2691,14 +2697,23 @@
           "$ref" : 
"#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
         } ],
         "properties" : {
+          "description" : {
+            "type" : "string"
+          },
           "expression" : {
             "$ref" : 
"#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
           },
-          "option-name" : {
+          "id" : {
+            "type" : "string"
+          },
+          "inherit-error-handler" : {
+            "type" : "boolean"
+          },
+          "name" : {
             "type" : "string"
           }
         },
-        "required" : [ "option-name" ]
+        "required" : [ "name" ]
       },
       "org.apache.camel.model.SamplingDefinition" : {
         "type" : "object",
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
index fdbafdd..e751730 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
@@ -128,6 +128,9 @@
           "saga" : {
             "$ref" : 
"#/items/definitions/org.apache.camel.model.SagaDefinition"
           },
+          "sagaOption" : {
+            "$ref" : 
"#/items/definitions/org.apache.camel.model.SagaOptionDefinition"
+          },
           "sample" : {
             "$ref" : 
"#/items/definitions/org.apache.camel.model.SamplingDefinition"
           },
@@ -2563,15 +2566,15 @@
           "inheritErrorHandler" : {
             "type" : "boolean"
           },
-          "option" : {
+          "propagation" : {
+            "type" : "string"
+          },
+          "sagaOption" : {
             "type" : "array",
             "items" : {
               "$ref" : 
"#/items/definitions/org.apache.camel.model.SagaOptionDefinition"
             }
           },
-          "propagation" : {
-            "type" : "string"
-          },
           "sagaServiceRef" : {
             "type" : "string"
           },
@@ -2592,14 +2595,23 @@
           "$ref" : 
"#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
         } ],
         "properties" : {
+          "description" : {
+            "type" : "string"
+          },
           "expression" : {
             "$ref" : 
"#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
           },
-          "optionName" : {
+          "id" : {
+            "type" : "string"
+          },
+          "inheritErrorHandler" : {
+            "type" : "boolean"
+          },
+          "name" : {
             "type" : "string"
           }
         },
-        "required" : [ "optionName" ]
+        "required" : [ "name" ]
       },
       "org.apache.camel.model.SamplingDefinition" : {
         "type" : "object",
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SagaTest.groovy
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SagaTest.groovy
index 0647d53..5f627f5 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SagaTest.groovy
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/SagaTest.groovy
@@ -49,14 +49,14 @@ class SagaTest extends YamlTestSupport {
                     endpointUri == 'direct:something'
                 }
                 with(options[0], SagaOptionDefinition) {
-                    optionName == 'o1'
+                    name == 'o1'
                     with(expression, ExpressionDefinition) {
                         language == 'simple'
                         expression == '${body}'
                     }
                 }
                 with(options[1], SagaOptionDefinition) {
-                    optionName == 'o2'
+                    name == 'o2'
                     with(expression, ExpressionDefinition) {
                         language == 'simple'
                         expression == '${body}'
@@ -71,17 +71,17 @@ class SagaTest extends YamlTestSupport {
                         steps:    
                           - saga:  
                              propagation: "MANDATORY"
-                             completion-mode: "MANUAL"
+                             completionMode: "MANUAL"
                              compensation: 
                                  uri: "direct:compensation"
                              completion:
                                  uri: "direct:completion"
                              steps:
                                - to: "direct:something"
-                             option:
-                               - option-name: o1
+                             sagaOption:
+                               - name: o1
                                  simple: "${body}" 
-                               - option-name: o2
+                               - name: o2
                                  expression:
                                    simple: "${body}"        
                           - to: "mock:result"
@@ -92,7 +92,7 @@ class SagaTest extends YamlTestSupport {
                         steps:    
                           - saga:  
                              propagation: "MANDATORY"
-                             completion-mode: "MANUAL"
+                             completionMode: "MANUAL"
                              compensation: 
                                  uri: "direct"
                                  parameters:
@@ -101,10 +101,10 @@ class SagaTest extends YamlTestSupport {
                                  uri: "direct:completion"
                              steps:
                                - to: "direct:something"
-                             option:
-                               - option-name: o1
+                             sagaOption:
+                               - name: o1
                                  simple: "${body}" 
-                               - option-name: o2
+                               - name: o2
                                  expression:
                                    simple: "${body}"        
                           - to: "mock:result"
@@ -115,7 +115,7 @@ class SagaTest extends YamlTestSupport {
                         steps:    
                           - saga:  
                              propagation: "MANDATORY"
-                             completion-mode: "MANUAL"
+                             completionMode: "MANUAL"
                              compensation: 
                                  parameters:
                                    name: compensation
@@ -124,10 +124,10 @@ class SagaTest extends YamlTestSupport {
                                  uri: "direct:completion"
                              steps:
                                - to: "direct:something"
-                             option:
-                               - option-name: o1
+                             sagaOption:
+                               - name: o1
                                  simple: "${body}" 
-                               - option-name: o2
+                               - name: o2
                                  expression:
                                    simple: "${body}"        
                           - to: "mock:result"
@@ -138,15 +138,15 @@ class SagaTest extends YamlTestSupport {
                         steps:    
                           - saga: 
                              propagation: "MANDATORY"
-                             completion-mode: "MANUAL"
+                             completionMode: "MANUAL"
                              compensation: "direct:compensation"
                              completion: "direct:completion"
                              steps:
                                - to: "direct:something"    
-                             option:
-                               - option-name: o1
+                             sagaOption:
+                               - name: o1
                                  simple: "${body}" 
-                               - option-name: o2
+                               - name: o2
                                  expression:
                                    simple: "${body}"        
                           - to: "mock:result"
@@ -157,7 +157,7 @@ class SagaTest extends YamlTestSupport {
                         steps:    
                           - saga: 
                              propagation: "MANDATORY"
-                             completion-mode: "MANUAL"
+                             completionMode: "MANUAL"
                              compensation: 
                                direct:
                                  name: "compensation"
@@ -166,10 +166,10 @@ class SagaTest extends YamlTestSupport {
                                  name: "completion"
                              steps:
                                - to: "direct:something"  
-                             option:
-                               - option-name: o1
+                             sagaOption:
+                               - name: o1
                                  simple: "${body}" 
-                               - option-name: o2
+                               - name: o2
                                  expression:
                                    simple: "${body}"          
                           - to: "mock:result"

Reply via email to