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 55285c3 camel-yaml-dsl - Add description to route
55285c3 is described below
commit 55285c396c1f026ea67cc5078eeb8cc11a572611
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jan 21 09:03:04 2022 +0100
camel-yaml-dsl - Add description to route
---
.../ErrorHandlerBuilderDeserializer.java | 9 +++-----
.../deserializers/RouteDefinitionDeserializer.java | 5 +++++
.../src/generated/resources/camel-yaml-dsl.json | 3 +++
.../src/generated/resources/camelYamlDsl.json | 3 +++
.../org/apache/camel/dsl/yaml/RoutesTest.groovy | 25 ++++++++++++++++++++++
5 files changed, 39 insertions(+), 6 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 984d1a4..2a5ac51 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,12 +48,9 @@ import static
org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.setDeseri
types = ErrorHandlerBuilderRef.class,
order = YamlDeserializerResolver.ORDER_DEFAULT,
properties = {
- @YamlProperty(name = "ref",
- type = "string"),
- @YamlProperty(name = "none",
- type =
"object:org.apache.camel.builder.NoErrorHandlerBuilder"),
- @YamlProperty(name = "log",
- type =
"object:org.apache.camel.builder.DefaultErrorHandlerBuilder"),
+ @YamlProperty(name = "ref", type = "string"),
+ @YamlProperty(name = "none", type =
"object:org.apache.camel.builder.NoErrorHandlerBuilder"),
+ @YamlProperty(name = "log", type =
"object:org.apache.camel.builder.DefaultErrorHandlerBuilder"),
@YamlProperty(name = "dead-letter-channel",
type =
"object:org.apache.camel.builder.DeadLetterChannelBuilder"),
})
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java
index 30a1e6a..18fc980 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java
@@ -20,6 +20,7 @@ import
org.apache.camel.dsl.yaml.common.YamlDeserializationContext;
import org.apache.camel.dsl.yaml.common.YamlDeserializerBase;
import org.apache.camel.dsl.yaml.common.YamlDeserializerResolver;
import org.apache.camel.dsl.yaml.common.exception.UnsupportedFieldException;
+import org.apache.camel.model.DescriptionDefinition;
import org.apache.camel.model.FromDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.annotations.YamlIn;
@@ -36,6 +37,7 @@ import org.snakeyaml.engine.v2.nodes.NodeTuple;
order = YamlDeserializerResolver.ORDER_DEFAULT,
properties = {
@YamlProperty(name = "id", type = "string"),
+ @YamlProperty(name = "description", type = "string"),
@YamlProperty(name = "group", type = "string"),
@YamlProperty(name = "route-configuration-id", type =
"string"),
@YamlProperty(name = "from", type =
"object:org.apache.camel.model.FromDefinition", required = true)
@@ -65,6 +67,9 @@ public class RouteDefinitionDeserializer extends
YamlDeserializerBase<RouteDefin
case "id":
target.setId(asText(val));
break;
+ case "description":
+ target.setDescription(new
DescriptionDefinition(asText(val)));
+ break;
case "group":
target.setGroup(asText(val));
break;
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 f63b229..48bc6a7 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
@@ -2193,6 +2193,9 @@
"org.apache.camel.model.RouteDefinition" : {
"type" : "object",
"properties" : {
+ "description" : {
+ "type" : "string"
+ },
"from" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.FromDefinition"
},
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 02eb843..8d1f454 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
@@ -2097,6 +2097,9 @@
"org.apache.camel.model.RouteDefinition" : {
"type" : "object",
"properties" : {
+ "description" : {
+ "type" : "string"
+ },
"from" : {
"$ref" :
"#/items/definitions/org.apache.camel.model.FromDefinition"
},
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
index fed813d..c2d7abf 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy
@@ -161,4 +161,29 @@ class RoutesTest extends YamlTestSupport {
}
}
}
+
+ def "load route description"() {
+ when:
+ loadRoutes '''
+ - route:
+ id: demo-route
+ description: something cool
+ from:
+ uri: "direct:info"
+ steps:
+ - log: "message"
+ '''
+ then:
+ context.routeDefinitions.size() == 1
+
+ with(context.routeDefinitions[0], RouteDefinition) {
+ routeId == 'demo-route'
+ description.text == 'something cool'
+ input.endpointUri == 'direct:info'
+
+ with (outputs[0], LogDefinition) {
+ message == 'message'
+ }
+ }
+ }
}
