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 2021/12/09 15:28:39 UTC
[camel] 02/02: CAMEL-17304: camel-yaml-dsl - from should not be inlined as it requires steps
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch yaml-from
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 55614c33f28274f4e73bfc4ecb59380a5802932f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Dec 9 16:22:23 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 ++++++++++------------
2 files changed, 14 insertions(+), 18 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 3fa8545..bcb19a4 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" : {