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 6e629d266b41cf7525addfb241838b214c557eba Author: Claus Ibsen <[email protected]> AuthorDate: Tue Jan 25 13:10:15 2022 +0100 CAMEL-17283: camel-yaml-dsl - The xxxRef should allow to be inlined --- .../dsl/yaml/deserializers/ModelDeserializers.java | 18 ++++++++++ .../src/generated/resources/camel-yaml-dsl.json | 42 ++++++++++++++-------- .../src/generated/resources/camelYamlDsl.json | 42 ++++++++++++++-------- 3 files changed, 72 insertions(+), 30 deletions(-) diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java index b15d08c..8da72b9 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java @@ -11769,6 +11769,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { } @YamlType( + inline = true, types = org.apache.camel.model.RestContextRefDefinition.class, order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, nodes = { @@ -11788,6 +11789,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport { } @Override + protected RestContextRefDefinition newInstance(String value) { + return new RestContextRefDefinition(value); + } + + @Override protected boolean setProperty(RestContextRefDefinition target, String propertyKey, String propertyName, Node node) { switch(propertyKey) { @@ -13006,6 +13012,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { } @YamlType( + inline = true, types = org.apache.camel.model.RouteConfigurationContextRefDefinition.class, order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, nodes = { @@ -13025,6 +13032,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport { } @Override + protected RouteConfigurationContextRefDefinition newInstance(String value) { + return new RouteConfigurationContextRefDefinition(value); + } + + @Override protected boolean setProperty(RouteConfigurationContextRefDefinition target, String propertyKey, String propertyName, Node node) { switch(propertyKey) { @@ -13042,6 +13054,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport { } @YamlType( + inline = true, types = org.apache.camel.model.RouteContextRefDefinition.class, order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1, nodes = { @@ -13061,6 +13074,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport { } @Override + protected RouteContextRefDefinition newInstance(String value) { + return new RouteContextRefDefinition(value); + } + + @Override protected boolean setProperty(RouteContextRefDefinition target, String propertyKey, String propertyName, Node node) { switch(propertyKey) { 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 ae067a2..1145a04 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 @@ -2352,12 +2352,16 @@ } }, "org.apache.camel.model.RestContextRefDefinition" : { - "type" : "object", - "properties" : { - "ref" : { - "type" : "string" + "oneOf" : [ { + "type" : "string" + }, { + "type" : "object", + "properties" : { + "ref" : { + "type" : "string" + } } - }, + } ], "required" : [ "ref" ] }, "org.apache.camel.model.RollbackDefinition" : { @@ -2404,12 +2408,16 @@ "required" : [ "ref" ] }, "org.apache.camel.model.RouteConfigurationContextRefDefinition" : { - "type" : "object", - "properties" : { - "ref" : { - "type" : "string" + "oneOf" : [ { + "type" : "string" + }, { + "type" : "object", + "properties" : { + "ref" : { + "type" : "string" + } } - }, + } ], "required" : [ "ref" ] }, "org.apache.camel.model.RouteConfigurationDefinition" : { @@ -2455,12 +2463,16 @@ } ] }, "org.apache.camel.model.RouteContextRefDefinition" : { - "type" : "object", - "properties" : { - "ref" : { - "type" : "string" + "oneOf" : [ { + "type" : "string" + }, { + "type" : "object", + "properties" : { + "ref" : { + "type" : "string" + } } - }, + } ], "required" : [ "ref" ] }, "org.apache.camel.model.RouteDefinition" : { 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 c8fa9b5..a72a2b8 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 @@ -2256,12 +2256,16 @@ } }, "org.apache.camel.model.RestContextRefDefinition" : { - "type" : "object", - "properties" : { - "ref" : { - "type" : "string" + "oneOf" : [ { + "type" : "string" + }, { + "type" : "object", + "properties" : { + "ref" : { + "type" : "string" + } } - }, + } ], "required" : [ "ref" ] }, "org.apache.camel.model.RollbackDefinition" : { @@ -2308,12 +2312,16 @@ "required" : [ "ref" ] }, "org.apache.camel.model.RouteConfigurationContextRefDefinition" : { - "type" : "object", - "properties" : { - "ref" : { - "type" : "string" + "oneOf" : [ { + "type" : "string" + }, { + "type" : "object", + "properties" : { + "ref" : { + "type" : "string" + } } - }, + } ], "required" : [ "ref" ] }, "org.apache.camel.model.RouteConfigurationDefinition" : { @@ -2359,12 +2367,16 @@ } ] }, "org.apache.camel.model.RouteContextRefDefinition" : { - "type" : "object", - "properties" : { - "ref" : { - "type" : "string" + "oneOf" : [ { + "type" : "string" + }, { + "type" : "object", + "properties" : { + "ref" : { + "type" : "string" + } } - }, + } ], "required" : [ "ref" ] }, "org.apache.camel.model.RouteDefinition" : {
