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 84acd9e  CAMEL-17450: camel-yaml-dsl - Source location for 
KameletBinding
84acd9e is described below

commit 84acd9eb722845b16699fdf2b56d5e9d6748f862
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Jan 7 12:49:06 2022 +0100

    CAMEL-17450: camel-yaml-dsl - Source location for KameletBinding
---
 .../camel/dsl/yaml/YamlRoutesBuilderLoader.java      | 20 ++++++++++++++++++--
 .../camel/dsl/yaml/KameletBindingLoaderTest.groovy   |  4 ++++
 2 files changed, 22 insertions(+), 2 deletions(-)

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 df2c431..e34c08c 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
@@ -32,7 +32,9 @@ import org.apache.camel.builder.RouteConfigurationBuilder;
 import org.apache.camel.dsl.yaml.common.YamlDeserializationContext;
 import org.apache.camel.dsl.yaml.common.YamlDeserializerSupport;
 import org.apache.camel.dsl.yaml.deserializers.OutputAwareFromDefinition;
+import org.apache.camel.model.KameletDefinition;
 import org.apache.camel.model.OnExceptionDefinition;
+import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.model.RouteConfigurationDefinition;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.RouteTemplateDefinition;
@@ -286,13 +288,27 @@ public class YamlRoutesBuilderLoader extends 
YamlRoutesBuilderLoaderSupport {
                     MappingNode step = asMappingNode(node);
                     uri = extractCamelEndpointUri(step);
                     if (uri != null) {
+                        line = -1;
+                        if (node.getStartMark().isPresent()) {
+                            line = node.getStartMark().get().getLine();
+                        }
+
+                        ProcessorDefinition out;
                         // if kamelet then use kamelet eip instead of to
                         boolean kamelet = uri.startsWith("kamelet:");
                         if (kamelet) {
                             uri = uri.substring(8);
-                            route.kamelet(uri);
+                            out = new KameletDefinition(uri);
                         } else {
-                            route.to(uri);
+                            out = new ToDefinition(uri);
+                        }
+                        route.addOutput(out);
+                        // enrich model with line number
+                        if (line != -1) {
+                            out.setLineNumber(line);
+                            if (ctx != null) {
+                                
out.setLocation(ctx.getResource().getLocation());
+                            }
                         }
                     }
                 }
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 59d8a05..db28d55 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
@@ -160,15 +160,19 @@ class KameletBindingLoaderTest extends YamlTestSupport {
         with (context.routeDefinitions[0]) {
             routeId == 'steps-binding'
             input.endpointUri == 'kamelet:timer-source?message=Camel'
+            input.lineNumber == 7
             outputs.size() == 3
             with (outputs[0], KameletDefinition) {
                 name == 'prefix-action?prefix=Apache'
+                lineNumber == 14
             }
             with (outputs[1], KameletDefinition) {
                 name == 'prefix-action?prefix=Hello'
+                lineNumber == 20
             }
             with (outputs[2], ToDefinition) {
                 endpointUri == 'log:info'
+                lineNumber == 27
             }
         }
     }

Reply via email to