This is an automated email from the ASF dual-hosted git repository. acosentino 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 1800a51 Regen for commit 3a0fb0a4d431241516396082c402acf06b52f960 1800a51 is described below commit 1800a510783be77aea71f9bd2051bf2fc8ea9774 Author: davsclaus <davscl...@users.noreply.github.com> AuthorDate: Sat Feb 5 19:09:08 2022 +0000 Regen for commit 3a0fb0a4d431241516396082c402acf06b52f960 Signed-off-by: GitHub <nore...@github.com> --- .../org/apache/camel/catalog/models.properties | 1 + .../org/apache/camel/catalog/models/property.json | 2 +- .../camel/catalog/models/propertyExpression.json | 18 +++ .../org/apache/camel/catalog/models/saga.json | 2 +- .../apache/camel/catalog/models/sagaOption.json | 2 +- .../org/apache/camel/catalog/others.properties | 1 - .../org/apache/camel/catalog/others/yaml-dsl.json | 15 --- .../apache/camel/catalog/schemas/camel-spring.xsd | 128 +++++++++------------ 8 files changed, 75 insertions(+), 94 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties index aae3d87..6a630a4 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties @@ -119,6 +119,7 @@ pollEnrich post process property +propertyExpression protobuf put random diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/property.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/property.json index 0c270fd..a20cf40 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/property.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/property.json @@ -3,7 +3,7 @@ "kind": "model", "name": "property", "title": "Property", - "description": "A key value pair", + "description": "A key value pair where the value is a literal value", "deprecated": false, "label": "configuration", "javaType": "org.apache.camel.model.PropertyDefinition", diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/propertyExpression.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/propertyExpression.json new file mode 100644 index 0000000..41f68d8 --- /dev/null +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/propertyExpression.json @@ -0,0 +1,18 @@ +{ + "model": { + "kind": "model", + "name": "propertyExpression", + "title": "Property Expression", + "description": "A key value pair where the value is an expression.", + "deprecated": false, + "label": "configuration", + "javaType": "org.apache.camel.model.PropertyExpressionDefinition", + "abstract": false, + "input": false, + "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 }, + "key": { "kind": "attribute", "displayName": "Key", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Property key" } + } +} diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/saga.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/saga.json index cae9146..f575885 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/saga.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/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 [...] - "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 [...] + "option": { "kind": "element", "displayName": "Option", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.PropertyExpressionDefinition>", "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 ac [...] "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/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sagaOption.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sagaOption.json index ecd347d..1396147 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sagaOption.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sagaOption.json @@ -4,7 +4,7 @@ "name": "sagaOption", "title": "Saga Option", "description": "Allows declaring options on Sagas", - "deprecated": false, + "deprecated": true, "label": "configuration", "javaType": "org.apache.camel.model.SagaOptionDefinition", "abstract": false, diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties index 0fb5b58..75eff0b 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties @@ -64,5 +64,4 @@ tracing undertow-spring-security xml-io-dsl xml-jaxb-dsl -yaml-dsl zipkin diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json deleted file mode 100644 index 3841b21..0000000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "other": { - "kind": "other", - "name": "yaml-dsl", - "title": "YAML DSL", - "description": "Camel DSL with YAML", - "deprecated": false, - "firstVersion": "3.9.0", - "label": "dsl", - "supportLevel": "Stable", - "groupId": "org.apache.camel", - "artifactId": "camel-yaml-dsl", - "version": "3.16.0-SNAPSHOT" - } -} 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 da00f86..2f5f9a4 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 @@ -1018,7 +1018,15 @@ Properties to use with properties placeholder <xs:element name="property" type="tns:propertyDefinition"> <xs:annotation> <xs:documentation xml:lang="en"><![CDATA[ -A key value pair +A key value pair where the value is a literal value + ]]></xs:documentation> + </xs:annotation> + </xs:element> + + <xs:element name="propertyExpression" type="tns:propertyExpressionDefinition"> + <xs:annotation> + <xs:documentation xml:lang="en"><![CDATA[ +A key value pair where the value is an expression. ]]></xs:documentation> </xs:annotation> </xs:element> @@ -1368,14 +1376,6 @@ Enables Sagas on the route </xs:annotation> </xs:element> - <xs:element name="sagaOption" type="tns:sagaOptionDefinition"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -Allows declaring options on Sagas - ]]></xs:documentation> - </xs:annotation> - </xs:element> - <xs:element name="sample" type="tns:samplingDefinition"> <xs:annotation> <xs:documentation xml:lang="en"><![CDATA[ @@ -3027,7 +3027,6 @@ will fallback to use the fixed value if the Expression result was null or 0. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -3508,7 +3507,6 @@ should be intercepted by this exception type or not. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -3609,7 +3607,6 @@ should be intercepted by this exception type or not. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -3698,7 +3695,6 @@ should be intercepted by this exception type or not. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -3779,7 +3775,6 @@ should be intercepted by this exception type or not. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -4853,7 +4848,6 @@ org.apache.camel.spi.SendDynamicAware . Default value: true <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -4939,7 +4933,6 @@ Setting this allows to know if the filter predicate evaluated as true or false. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -5079,7 +5072,6 @@ Global option value. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -5259,7 +5251,6 @@ Set if validation is required for this input type. Default value: false <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -5353,7 +5344,6 @@ configured, then all incoming messages is intercepted. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -5454,7 +5444,6 @@ process its result. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -5549,7 +5538,6 @@ specified using uri syntax, eg mynamecount=4&type=gold. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -5844,7 +5832,6 @@ To refer to a custom logger instance to lookup from the registry. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -8871,7 +8858,6 @@ decompressed size. Default value: 1073741824 <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -9082,7 +9068,6 @@ should be invoked or not. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -9251,7 +9236,6 @@ failure. If this option is enabled then its considered handled as well. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -9614,7 +9598,6 @@ generate the log message from exchange. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -9752,7 +9735,6 @@ Include finding route builder from these java package names. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -9830,7 +9812,6 @@ Include finding route builder from these java package names. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -10017,6 +9998,39 @@ by their type in the registry by prefixing with #type: syntax, eg </xs:sequence> </xs:complexType> + <xs:complexType name="propertyExpressionDefinition"> + <xs:choice> + <xs:element ref="tns:expressionDefinition"/> + <xs:element ref="tns:csimple"/> + <xs:element ref="tns:constant"/> + <xs:element ref="tns:datasonnet"/> + <xs:element ref="tns:exchangeProperty"/> + <xs:element ref="tns:groovy"/> + <xs:element ref="tns:header"/> + <xs:element ref="tns:hl7terser"/> + <xs:element ref="tns:joor"/> + <xs:element ref="tns:jsonpath"/> + <xs:element ref="tns:language"/> + <xs:element ref="tns:method"/> + <xs:element ref="tns:mvel"/> + <xs:element ref="tns:ognl"/> + <xs:element ref="tns:ref"/> + <xs:element ref="tns:simple"/> + <xs:element ref="tns:spel"/> + <xs:element ref="tns:tokenize"/> + <xs:element ref="tns:xtokenize"/> + <xs:element ref="tns:xpath"/> + <xs:element ref="tns:xquery"/> + </xs:choice> + <xs:attribute name="key" type="xs:string" use="required"> + <xs:annotation> + <xs:documentation xml:lang="en"><![CDATA[ +Property key. + ]]></xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:complexType> + <xs:complexType name="recipientListDefinition"> <xs:complexContent> <xs:extension base="tns:processorDefinition"> @@ -10365,7 +10379,6 @@ Name of property to remove. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -10648,7 +10661,6 @@ Reference to the routes in the xml dsl. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -10990,7 +11002,17 @@ the saga service may call again the completion URI to retry. ]]></xs:documentation> </xs:annotation> </xs:element> - <xs:element maxOccurs="unbounded" minOccurs="0" ref="tns:sagaOption"/> + <xs:element maxOccurs="unbounded" minOccurs="0" name="option" type="tns:propertyExpressionDefinition"> + <xs:annotation> + <xs:documentation xml:lang="en"><![CDATA[ +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. Option values will be transformed into input headers of the +compensation/completion exchange. + ]]></xs:documentation> + </xs:annotation> + </xs:element> <xs:choice maxOccurs="unbounded" minOccurs="0"> <xs:element ref="tns:aggregate"/> <xs:element ref="tns:bean"/> @@ -11035,7 +11057,6 @@ the saga service may call again the completion URI to retry. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -11101,45 +11122,6 @@ use. </xs:complexContent> </xs:complexType> - <xs:complexType name="sagaOptionDefinition"> - <xs:complexContent> - <xs:extension base="tns:processorDefinition"> - <xs:choice> - <xs:element ref="tns:expressionDefinition"/> - <xs:element ref="tns:csimple"/> - <xs:element ref="tns:constant"/> - <xs:element ref="tns:datasonnet"/> - <xs:element ref="tns:exchangeProperty"/> - <xs:element ref="tns:groovy"/> - <xs:element ref="tns:header"/> - <xs:element ref="tns:hl7terser"/> - <xs:element ref="tns:joor"/> - <xs:element ref="tns:jsonpath"/> - <xs:element ref="tns:language"/> - <xs:element ref="tns:method"/> - <xs:element ref="tns:mvel"/> - <xs:element ref="tns:ognl"/> - <xs:element ref="tns:ref"/> - <xs:element ref="tns:simple"/> - <xs:element ref="tns:spel"/> - <xs:element ref="tns:tokenize"/> - <xs:element ref="tns:xtokenize"/> - <xs:element ref="tns:xpath"/> - <xs:element ref="tns:xquery"/> - </xs:choice> - <xs:attribute name="name" type="xs:string" use="required"> - <xs:annotation> - <xs:documentation xml:lang="en"><![CDATA[ -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. - ]]></xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:extension> - </xs:complexContent> - </xs:complexType> - <xs:complexType name="samplingDefinition"> <xs:complexContent> <xs:extension base="tns:noOutputDefinition"> @@ -11434,7 +11416,6 @@ Sets a reference to lookup for the comparator to use for sorting. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -11653,7 +11634,6 @@ the sake of backward compatibility. Default value: false <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -12086,7 +12066,6 @@ Whether to auto startup components when toD is starting up. Default value: true <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/> @@ -12201,7 +12180,6 @@ Sets a reference to use for lookup the policy in the registry. <xs:element ref="tns:route"/> <xs:element ref="tns:routingSlip"/> <xs:element ref="tns:saga"/> - <xs:element ref="tns:sagaOption"/> <xs:element ref="tns:sample"/> <xs:element ref="tns:script"/> <xs:element ref="tns:setBody"/>