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 cd110d68e87d8d5f4fa506bbfbe1dfa5d32f8057 Author: Claus Ibsen <[email protected]> AuthorDate: Tue Jan 25 13:03:59 2022 +0100 CAMEL-17283: camel-yaml-dsl - Fix route template model to not be inlined. --- .../camel/model/RouteTemplateBeanDefinition.java | 9 +---- .../camel/model/RouteTemplateDefinition.java | 3 +- .../RouteTemplateBeanDefinitionDeserializer.java | 6 ++- .../src/generated/resources/camel-yaml-dsl.json | 46 ++++++++++------------ .../src/generated/resources/camelYamlDsl.json | 46 ++++++++++------------ 5 files changed, 49 insertions(+), 61 deletions(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java index 95767f0..08a66ac 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java @@ -55,14 +55,7 @@ public class RouteTemplateBeanDefinition { @XmlTransient private RouteTemplateContext.BeanSupplier<Object> beanSupplier; - public RouteTemplateBeanDefinition() { - } - - public RouteTemplateBeanDefinition(String name) { - this.name = name; - } - - public RouteTemplateBeanDefinition(RouteTemplateDefinition parent) { + void setParent(RouteTemplateDefinition parent) { this.parent = parent; } diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java index eeb96d7..43acd5c 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateDefinition.java @@ -332,7 +332,8 @@ public class RouteTemplateDefinition extends OptionalIdentifiedDefinition { if (templateBeans == null) { templateBeans = new ArrayList<>(); } - RouteTemplateBeanDefinition def = new RouteTemplateBeanDefinition(this); + RouteTemplateBeanDefinition def = new RouteTemplateBeanDefinition(); + def.setParent(this); def.setName(name); templateBeans.add(def); return def; diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateBeanDefinitionDeserializer.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateBeanDefinitionDeserializer.java index fa950ba..19523d0 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateBeanDefinitionDeserializer.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/RouteTemplateBeanDefinitionDeserializer.java @@ -27,7 +27,7 @@ import org.apache.camel.spi.annotations.YamlType; import org.snakeyaml.engine.v2.nodes.Node; @YamlType( - inline = true, + inline = false, types = org.apache.camel.model.RouteTemplateBeanDefinition.class, order = YamlDeserializerResolver.ORDER_DEFAULT, nodes = { "template-bean", "templateBean" }, @@ -51,7 +51,9 @@ public class RouteTemplateBeanDefinitionDeserializer extends YamlDeserializerBas @Override protected RouteTemplateBeanDefinition newInstance(String value) { - return new RouteTemplateBeanDefinition(value); + RouteTemplateBeanDefinition answer = new RouteTemplateBeanDefinition(); + answer.setName(value); + return answer; } @Override 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 796d6e3..ae067a2 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 @@ -2485,34 +2485,30 @@ "required" : [ "from" ] }, "org.apache.camel.model.RouteTemplateBeanDefinition" : { - "oneOf" : [ { - "type" : "string" - }, { - "type" : "object", + "type" : "object", + "properties" : { + "bean-type" : { + "type" : "string" + }, + "name" : { + "type" : "string" + }, "properties" : { - "bean-type" : { - "type" : "string" - }, - "name" : { - "type" : "string" - }, - "properties" : { - "type" : "object" - }, - "property" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" - } - }, - "script" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteTemplateScriptDefinition" - }, - "type" : { - "type" : "string" + "type" : "object" + }, + "property" : { + "type" : "array", + "items" : { + "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" } + }, + "script" : { + "$ref" : "#/items/definitions/org.apache.camel.model.RouteTemplateScriptDefinition" + }, + "type" : { + "type" : "string" } - } ], + }, "required" : [ "name", "type" ] }, "org.apache.camel.model.RouteTemplateDefinition" : { diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json index 20d41d7..c8fa9b5 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json @@ -2389,34 +2389,30 @@ "required" : [ "from" ] }, "org.apache.camel.model.RouteTemplateBeanDefinition" : { - "oneOf" : [ { - "type" : "string" - }, { - "type" : "object", + "type" : "object", + "properties" : { + "beanType" : { + "type" : "string" + }, + "name" : { + "type" : "string" + }, "properties" : { - "beanType" : { - "type" : "string" - }, - "name" : { - "type" : "string" - }, - "properties" : { - "type" : "object" - }, - "property" : { - "type" : "array", - "items" : { - "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" - } - }, - "script" : { - "$ref" : "#/items/definitions/org.apache.camel.model.RouteTemplateScriptDefinition" - }, - "type" : { - "type" : "string" + "type" : "object" + }, + "property" : { + "type" : "array", + "items" : { + "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition" } + }, + "script" : { + "$ref" : "#/items/definitions/org.apache.camel.model.RouteTemplateScriptDefinition" + }, + "type" : { + "type" : "string" } - } ], + }, "required" : [ "name", "type" ] }, "org.apache.camel.model.RouteTemplateDefinition" : {
