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/03/14 16:50:51 UTC

[camel] branch main updated: camel-yaml-dsl - Add stream-caching/auto-startup options to route

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 bed7f57  camel-yaml-dsl - Add stream-caching/auto-startup options to route
bed7f57 is described below

commit bed7f5755d3b49b8e83d07af61254ef42be62e1a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Mar 14 17:46:01 2022 +0100

    camel-yaml-dsl - Add stream-caching/auto-startup options to route
---
 .../dsl/yaml/deserializers/RouteDefinitionDeserializer.java    | 10 +++++++++-
 .../camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json |  6 ++++++
 .../camel-yaml-dsl/src/generated/resources/camelYamlDsl.json   |  6 ++++++
 .../test/groovy/org/apache/camel/dsl/yaml/RoutesTest.groovy    |  4 ++++
 4 files changed, 25 insertions(+), 1 deletion(-)

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 8e49bb1..bda60c0 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
@@ -38,9 +38,11 @@ import org.snakeyaml.engine.v2.nodes.NodeTuple;
           properties = {
                   @YamlProperty(name = "id", type = "string"),
                   @YamlProperty(name = "description", type = "string"),
-                  @YamlProperty(name = "precondition", type = "string"),
                   @YamlProperty(name = "group", type = "string"),
+                  @YamlProperty(name = "precondition", type = "string"),
                   @YamlProperty(name = "route-configuration-id", type = "string"),
+                  @YamlProperty(name = "auto-startup", type = "boolean"),
+                  @YamlProperty(name = "stream-caching", type = "boolean"),
                   @YamlProperty(name = "from", type = "object:org.apache.camel.model.FromDefinition", required = true)
           })
 public class RouteDefinitionDeserializer extends YamlDeserializerBase<RouteDefinition> {
@@ -80,6 +82,12 @@ public class RouteDefinitionDeserializer extends YamlDeserializerBase<RouteDefin
                 case "route-configuration-id":
                     target.setRouteConfigurationId(asText(val));
                     break;
+                case "auto-startup":
+                    target.setAutoStartup(asText(val));
+                    break;
+                case "stream-caching":
+                    target.setStreamCache(asText(val));
+                    break;
                 case "from":
                     val.setProperty(RouteDefinition.class.getName(), target);
                     target.setInput(asType(val, FromDefinition.class));
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 cdf77b0..21f7378 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
@@ -2502,6 +2502,9 @@
       "org.apache.camel.model.RouteDefinition" : {
         "type" : "object",
         "properties" : {
+          "auto-startup" : {
+            "type" : "boolean"
+          },
           "description" : {
             "type" : "string"
           },
@@ -2519,6 +2522,9 @@
           },
           "route-configuration-id" : {
             "type" : "string"
+          },
+          "stream-caching" : {
+            "type" : "boolean"
           }
         },
         "required" : [ "from" ]
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 f0628b0..31e1177 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
@@ -2406,6 +2406,9 @@
       "org.apache.camel.model.RouteDefinition" : {
         "type" : "object",
         "properties" : {
+          "autoStartup" : {
+            "type" : "boolean"
+          },
           "description" : {
             "type" : "string"
           },
@@ -2423,6 +2426,9 @@
           },
           "routeConfigurationId" : {
             "type" : "string"
+          },
+          "streamCaching" : {
+            "type" : "boolean"
           }
         },
         "required" : [ "from" ]
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 baeb051e..5a933c7 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
@@ -144,6 +144,8 @@ class RoutesTest extends YamlTestSupport {
         loadRoutes '''
                 - route:
                     id: demo-route
+                    stream-caching: true
+                    auto-startup: false
                     from:
                       uri: "direct:info"
                       steps:
@@ -154,6 +156,8 @@ class RoutesTest extends YamlTestSupport {
 
         with(context.routeDefinitions[0], RouteDefinition) {
             routeId == 'demo-route'
+            streamCache == 'true'
+            autoStartup == 'false'
             input.endpointUri == 'direct:info'
 
             with (outputs[0], LogDefinition) {