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 3a0fb0a CAMEL-17585: Sage EIP - Options on Saga was not output in
json metadata. Update model to be aligned how other EIPs does that.
3a0fb0a is described below
commit 3a0fb0a4d431241516396082c402acf06b52f960
Author: Claus Ibsen <[email protected]>
AuthorDate: Sat Feb 5 19:13:14 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.
---
.../camel-yaml-dsl-deserializers/pom.xml | 1 -
.../dsl/yaml/deserializers/ModelDeserializers.java | 124 ++++++++-------------
.../deserializers/ModelDeserializersResolver.java | 6 +-
.../dsl/yaml/deserializers/CustomResolver.java | 1 +
.../services/org/apache/camel/other.properties | 7 --
.../src/generated/resources/camel-yaml-dsl.json | 52 +++------
.../src/generated/resources/camelYamlDsl.json | 49 +++-----
.../src/generated/resources/yaml-dsl.json | 15 ---
.../org/apache/camel/dsl/yaml/SagaTest.groovy | 46 +++-----
9 files changed, 102 insertions(+), 199 deletions(-)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
index 4b193b9..e9eb732 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
@@ -139,7 +139,6 @@
</bannedDefinitions>
<additionalDefinitions>
<!-- saga -->
-
<additionalDefinition>org.apache.camel.model.SagaOptionDefinition</additionalDefinition>
<additionalDefinition>org.apache.camel.model.SagaActionUriDefinition</additionalDefinition>
<!-- error handler -->
<additionalDefinition>org.apache.camel.builder.DeadLetterChannelBuilder</additionalDefinition>
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 cf7d612..280c881 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
@@ -58,6 +58,7 @@ import org.apache.camel.model.PolicyDefinition;
import org.apache.camel.model.PollEnrichDefinition;
import org.apache.camel.model.ProcessDefinition;
import org.apache.camel.model.PropertyDefinition;
+import org.apache.camel.model.PropertyExpressionDefinition;
import org.apache.camel.model.RecipientListDefinition;
import org.apache.camel.model.RedeliveryPolicyDefinition;
import org.apache.camel.model.RemoveHeaderDefinition;
@@ -77,7 +78,6 @@ import org.apache.camel.model.RouteTemplateScriptDefinition;
import org.apache.camel.model.RoutingSlipDefinition;
import org.apache.camel.model.SagaActionUriDefinition;
import org.apache.camel.model.SagaDefinition;
-import org.apache.camel.model.SagaOptionDefinition;
import org.apache.camel.model.SamplingDefinition;
import org.apache.camel.model.ScriptDefinition;
import org.apache.camel.model.SetBodyDefinition;
@@ -10261,6 +10261,50 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
@YamlType(
+ types = org.apache.camel.model.PropertyExpressionDefinition.class,
+ order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
+ nodes = {
+ "property-expression",
+ "propertyExpression"
+ },
+ properties = {
+ @YamlProperty(name = "expression", type =
"object:org.apache.camel.model.language.ExpressionDefinition"),
+ @YamlProperty(name = "key", type = "string", required =
true)
+ }
+ )
+ public static class PropertyExpressionDefinitionDeserializer extends
YamlDeserializerBase<PropertyExpressionDefinition> {
+ public PropertyExpressionDefinitionDeserializer() {
+ super(PropertyExpressionDefinition.class);
+ }
+
+ @Override
+ protected PropertyExpressionDefinition newInstance() {
+ return new PropertyExpressionDefinition();
+ }
+
+ @Override
+ protected boolean setProperty(PropertyExpressionDefinition target,
String propertyKey,
+ String propertyName, Node node) {
+ switch(propertyKey) {
+ case "expression": {
+ org.apache.camel.model.language.ExpressionDefinition val =
asType(node, org.apache.camel.model.language.ExpressionDefinition.class);
+ target.setExpression(val);
+ break;
+ }
+ case "key": {
+ String val = asText(node);
+ target.setKey(val);
+ break;
+ }
+ default: {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+
+ @YamlType(
inline = true,
types = org.apache.camel.model.dataformat.ProtobufDataFormat.class,
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
@@ -13458,8 +13502,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.PropertyExpressionDefinition"),
@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,8 +13543,8 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
target.setInheritErrorHandler(java.lang.Boolean.valueOf(val));
break;
}
- case "saga-option": {
-
java.util.List<org.apache.camel.model.SagaOptionDefinition> val =
asFlatList(node, org.apache.camel.model.SagaOptionDefinition.class);
+ case "option": {
+
java.util.List<org.apache.camel.model.PropertyExpressionDefinition> val =
asFlatList(node, org.apache.camel.model.PropertyExpressionDefinition.class);
target.setOptions(val);
break;
}
@@ -13542,78 +13586,6 @@ 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 = "id", type = "string"),
- @YamlProperty(name = "inherit-error-handler", type =
"boolean"),
- @YamlProperty(name = "name", type = "string", required =
true)
- }
- )
- public static class SagaOptionDefinitionDeserializer extends
YamlDeserializerBase<SagaOptionDefinition> {
- public SagaOptionDefinitionDeserializer() {
- super(SagaOptionDefinition.class);
- }
-
- @Override
- protected SagaOptionDefinition newInstance() {
- return new SagaOptionDefinition();
- }
-
- @Override
- protected boolean setProperty(SagaOptionDefinition target, String
propertyKey,
- String propertyName, Node node) {
- switch(propertyKey) {
- case "expression": {
- org.apache.camel.model.language.ExpressionDefinition val =
asType(node, org.apache.camel.model.language.ExpressionDefinition.class);
- target.setExpression(val);
- break;
- }
- 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.setId(val);
- break;
- }
- case "description": {
- org.apache.camel.model.DescriptionDefinition val =
asType(node, org.apache.camel.model.DescriptionDefinition.class);
- target.setDescription(val);
- break;
- }
- default: {
- ExpressionDefinition ed = target.getExpressionType();
- if (ed != null) {
- throw new
org.apache.camel.dsl.yaml.common.exception.UnsupportedFieldException(propertyName,
"an expression has already been configured (" + ed + ")");
- }
- ed =
ExpressionDeserializers.constructExpressionType(propertyKey, node);
- if (ed != null) {
- target.setExpressionType(ed);
- } else {
- return false;
- }
- }
- }
- return true;
- }
- }
-
- @YamlType(
types = org.apache.camel.model.SamplingDefinition.class,
order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
nodes = "sample",
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 67216a3..cae81d9 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
@@ -276,6 +276,9 @@ public final class ModelDeserializersResolver implements
YamlDeserializerResolve
case "org.apache.camel.model.ProcessDefinition": return new
ModelDeserializers.ProcessDefinitionDeserializer();
case "property": return new
ModelDeserializers.PropertyDefinitionDeserializer();
case "org.apache.camel.model.PropertyDefinition": return new
ModelDeserializers.PropertyDefinitionDeserializer();
+ case "property-expression": return new
ModelDeserializers.PropertyExpressionDefinitionDeserializer();
+ case "propertyExpression": return new
ModelDeserializers.PropertyExpressionDefinitionDeserializer();
+ case "org.apache.camel.model.PropertyExpressionDefinition": return
new ModelDeserializers.PropertyExpressionDefinitionDeserializer();
case "protobuf": return new
ModelDeserializers.ProtobufDataFormatDeserializer();
case "org.apache.camel.model.dataformat.ProtobufDataFormat":
return new ModelDeserializers.ProtobufDataFormatDeserializer();
case "put": return new
ModelDeserializers.PutVerbDefinitionDeserializer();
@@ -387,9 +390,6 @@ 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();
case "script": return new
ModelDeserializers.ScriptDefinitionDeserializer();
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/CustomResolver.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/CustomResolver.java
index 9a849d4..18a2f3b 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/CustomResolver.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/CustomResolver.java
@@ -56,6 +56,7 @@ public class CustomResolver implements
YamlDeserializerResolver {
// Expression
//
case "expression":
+ case "org.apache.camel.model.PropertyExpressionDefinition":
case "org.apache.camel.model.language.ExpressionDefinition":
return new
ExpressionDeserializers.ExpressionDefinitionDeserializers();
case "org.apache.camel.model.ExpressionSubElementDefinition":
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
deleted file mode 100644
index ac72521..0000000
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-name=yaml-dsl
-groupId=org.apache.camel
-artifactId=camel-yaml-dsl
-version=3.16.0-SNAPSHOT
-projectName=Camel :: YAML DSL
-projectDescription=Camel DSL with YAML
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 b5fe6a1..04027a0 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,12 +191,6 @@
"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"
},
@@ -2051,6 +2045,18 @@
},
"required" : [ "key", "value" ]
},
+ "org.apache.camel.model.PropertyExpressionDefinition" : {
+ "type" : "object",
+ "properties" : {
+ "expression" : {
+ "$ref" :
"#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
+ },
+ "key" : {
+ "type" : "string"
+ }
+ },
+ "required" : [ "key" ]
+ },
"org.apache.camel.model.RecipientListDefinition" : {
"type" : "object",
"anyOf" : [ {
@@ -2668,15 +2674,15 @@
"inherit-error-handler" : {
"type" : "boolean"
},
- "propagation" : {
- "type" : "string"
- },
- "saga-option" : {
+ "option" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.SagaOptionDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.PropertyExpressionDefinition"
}
},
+ "propagation" : {
+ "type" : "string"
+ },
"saga-service-ref" : {
"type" : "string"
},
@@ -2691,30 +2697,6 @@
}
}
},
- "org.apache.camel.model.SagaOptionDefinition" : {
- "type" : "object",
- "anyOf" : [ {
- "$ref" :
"#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
- } ],
- "properties" : {
- "description" : {
- "type" : "string"
- },
- "expression" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
- },
- "id" : {
- "type" : "string"
- },
- "inherit-error-handler" : {
- "type" : "boolean"
- },
- "name" : {
- "type" : "string"
- }
- },
- "required" : [ "name" ]
- },
"org.apache.camel.model.SamplingDefinition" : {
"type" : "object",
"properties" : {
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 44953d7..4deca84 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,9 +128,6 @@
"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"
},
@@ -1949,6 +1946,18 @@
},
"required" : [ "key", "value" ]
},
+ "org.apache.camel.model.PropertyExpressionDefinition" : {
+ "type" : "object",
+ "properties" : {
+ "expression" : {
+ "$ref" :
"#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
+ },
+ "key" : {
+ "type" : "string"
+ }
+ },
+ "required" : [ "key" ]
+ },
"org.apache.camel.model.RecipientListDefinition" : {
"type" : "object",
"anyOf" : [ {
@@ -2566,15 +2575,15 @@
"inheritErrorHandler" : {
"type" : "boolean"
},
- "propagation" : {
- "type" : "string"
- },
- "sagaOption" : {
+ "option" : {
"type" : "array",
"items" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.SagaOptionDefinition"
+ "$ref" :
"#/items/definitions/org.apache.camel.model.PropertyExpressionDefinition"
}
},
+ "propagation" : {
+ "type" : "string"
+ },
"sagaServiceRef" : {
"type" : "string"
},
@@ -2589,30 +2598,6 @@
}
}
},
- "org.apache.camel.model.SagaOptionDefinition" : {
- "type" : "object",
- "anyOf" : [ {
- "$ref" :
"#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
- } ],
- "properties" : {
- "description" : {
- "type" : "string"
- },
- "expression" : {
- "$ref" :
"#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
- },
- "id" : {
- "type" : "string"
- },
- "inheritErrorHandler" : {
- "type" : "boolean"
- },
- "name" : {
- "type" : "string"
- }
- },
- "required" : [ "name" ]
- },
"org.apache.camel.model.SamplingDefinition" : {
"type" : "object",
"properties" : {
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/yaml-dsl.json
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/yaml-dsl.json
deleted file mode 100644
index 3841b21..0000000
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/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/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 5f627f5..dd372d4 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
@@ -17,9 +17,9 @@
package org.apache.camel.dsl.yaml
import org.apache.camel.dsl.yaml.support.YamlTestSupport
+import org.apache.camel.model.PropertyExpressionDefinition
import org.apache.camel.model.SagaActionUriDefinition
import org.apache.camel.model.SagaDefinition
-import org.apache.camel.model.SagaOptionDefinition
import org.apache.camel.model.ToDefinition
import org.apache.camel.model.language.ExpressionDefinition
import org.apache.camel.spi.Resource
@@ -48,20 +48,6 @@ class SagaTest extends YamlTestSupport {
with(outputs[1], ToDefinition) {
endpointUri == 'direct:something'
}
- with(options[0], SagaOptionDefinition) {
- name == 'o1'
- with(expression, ExpressionDefinition) {
- language == 'simple'
- expression == '${body}'
- }
- }
- with(options[1], SagaOptionDefinition) {
- name == 'o2'
- with(expression, ExpressionDefinition) {
- language == 'simple'
- expression == '${body}'
- }
- }
}
where:
resource << [
@@ -78,10 +64,10 @@ class SagaTest extends YamlTestSupport {
uri: "direct:completion"
steps:
- to: "direct:something"
- sagaOption:
- - name: o1
+ option:
+ - key: o1
simple: "${body}"
- - name: o2
+ - key: o2
expression:
simple: "${body}"
- to: "mock:result"
@@ -101,10 +87,10 @@ class SagaTest extends YamlTestSupport {
uri: "direct:completion"
steps:
- to: "direct:something"
- sagaOption:
- - name: o1
+ option:
+ - key: o1
simple: "${body}"
- - name: o2
+ - key: o2
expression:
simple: "${body}"
- to: "mock:result"
@@ -124,10 +110,10 @@ class SagaTest extends YamlTestSupport {
uri: "direct:completion"
steps:
- to: "direct:something"
- sagaOption:
- - name: o1
+ option:
+ - key: o1
simple: "${body}"
- - name: o2
+ - key: o2
expression:
simple: "${body}"
- to: "mock:result"
@@ -143,10 +129,10 @@ class SagaTest extends YamlTestSupport {
completion: "direct:completion"
steps:
- to: "direct:something"
- sagaOption:
- - name: o1
+ option:
+ - key: o1
simple: "${body}"
- - name: o2
+ - key: o2
expression:
simple: "${body}"
- to: "mock:result"
@@ -166,10 +152,10 @@ class SagaTest extends YamlTestSupport {
name: "completion"
steps:
- to: "direct:something"
- sagaOption:
- - name: o1
+ option:
+ - key: o1
simple: "${body}"
- - name: o2
+ - key: o2
expression:
simple: "${body}"
- to: "mock:result"