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
commit 99455d545f0b8f62a2deb6e4eb65ca033458dc11 Author: Claus Ibsen <[email protected]> AuthorDate: Mon Jan 3 10:16:06 2022 +0100 CAMEL-17411: camel-yaml-dsl - fix source location when loading multiple files. --- .../camel/dsl/yaml/KameletRoutesBuilderLoader.java | 18 +++++++++++------- .../apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java | 9 ++++++++- .../camel/dsl/yaml/YamlRoutesBuilderLoaderSupport.java | 2 -- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/KameletRoutesBuilderLoader.java b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/KameletRoutesBuilderLoader.java index fe7b9e5..1c53bd1 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/KameletRoutesBuilderLoader.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/KameletRoutesBuilderLoader.java @@ -34,6 +34,7 @@ import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asMapping import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asStringSet; import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asText; import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.nodeAt; +import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.setDeserializationContext; @ManagedResource(description = "Managed Kamelet RoutesBuilderLoader") @RoutesLoader(KameletRoutesBuilderLoader.EXTENSION) @@ -45,21 +46,24 @@ public class KameletRoutesBuilderLoader extends YamlRoutesBuilderLoaderSupport { } @Override - protected RouteBuilder builder(Node node, Resource resource) { - Node template = nodeAt(node, "/spec/template"); + protected RouteBuilder builder(final Node root, final Resource resource) { + getDeserializationContext().setResource(resource); + setDeserializationContext(root, getDeserializationContext()); + + Node template = nodeAt(root, "/spec/template"); if (template == null) { // fallback till flows get removed - template = nodeAt(node, "/spec/flows"); + template = nodeAt(root, "/spec/flows"); } if (template == null) { // fallback till flow get removed - template = nodeAt(node, "/spec/flow"); + template = nodeAt(root, "/spec/flow"); } if (template == null) { throw new IllegalArgumentException("No template defined"); } - Set<String> required = asStringSet(nodeAt(node, "/spec/definition/required")); + Set<String> required = asStringSet(nodeAt(root, "/spec/definition/required")); if (required == null) { required = Collections.emptySet(); } @@ -67,9 +71,9 @@ public class KameletRoutesBuilderLoader extends YamlRoutesBuilderLoaderSupport { final YamlDeserializationContext context = this.getDeserializationContext(); final RouteTemplateDefinition rtd = context.construct(template, RouteTemplateDefinition.class); - rtd.id(asText(nodeAt(node, "/metadata/name"))); + rtd.id(asText(nodeAt(root, "/metadata/name"))); - Node properties = nodeAt(node, "/spec/definition/properties"); + Node properties = nodeAt(root, "/spec/definition/properties"); if (properties != null) { rtd.setTemplateParameters(new ArrayList<>()); 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 1a15d0e..60f6a30 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 @@ -55,6 +55,7 @@ import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asMapping import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asSequenceNode; import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asText; import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.nodeAt; +import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.setDeserializationContext; @ManagedResource(description = "Managed YAML RoutesBuilderLoader") @RoutesLoader(YamlRoutesBuilderLoader.EXTENSION) @@ -72,7 +73,7 @@ public class YamlRoutesBuilderLoader extends YamlRoutesBuilderLoaderSupport { super(EXTENSION); } - protected RouteBuilder builder(Node root, Resource resource) { + protected RouteBuilder builder(final Node root, final Resource resource) { // we need to keep track of already configured items as the yaml-dsl returns a // RouteConfigurationBuilder that is capable of both route and route configurations @@ -82,6 +83,9 @@ public class YamlRoutesBuilderLoader extends YamlRoutesBuilderLoaderSupport { return new RouteConfigurationBuilder() { @Override public void configure() throws Exception { + getDeserializationContext().setResource(resource); + setDeserializationContext(root, getDeserializationContext()); + Object target = preConfigureNode(root); if (target == null) { return; @@ -162,6 +166,9 @@ public class YamlRoutesBuilderLoader extends YamlRoutesBuilderLoaderSupport { @Override public void configuration() throws Exception { + getDeserializationContext().setResource(resource); + setDeserializationContext(root, getDeserializationContext()); + Object target = preConfigureNode(root); if (target == null) { return; diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoaderSupport.java b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoaderSupport.java index c0ba6e3..6102197 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoaderSupport.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoaderSupport.java @@ -117,8 +117,6 @@ public abstract class YamlRoutesBuilderLoaderSupport extends RouteBuilderLoaderS throw new FileNotFoundException("Resource not found: " + resource.getLocation()); } - deserializationContext.setResource(resource); - try (InputStream is = resource.getInputStream()) { final StreamReader reader = new StreamReader(settings, new YamlUnicodeReader(is)); final Parser parser = new ParserImpl(settings, reader);
