[camel] branch bind updated: CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K KameletBinding file. WIP.

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch bind
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/bind by this push:
     new 9e9caf5  CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K 
KameletBinding file. WIP.
9e9caf5 is described below

commit 9e9caf5396b5ba6cd6d0da2ab579c5c4ed225644
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Dec 5 10:59:44 2021 +0100

    CAMEL-17261: camel-yaml-dsl - Add support for loading Camel K 
KameletBinding file. WIP.
---
 .../java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java     | 6 ++++++
 .../org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy       | 3 +++
 2 files changed, 9 insertions(+)

diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
index a682125..5782086 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java
@@ -52,6 +52,7 @@ import static 
org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.nodeAt;
 @ManagedResource(description = "Managed YAML RoutesBuilderLoader")
 @RoutesLoader(YamlRoutesBuilderLoader.EXTENSION)
 public class YamlRoutesBuilderLoader extends YamlRoutesBuilderLoaderSupport {
+
     public static final String EXTENSION = "yaml";
 
     public YamlRoutesBuilderLoader() {
@@ -227,8 +228,13 @@ public class YamlRoutesBuilderLoader extends 
YamlRoutesBuilderLoaderSupport {
                 to = to + "?" + query;
             }
 
+            String routeId = asText(nodeAt(root, "/metadata/name"));
+
             // build kamelet binding as a route
             RouteDefinition route = new RouteDefinition();
+            if (routeId != null) {
+                route.routeId(routeId);
+            }
             route.from(from).to(to);
             target = route;
         }
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
index b975b12..fcf041a 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/KameletBindingLoaderTest.groovy
@@ -50,6 +50,7 @@ class KameletBindingLoaderTest extends YamlTestSupport {
             context.routeDefinitions.size() == 3
 
             with (context.routeDefinitions[0]) {
+                routeId == 'timer-event-source'
                 input.endpointUri == 
'kamelet:timer-source?message=Hello+world%21'
                 outputs.size() == 1
                 with (outputs[0], ToDefinition) {
@@ -78,6 +79,7 @@ class KameletBindingLoaderTest extends YamlTestSupport {
         context.routeDefinitions.size() == 2
 
         with (context.routeDefinitions[0]) {
+            routeId == 'timer-event-source'
             input.endpointUri == 'timer:foo'
             outputs.size() == 1
             with (outputs[0], ToDefinition) {
@@ -103,6 +105,7 @@ class KameletBindingLoaderTest extends YamlTestSupport {
         context.routeDefinitions.size() == 1
 
         with (context.routeDefinitions[0]) {
+            routeId == 'timer-event-source'
             input.endpointUri == 'timer:foo'
             outputs.size() == 1
             with (outputs[0], ToDefinition) {