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 42834b3de911c23e2f6b5e0f3f0dac8cb57518b5 Author: Claus Ibsen <[email protected]> AuthorDate: Thu Dec 16 11:40:50 2021 +0100 CAMEL-17304: camel-yaml-dsl - from should not be inlined as it requires steps --- .../deserializers/FromDefinitionDeserializer.java | 2 +- .../src/generated/resources/camel-yaml-dsl.json | 30 ++++++++++------------ .../apache/camel/dsl/yaml/LineNumberTest.groovy | 4 +-- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/FromDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/FromDefinitionDeserializer.java index 1a62278..1988a71 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/FromDefinitionDeserializer.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/FromDefinitionDeserializer.java @@ -26,7 +26,7 @@ import org.snakeyaml.engine.v2.api.ConstructNode; import org.snakeyaml.engine.v2.nodes.Node; @YamlType( - inline = true, + inline = false, types = FromDefinition.class, order = YamlDeserializerResolver.ORDER_DEFAULT, properties = { 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 7fa4a6e..819b908 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 @@ -936,25 +936,21 @@ } }, "org.apache.camel.model.FromDefinition" : { - "oneOf" : [ { - "type" : "string" - }, { - "type" : "object", - "properties" : { - "parameters" : { - "type" : "object" - }, - "steps" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" - } - }, - "uri" : { - "type" : "string" + "type" : "object", + "properties" : { + "parameters" : { + "type" : "object" + }, + "steps" : { + "type" : "array", + "items" : { + "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition" } + }, + "uri" : { + "type" : "string" } - } ], + }, "required" : [ "steps", "uri" ] }, "org.apache.camel.model.GlobalOptionDefinition" : { diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy index 402e280..f1bbad0 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy @@ -61,8 +61,8 @@ class LineNumberTest extends YamlTestSupport { - route: from: uri: "direct:info" - steps: - - log: "message" + steps: + - log: "message" ''' then: context.routeDefinitions.size() == 1
