You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/08/03 14:59:53 UTC
[camel] branch camel-3.18.x updated: CAMEL-18343: camel-yaml-dsl - Add route-policy
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new fbd25f72bd1 CAMEL-18343: camel-yaml-dsl - Add route-policy
fbd25f72bd1 is described below
commit fbd25f72bd12d0e058f2ab5694e5769f80418498
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 3 16:59:14 2022 +0200
CAMEL-18343: camel-yaml-dsl - Add route-policy
---
.../camel/dsl/yaml/deserializers/RouteDefinitionDeserializer.java | 8 ++++++++
.../src/generated/resources/schema/camel-yaml-dsl.json | 6 ++++++
.../src/generated/resources/schema/camelYamlDsl.json | 6 ++++++
.../src/test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy | 4 ++++
4 files changed, 24 insertions(+)
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 bda60c0e28c..719829d4272 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
@@ -42,6 +42,8 @@ import org.snakeyaml.engine.v2.nodes.NodeTuple;
@YamlProperty(name = "precondition", type = "string"),
@YamlProperty(name = "route-configuration-id", type = "string"),
@YamlProperty(name = "auto-startup", type = "boolean"),
+ @YamlProperty(name = "route-policy", type = "string"),
+ @YamlProperty(name = "startup-order", type = "number"),
@YamlProperty(name = "stream-caching", type = "boolean"),
@YamlProperty(name = "from", type = "object:org.apache.camel.model.FromDefinition", required = true)
})
@@ -85,6 +87,12 @@ public class RouteDefinitionDeserializer extends YamlDeserializerBase<RouteDefin
case "auto-startup":
target.setAutoStartup(asText(val));
break;
+ case "route-policy":
+ target.setRoutePolicyRef(asText(val));
+ break;
+ case "startup-order":
+ target.setStartupOrder(asInt(val));
+ break;
case "stream-caching":
target.setStreamCache(asText(val));
break;
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
index b51e3385be7..e69696798ee 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
@@ -2409,6 +2409,12 @@
"route-configuration-id" : {
"type" : "string"
},
+ "route-policy" : {
+ "type" : "string"
+ },
+ "startup-order" : {
+ "type" : "number"
+ },
"stream-caching" : {
"type" : "boolean"
}
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 688d106ec1b..c7b206791da 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
@@ -2313,6 +2313,12 @@
"routeConfigurationId" : {
"type" : "string"
},
+ "routePolicy" : {
+ "type" : "string"
+ },
+ "startupOrder" : {
+ "type" : "number"
+ },
"streamCaching" : {
"type" : "boolean"
}
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 5a933c79ecb..9df266b0f33 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
@@ -146,6 +146,8 @@ class RoutesTest extends YamlTestSupport {
id: demo-route
stream-caching: true
auto-startup: false
+ startup-order: 123
+ route-policy: "myPolicy"
from:
uri: "direct:info"
steps:
@@ -158,6 +160,8 @@ class RoutesTest extends YamlTestSupport {
routeId == 'demo-route'
streamCache == 'true'
autoStartup == 'false'
+ startupOrder == 123
+ routePolicyRef == 'myPolicy'
input.endpointUri == 'direct:info'
with (outputs[0], LogDefinition) {