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 2022/11/23 05:51:20 UTC

[camel] 01/02: Revert "Regen for commit 9f3d15cade87a4e785c138f0b22b3d910b5ccbc6 (#8754)"

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 f46306722e2667b8e2e31dc73c1c45aa7fa1ffe3
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Nov 22 13:36:10 2022 +0100

    Revert "Regen for commit 9f3d15cade87a4e785c138f0b22b3d910b5ccbc6 (#8754)"
    
    This reverts commit 9f8a3cbd7a45c201bd3bd7a871168b55e1ef96a8.
---
 .../dsl/yaml/deserializers/ModelDeserializers.java |  348 +++
 .../generated/resources/schema/camel-yaml-dsl.json | 3106 +++++++++++---------
 .../generated/resources/schema/camelYamlDsl.json   | 3106 +++++++++++---------
 3 files changed, 3682 insertions(+), 2878 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 342901aa0bb..56ae69f0acd 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
@@ -244,6 +244,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "asn1",
+            inline = true,
             types = org.apache.camel.model.dataformat.ASN1DataFormat.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -262,6 +263,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new ASN1DataFormat();
         }
 
+        @Override
+        protected ASN1DataFormat newInstance(String value) {
+            return new ASN1DataFormat(value);
+        }
+
         @Override
         protected boolean setProperty(ASN1DataFormat target, String propertyKey,
                 String propertyName, Node node) {
@@ -511,6 +517,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "any23",
+            inline = true,
             types = org.apache.camel.model.dataformat.Any23DataFormat.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -531,6 +538,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new Any23DataFormat();
         }
 
+        @Override
+        protected Any23DataFormat newInstance(String value) {
+            return new Any23DataFormat(value);
+        }
+
         @Override
         protected boolean setProperty(Any23DataFormat target, String propertyKey,
                 String propertyName, Node node) {
@@ -638,6 +650,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "avro",
+            inline = true,
             types = org.apache.camel.model.dataformat.AvroDataFormat.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -674,6 +687,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new AvroDataFormat();
         }
 
+        @Override
+        protected AvroDataFormat newInstance(String value) {
+            return new AvroDataFormat(value);
+        }
+
         @Override
         protected boolean setProperty(AvroDataFormat target, String propertyKey,
                 String propertyName, Node node) {
@@ -1007,6 +1025,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "bean",
+            inline = true,
             types = org.apache.camel.model.BeanDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -1030,6 +1049,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new BeanDefinition();
         }
 
+        @Override
+        protected BeanDefinition newInstance(String value) {
+            return new BeanDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(BeanDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -1344,6 +1368,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "csimple",
+            inline = true,
             types = org.apache.camel.model.language.CSimpleExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -1363,6 +1388,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new CSimpleExpression();
         }
 
+        @Override
+        protected CSimpleExpression newInstance(String value) {
+            return new CSimpleExpression(value);
+        }
+
         @Override
         protected boolean setProperty(CSimpleExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -2014,6 +2044,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "constant",
+            inline = true,
             types = org.apache.camel.model.language.ConstantExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -2033,6 +2064,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new ConstantExpression();
         }
 
+        @Override
+        protected ConstantExpression newInstance(String value) {
+            return new ConstantExpression(value);
+        }
+
         @Override
         protected boolean setProperty(ConstantExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -2227,6 +2263,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "convert-body-to",
                     "convertBodyTo"
             },
+            inline = true,
             types = org.apache.camel.model.ConvertBodyDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -2249,6 +2286,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new ConvertBodyDefinition();
         }
 
+        @Override
+        protected ConvertBodyDefinition newInstance(String value) {
+            return new ConvertBodyDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(ConvertBodyDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -2387,6 +2429,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "csv",
+            inline = true,
             types = org.apache.camel.model.dataformat.CsvDataFormat.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -2432,6 +2475,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new CsvDataFormat();
         }
 
+        @Override
+        protected CsvDataFormat newInstance(String value) {
+            return new CsvDataFormat(value);
+        }
+
         @Override
         protected boolean setProperty(CsvDataFormat target, String propertyKey, String propertyName,
                 Node node) {
@@ -2596,6 +2644,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "custom",
+            inline = true,
             types = org.apache.camel.model.dataformat.CustomDataFormat.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -2613,6 +2662,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new CustomDataFormat();
         }
 
+        @Override
+        protected CustomDataFormat newInstance(String value) {
+            return new CustomDataFormat(value);
+        }
+
         @Override
         protected boolean setProperty(CustomDataFormat target, String propertyKey,
                 String propertyName, Node node) {
@@ -2640,6 +2694,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "custom-load-balancer",
                     "customLoadBalancer"
             },
+            inline = true,
             types = org.apache.camel.model.loadbalancer.CustomLoadBalancerDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -2657,6 +2712,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new CustomLoadBalancerDefinition();
         }
 
+        @Override
+        protected CustomLoadBalancerDefinition newInstance(String value) {
+            return new CustomLoadBalancerDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(CustomLoadBalancerDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -3652,6 +3712,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "datasonnet",
+            inline = true,
             types = org.apache.camel.model.language.DatasonnetExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -3673,6 +3734,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new DatasonnetExpression();
         }
 
+        @Override
+        protected DatasonnetExpression newInstance(String value) {
+            return new DatasonnetExpression(value);
+        }
+
         @Override
         protected boolean setProperty(DatasonnetExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -4226,6 +4292,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "description",
+            inline = true,
             types = org.apache.camel.model.DescriptionDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -4243,6 +4310,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new DescriptionDefinition();
         }
 
+        @Override
+        protected DescriptionDefinition newInstance(String value) {
+            return new DescriptionDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(DescriptionDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -4754,6 +4826,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "exchange-property",
                     "exchangeProperty"
             },
+            inline = true,
             types = org.apache.camel.model.language.ExchangePropertyExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -4772,6 +4845,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new ExchangePropertyExpression();
         }
 
+        @Override
+        protected ExchangePropertyExpression newInstance(String value) {
+            return new ExchangePropertyExpression(value);
+        }
+
         @Override
         protected boolean setProperty(ExchangePropertyExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -5717,6 +5795,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "groovy",
+            inline = true,
             types = org.apache.camel.model.language.GroovyExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -5735,6 +5814,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new GroovyExpression();
         }
 
+        @Override
+        protected GroovyExpression newInstance(String value) {
+            return new GroovyExpression(value);
+        }
+
         @Override
         protected boolean setProperty(GroovyExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -5987,6 +6071,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "header",
+            inline = true,
             types = org.apache.camel.model.language.HeaderExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -6005,6 +6090,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new HeaderExpression();
         }
 
+        @Override
+        protected HeaderExpression newInstance(String value) {
+            return new HeaderExpression(value);
+        }
+
         @Override
         protected boolean setProperty(HeaderExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -6087,6 +6177,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "hl7terser",
+            inline = true,
             types = org.apache.camel.model.language.Hl7TerserExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -6105,6 +6196,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new Hl7TerserExpression();
         }
 
+        @Override
+        protected Hl7TerserExpression newInstance(String value) {
+            return new Hl7TerserExpression(value);
+        }
+
         @Override
         protected boolean setProperty(Hl7TerserExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -6294,6 +6390,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "in-only",
                     "inOnly"
             },
+            inline = true,
             types = org.apache.camel.model.InOnlyDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -6315,6 +6412,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new InOnlyDefinition();
         }
 
+        @Override
+        protected InOnlyDefinition newInstance(String value) {
+            return new InOnlyDefinition(value);
+        }
+
         @Override
         protected void setEndpointUri(CamelContext camelContext, Node node, InOnlyDefinition target,
                 Map<String, Object> parameters) {
@@ -6363,6 +6465,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "in-out",
                     "inOut"
             },
+            inline = true,
             types = org.apache.camel.model.InOutDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -6384,6 +6487,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new InOutDefinition();
         }
 
+        @Override
+        protected InOutDefinition newInstance(String value) {
+            return new InOutDefinition(value);
+        }
+
         @Override
         protected void setEndpointUri(CamelContext camelContext, Node node, InOutDefinition target,
                 Map<String, Object> parameters) {
@@ -6546,6 +6654,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "intercept-from",
                     "interceptFrom"
             },
+            inline = true,
             types = org.apache.camel.model.InterceptFromDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -6567,6 +6676,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new InterceptFromDefinition();
         }
 
+        @Override
+        protected InterceptFromDefinition newInstance(String value) {
+            return new InterceptFromDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(InterceptFromDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -6613,6 +6727,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "intercept-send-to-endpoint",
                     "interceptSendToEndpoint"
             },
+            inline = true,
             types = org.apache.camel.model.InterceptSendToEndpointDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -6636,6 +6751,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new InterceptSendToEndpointDefinition();
         }
 
+        @Override
+        protected InterceptSendToEndpointDefinition newInstance(String value) {
+            return new InterceptSendToEndpointDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(InterceptSendToEndpointDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -6823,6 +6943,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "js",
+            inline = true,
             types = org.apache.camel.model.language.JavaScriptExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -6843,6 +6964,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new JavaScriptExpression();
         }
 
+        @Override
+        protected JavaScriptExpression newInstance(String value) {
+            return new JavaScriptExpression(value);
+        }
+
         @Override
         protected boolean setProperty(JavaScriptExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -7040,6 +7166,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "joor",
+            inline = true,
             types = org.apache.camel.model.language.JoorExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -7061,6 +7188,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new JoorExpression();
         }
 
+        @Override
+        protected JoorExpression newInstance(String value) {
+            return new JoorExpression(value);
+        }
+
         @Override
         protected boolean setProperty(JoorExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -7114,6 +7246,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "jq",
+            inline = true,
             types = org.apache.camel.model.language.JqExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -7134,6 +7267,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new JqExpression();
         }
 
+        @Override
+        protected JqExpression newInstance(String value) {
+            return new JqExpression(value);
+        }
+
         @Override
         protected boolean setProperty(JqExpression target, String propertyKey, String propertyName,
                 Node node) {
@@ -7403,6 +7541,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "jsonpath",
+            inline = true,
             types = org.apache.camel.model.language.JsonPathExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -7429,6 +7568,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new JsonPathExpression();
         }
 
+        @Override
+        protected JsonPathExpression newInstance(String value) {
+            return new JsonPathExpression(value);
+        }
+
         @Override
         protected boolean setProperty(JsonPathExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -7998,6 +8142,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "log",
+            inline = true,
             types = org.apache.camel.model.LogDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -8022,6 +8167,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new LogDefinition();
         }
 
+        @Override
+        protected LogDefinition newInstance(String value) {
+            return new LogDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(LogDefinition target, String propertyKey, String propertyName,
                 Node node) {
@@ -8477,6 +8627,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "method",
+            inline = true,
             types = org.apache.camel.model.language.MethodCallExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -8498,6 +8649,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new MethodCallExpression();
         }
 
+        @Override
+        protected MethodCallExpression newInstance(String value) {
+            return new MethodCallExpression(value);
+        }
+
         @Override
         protected boolean setProperty(MethodCallExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -8787,6 +8943,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "mvel",
+            inline = true,
             types = org.apache.camel.model.language.MvelExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -8805,6 +8962,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new MvelExpression();
         }
 
+        @Override
+        protected MvelExpression newInstance(String value) {
+            return new MvelExpression(value);
+        }
+
         @Override
         protected boolean setProperty(MvelExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -8950,6 +9112,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "ognl",
+            inline = true,
             types = org.apache.camel.model.language.OgnlExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -8968,6 +9131,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new OgnlExpression();
         }
 
+        @Override
+        protected OgnlExpression newInstance(String value) {
+            return new OgnlExpression(value);
+        }
+
         @Override
         protected boolean setProperty(OgnlExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -10652,6 +10820,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "protobuf",
+            inline = true,
             types = org.apache.camel.model.dataformat.ProtobufDataFormat.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -10689,6 +10858,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new ProtobufDataFormat();
         }
 
+        @Override
+        protected ProtobufDataFormat newInstance(String value) {
+            return new ProtobufDataFormat(value);
+        }
+
         @Override
         protected boolean setProperty(ProtobufDataFormat target, String propertyKey,
                 String propertyName, Node node) {
@@ -10949,6 +11123,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "python",
+            inline = true,
             types = org.apache.camel.model.language.PythonExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -10969,6 +11144,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new PythonExpression();
         }
 
+        @Override
+        protected PythonExpression newInstance(String value) {
+            return new PythonExpression(value);
+        }
+
         @Override
         protected boolean setProperty(PythonExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -11388,6 +11568,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "ref",
+            inline = true,
             types = org.apache.camel.model.language.RefExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -11406,6 +11587,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new RefExpression();
         }
 
+        @Override
+        protected RefExpression newInstance(String value) {
+            return new RefExpression(value);
+        }
+
         @Override
         protected boolean setProperty(RefExpression target, String propertyKey, String propertyName,
                 Node node) {
@@ -11447,6 +11633,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "remove-header",
                     "removeHeader"
             },
+            inline = true,
             types = org.apache.camel.model.RemoveHeaderDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -11467,6 +11654,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new RemoveHeaderDefinition();
         }
 
+        @Override
+        protected RemoveHeaderDefinition newInstance(String value) {
+            return new RemoveHeaderDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(RemoveHeaderDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -11509,6 +11701,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "remove-headers",
                     "removeHeaders"
             },
+            inline = true,
             types = org.apache.camel.model.RemoveHeadersDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -11530,6 +11723,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new RemoveHeadersDefinition();
         }
 
+        @Override
+        protected RemoveHeadersDefinition newInstance(String value) {
+            return new RemoveHeadersDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(RemoveHeadersDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -11577,6 +11775,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "remove-properties",
                     "removeProperties"
             },
+            inline = true,
             types = org.apache.camel.model.RemovePropertiesDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -11598,6 +11797,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new RemovePropertiesDefinition();
         }
 
+        @Override
+        protected RemovePropertiesDefinition newInstance(String value) {
+            return new RemovePropertiesDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(RemovePropertiesDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -11645,6 +11849,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "remove-property",
                     "removeProperty"
             },
+            inline = true,
             types = org.apache.camel.model.RemovePropertyDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -11665,6 +11870,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new RemovePropertyDefinition();
         }
 
+        @Override
+        protected RemovePropertyDefinition newInstance(String value) {
+            return new RemovePropertyDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(RemovePropertyDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -12345,6 +12555,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "rest-context-ref",
                     "restContextRef"
             },
+            inline = true,
             types = org.apache.camel.model.RestContextRefDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = @YamlProperty(name = "ref", type = "string", required = true)
@@ -12359,6 +12570,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new RestContextRefDefinition();
         }
 
+        @Override
+        protected RestContextRefDefinition newInstance(String value) {
+            return new RestContextRefDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(RestContextRefDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -12811,6 +13027,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "rollback",
+            inline = true,
             types = org.apache.camel.model.RollbackDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -12833,6 +13050,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new RollbackDefinition();
         }
 
+        @Override
+        protected RollbackDefinition newInstance(String value) {
+            return new RollbackDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(RollbackDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -12921,6 +13143,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "route-builder",
                     "routeBuilder"
             },
+            inline = true,
             types = org.apache.camel.model.RouteBuilderDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -12938,6 +13161,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new RouteBuilderDefinition();
         }
 
+        @Override
+        protected RouteBuilderDefinition newInstance(String value) {
+            return new RouteBuilderDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(RouteBuilderDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -12965,6 +13193,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "route-configuration-context-ref",
                     "routeConfigurationContextRef"
             },
+            inline = true,
             types = org.apache.camel.model.RouteConfigurationContextRefDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = @YamlProperty(name = "ref", type = "string", required = true)
@@ -12979,6 +13208,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new RouteConfigurationContextRefDefinition();
         }
 
+        @Override
+        protected RouteConfigurationContextRefDefinition newInstance(String value) {
+            return new RouteConfigurationContextRefDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(RouteConfigurationContextRefDefinition target,
                 String propertyKey, String propertyName, Node node) {
@@ -13001,6 +13235,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "route-context-ref",
                     "routeContextRef"
             },
+            inline = true,
             types = org.apache.camel.model.RouteContextRefDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = @YamlProperty(name = "ref", type = "string", required = true)
@@ -13015,6 +13250,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new RouteContextRefDefinition();
         }
 
+        @Override
+        protected RouteContextRefDefinition newInstance(String value) {
+            return new RouteContextRefDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(RouteContextRefDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -13034,6 +13274,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "route",
+            inline = true,
             types = org.apache.camel.model.RouteDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -13054,6 +13295,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new RouteDefinition();
         }
 
+        @Override
+        protected RouteDefinition newInstance(String value) {
+            return new RouteDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(RouteDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -13151,6 +13397,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "routing-slip",
                     "routingSlip"
             },
+            inline = true,
             types = org.apache.camel.model.RoutingSlipDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -13175,6 +13422,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new RoutingSlipDefinition();
         }
 
+        @Override
+        protected RoutingSlipDefinition newInstance(String value) {
+            return new RoutingSlipDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(RoutingSlipDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -13270,6 +13522,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
     }
 
     @YamlType(
+            inline = true,
             types = org.apache.camel.model.SagaActionUriDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -13291,6 +13544,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new SagaActionUriDefinition();
         }
 
+        @Override
+        protected SagaActionUriDefinition newInstance(String value) {
+            return new SagaActionUriDefinition(value);
+        }
+
         @Override
         protected void setEndpointUri(CamelContext camelContext, Node node,
                 SagaActionUriDefinition target, Map<String, Object> parameters) {
@@ -13436,6 +13694,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "sample",
+            inline = true,
             types = org.apache.camel.model.SamplingDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -13457,6 +13716,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new SamplingDefinition();
         }
 
+        @Override
+        protected SamplingDefinition newInstance(String value) {
+            return new SamplingDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(SamplingDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -13794,6 +14058,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "service-call",
                     "serviceCall"
             },
+            inline = true,
             types = org.apache.camel.model.cloud.ServiceCallDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -13837,6 +14102,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new ServiceCallDefinition();
         }
 
+        @Override
+        protected ServiceCallDefinition newInstance(String value) {
+            return new ServiceCallDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(ServiceCallDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -14314,6 +14584,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "set-exchange-pattern",
                     "setExchangePattern"
             },
+            inline = true,
             types = org.apache.camel.model.SetExchangePatternDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -14334,6 +14605,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new SetExchangePatternDefinition();
         }
 
+        @Override
+        protected SetExchangePatternDefinition newInstance(String value) {
+            return new SetExchangePatternDefinition(value);
+        }
+
         @Override
         protected boolean setProperty(SetExchangePatternDefinition target, String propertyKey,
                 String propertyName, Node node) {
@@ -14529,6 +14805,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "simple",
+            inline = true,
             types = org.apache.camel.model.language.SimpleExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -14548,6 +14825,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new SimpleExpression();
         }
 
+        @Override
+        protected SimpleExpression newInstance(String value) {
+            return new SimpleExpression(value);
+        }
+
         @Override
         protected boolean setProperty(SimpleExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -14591,6 +14873,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "soap",
+            inline = true,
             types = org.apache.camel.model.dataformat.SoapDataFormat.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -14613,6 +14896,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new SoapDataFormat();
         }
 
+        @Override
+        protected SoapDataFormat newInstance(String value) {
+            return new SoapDataFormat(value);
+        }
+
         @Override
         protected boolean setProperty(SoapDataFormat target, String propertyKey,
                 String propertyName, Node node) {
@@ -14737,6 +15025,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "spel",
+            inline = true,
             types = org.apache.camel.model.language.SpELExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -14755,6 +15044,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new SpELExpression();
         }
 
+        @Override
+        protected SpELExpression newInstance(String value) {
+            return new SpELExpression(value);
+        }
+
         @Override
         protected boolean setProperty(SpELExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -15331,6 +15625,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "swift-mt",
                     "swiftMt"
             },
+            inline = true,
             types = org.apache.camel.model.dataformat.SwiftMtDataFormat.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -15348,6 +15643,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new SwiftMtDataFormat();
         }
 
+        @Override
+        protected SwiftMtDataFormat newInstance(String value) {
+            return new SwiftMtDataFormat(value);
+        }
+
         @Override
         protected boolean setProperty(SwiftMtDataFormat target, String propertyKey,
                 String propertyName, Node node) {
@@ -15778,6 +16078,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "thrift",
+            inline = true,
             types = org.apache.camel.model.dataformat.ThriftDataFormat.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -15797,6 +16098,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new ThriftDataFormat();
         }
 
+        @Override
+        protected ThriftDataFormat newInstance(String value) {
+            return new ThriftDataFormat(value);
+        }
+
         @Override
         protected boolean setProperty(ThriftDataFormat target, String propertyKey,
                 String propertyName, Node node) {
@@ -16060,6 +16366,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "to",
+            inline = true,
             types = org.apache.camel.model.ToDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -16082,6 +16389,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new ToDefinition();
         }
 
+        @Override
+        protected ToDefinition newInstance(String value) {
+            return new ToDefinition(value);
+        }
+
         @Override
         protected void setEndpointUri(CamelContext camelContext, Node node, ToDefinition target,
                 Map<String, Object> parameters) {
@@ -16135,6 +16447,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     "to-d",
                     "toD"
             },
+            inline = true,
             types = org.apache.camel.model.ToDynamicDefinition.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -16161,6 +16474,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new ToDynamicDefinition();
         }
 
+        @Override
+        protected ToDynamicDefinition newInstance(String value) {
+            return new ToDynamicDefinition(value);
+        }
+
         @Override
         protected void setEndpointUri(CamelContext camelContext, Node node,
                 ToDynamicDefinition target, Map<String, Object> parameters) {
@@ -16231,6 +16549,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "tokenize",
+            inline = true,
             types = org.apache.camel.model.language.TokenizerExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -16258,6 +16577,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new TokenizerExpression();
         }
 
+        @Override
+        protected TokenizerExpression newInstance(String value) {
+            return new TokenizerExpression(value);
+        }
+
         @Override
         protected boolean setProperty(TokenizerExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -17994,6 +18318,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "xtokenize",
+            inline = true,
             types = org.apache.camel.model.language.XMLTokenizerExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -18015,6 +18340,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new XMLTokenizerExpression();
         }
 
+        @Override
+        protected XMLTokenizerExpression newInstance(String value) {
+            return new XMLTokenizerExpression(value);
+        }
+
         @Override
         protected boolean setProperty(XMLTokenizerExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -18068,6 +18398,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "xpath",
+            inline = true,
             types = org.apache.camel.model.language.XPathExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -18096,6 +18427,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new XPathExpression();
         }
 
+        @Override
+        protected XPathExpression newInstance(String value) {
+            return new XPathExpression(value);
+        }
+
         @Override
         protected boolean setProperty(XPathExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -18184,6 +18520,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "xquery",
+            inline = true,
             types = org.apache.camel.model.language.XQueryExpression.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -18206,6 +18543,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new XQueryExpression();
         }
 
+        @Override
+        protected XQueryExpression newInstance(String value) {
+            return new XQueryExpression(value);
+        }
+
         @Override
         protected boolean setProperty(XQueryExpression target, String propertyKey,
                 String propertyName, Node node) {
@@ -18264,6 +18606,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
 
     @YamlType(
             nodes = "xstream",
+            inline = true,
             types = org.apache.camel.model.dataformat.XStreamDataFormat.class,
             order = org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             properties = {
@@ -18290,6 +18633,11 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
             return new XStreamDataFormat();
         }
 
+        @Override
+        protected XStreamDataFormat newInstance(String value) {
+            return new XStreamDataFormat(value);
+        }
+
         @Override
         protected boolean setProperty(XStreamDataFormat target, String propertyKey,
                 String propertyName, Node node) {
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
index 981415da237..beb1a4929cc 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camel-yaml-dsl.json
@@ -496,34 +496,38 @@
         "required" : [ "aggregation-strategy" ]
       },
       "org.apache.camel.model.BeanDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "bean-type" : {
-            "type" : "string"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "method" : {
-            "type" : "string"
-          },
-          "ref" : {
-            "type" : "string"
-          },
-          "scope" : {
-            "type" : "string",
-            "enum" : [ "Singleton", "Request", "Prototype" ]
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "bean-type" : {
+              "type" : "string"
+            },
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "method" : {
+              "type" : "string"
+            },
+            "ref" : {
+              "type" : "string"
+            },
+            "scope" : {
+              "type" : "string",
+              "enum" : [ "Singleton", "Request", "Prototype" ]
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.CatchDefinition" : {
         "type" : "object",
@@ -682,30 +686,34 @@
         }
       },
       "org.apache.camel.model.ConvertBodyDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "charset" : {
-            "type" : "string"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "mandatory" : {
-            "type" : "boolean"
-          },
-          "type" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "charset" : {
+              "type" : "string"
+            },
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "mandatory" : {
+              "type" : "boolean"
+            },
+            "type" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "type" ]
       },
       "org.apache.camel.model.DataFormatDefinition" : {
@@ -749,15 +757,19 @@
         }
       },
       "org.apache.camel.model.DescriptionDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "lang" : {
-            "type" : "string"
-          },
-          "text" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "lang" : {
+              "type" : "string"
+            },
+            "text" : {
+              "type" : "string"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.DynamicRouterDefinition" : {
         "type" : "object",
@@ -1133,51 +1145,59 @@
         "required" : [ "idempotent-repository" ]
       },
       "org.apache.camel.model.InOnlyDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "parameters" : {
-            "type" : "object"
-          },
-          "uri" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "parameters" : {
+              "type" : "object"
+            },
+            "uri" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "uri" ]
       },
       "org.apache.camel.model.InOutDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "parameters" : {
-            "type" : "object"
-          },
-          "uri" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "parameters" : {
+              "type" : "object"
+            },
+            "uri" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "uri" ]
       },
       "org.apache.camel.model.InputTypeDefinition" : {
@@ -1222,85 +1242,93 @@
         }
       },
       "org.apache.camel.model.InterceptFromDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "steps" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
-            }
-          },
-          "uri" : {
-            "type" : "string"
-          }
-        }
-      },
-      "org.apache.camel.model.InterceptSendToEndpointDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "after-uri" : {
-            "type" : "string"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "skip-send-to-original-endpoint" : {
-            "type" : "string"
-          },
-          "steps" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
-            }
-          },
-          "uri" : {
-            "type" : "string"
-          }
-        },
-        "required" : [ "uri" ]
-      },
-      "org.apache.camel.model.KameletDefinition" : {
         "oneOf" : [ {
           "type" : "string"
         }, {
           "type" : "object",
           "properties" : {
-            "inherit-error-handler" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
               "type" : "boolean"
             },
-            "name" : {
+            "id" : {
               "type" : "string"
             },
-            "parameters" : {
-              "type" : "object"
+            "inherit-error-handler" : {
+              "type" : "boolean"
             },
             "steps" : {
               "type" : "array",
               "items" : {
                 "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
               }
-            }
+            },
+            "uri" : {
+              "type" : "string"
+            }
+          }
+        } ]
+      },
+      "org.apache.camel.model.InterceptSendToEndpointDefinition" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "after-uri" : {
+              "type" : "string"
+            },
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "skip-send-to-original-endpoint" : {
+              "type" : "string"
+            },
+            "steps" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
+              }
+            },
+            "uri" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "required" : [ "uri" ]
+      },
+      "org.apache.camel.model.KameletDefinition" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "name" : {
+              "type" : "string"
+            },
+            "parameters" : {
+              "type" : "object"
+            },
+            "steps" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
+              }
+            }
           }
         } ],
         "required" : [ "name" ]
@@ -1350,37 +1378,41 @@
         }
       },
       "org.apache.camel.model.LogDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "log-name" : {
-            "type" : "string"
-          },
-          "logger" : {
-            "type" : "string"
-          },
-          "logging-level" : {
-            "type" : "string",
-            "enum" : [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ]
-          },
-          "marker" : {
-            "type" : "string"
-          },
-          "message" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "log-name" : {
+              "type" : "string"
+            },
+            "logger" : {
+              "type" : "string"
+            },
+            "logging-level" : {
+              "type" : "string",
+              "enum" : [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ]
+            },
+            "marker" : {
+              "type" : "string"
+            },
+            "message" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "message" ]
       },
       "org.apache.camel.model.LoopDefinition" : {
@@ -2163,37 +2195,128 @@
         }
       },
       "org.apache.camel.model.RemoveHeaderDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "name" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "name" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "name" ]
       },
       "org.apache.camel.model.RemoveHeadersDefinition" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "exclude-pattern" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "pattern" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "required" : [ "pattern" ]
+      },
+      "org.apache.camel.model.RemovePropertiesDefinition" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "exclude-pattern" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "pattern" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "required" : [ "pattern" ]
+      },
+      "org.apache.camel.model.RemovePropertyDefinition" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "name" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "required" : [ "name" ]
+      },
+      "org.apache.camel.model.ResequenceDefinition" : {
         "type" : "object",
+        "anyOf" : [ {
+          "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
+        } ],
         "properties" : {
+          "batch-config" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.config.BatchResequencerConfig"
+          },
           "description" : {
             "type" : "string"
           },
           "disabled" : {
             "type" : "boolean"
           },
-          "exclude-pattern" : {
-            "type" : "string"
+          "expression" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
           },
           "id" : {
             "type" : "string"
@@ -2201,109 +2324,34 @@
           "inherit-error-handler" : {
             "type" : "boolean"
           },
-          "pattern" : {
-            "type" : "string"
+          "steps" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
+            }
+          },
+          "stream-config" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.config.StreamResequencerConfig"
           }
         },
-        "required" : [ "pattern" ]
+        "required" : [ "expression" ]
       },
-      "org.apache.camel.model.RemovePropertiesDefinition" : {
+      "org.apache.camel.model.Resilience4jConfigurationDefinition" : {
         "type" : "object",
         "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
+          "automatic-transition-from-open-to-half-open-enabled" : {
             "type" : "boolean"
           },
-          "exclude-pattern" : {
+          "circuit-breaker" : {
             "type" : "string"
           },
-          "id" : {
+          "config" : {
             "type" : "string"
           },
-          "inherit-error-handler" : {
-            "type" : "boolean"
+          "failure-rate-threshold" : {
+            "type" : "number"
           },
-          "pattern" : {
-            "type" : "string"
-          }
-        },
-        "required" : [ "pattern" ]
-      },
-      "org.apache.camel.model.RemovePropertyDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "name" : {
-            "type" : "string"
-          }
-        },
-        "required" : [ "name" ]
-      },
-      "org.apache.camel.model.ResequenceDefinition" : {
-        "type" : "object",
-        "anyOf" : [ {
-          "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
-        } ],
-        "properties" : {
-          "batch-config" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.config.BatchResequencerConfig"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "expression" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "steps" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
-            }
-          },
-          "stream-config" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.config.StreamResequencerConfig"
-          }
-        },
-        "required" : [ "expression" ]
-      },
-      "org.apache.camel.model.Resilience4jConfigurationDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "automatic-transition-from-open-to-half-open-enabled" : {
-            "type" : "boolean"
-          },
-          "circuit-breaker" : {
-            "type" : "string"
-          },
-          "config" : {
-            "type" : "string"
-          },
-          "failure-rate-threshold" : {
-            "type" : "number"
-          },
-          "id" : {
+          "id" : {
             "type" : "string"
           },
           "minimum-number-of-calls" : {
@@ -2337,12 +2385,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.ResumableDefinition" : {
@@ -2370,50 +2422,62 @@
         "required" : [ "resume-strategy" ]
       },
       "org.apache.camel.model.RollbackDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "mark-rollback-only" : {
-            "type" : "boolean"
-          },
-          "mark-rollback-only-last" : {
-            "type" : "boolean"
-          },
-          "message" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "mark-rollback-only" : {
+              "type" : "boolean"
+            },
+            "mark-rollback-only-last" : {
+              "type" : "boolean"
+            },
+            "message" : {
+              "type" : "string"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.RouteBuilderDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "id" : {
-            "type" : "string"
-          },
-          "ref" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "id" : {
+              "type" : "string"
+            },
+            "ref" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "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" : {
@@ -2465,12 +2529,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" : {
@@ -2591,73 +2659,81 @@
         "required" : [ "name" ]
       },
       "org.apache.camel.model.RoutingSlipDefinition" : {
-        "type" : "object",
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "cache-size" : {
+              "type" : "number"
+            },
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "expression" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "ignore-invalid-endpoints" : {
+              "type" : "boolean"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "uri-delimiter" : {
+              "type" : "string"
+            }
+          }
+        } ],
         "anyOf" : [ {
           "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
+        } ]
+      },
+      "org.apache.camel.model.SagaActionUriDefinition" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "parameters" : {
+              "type" : "object"
+            },
+            "uri" : {
+              "type" : "string"
+            }
+          }
         } ],
+        "required" : [ "uri" ]
+      },
+      "org.apache.camel.model.SagaDefinition" : {
+        "type" : "object",
         "properties" : {
-          "cache-size" : {
-            "type" : "number"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "expression" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "ignore-invalid-endpoints" : {
-            "type" : "boolean"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "uri-delimiter" : {
-            "type" : "string"
-          }
-        }
-      },
-      "org.apache.camel.model.SagaActionUriDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "parameters" : {
-            "type" : "object"
-          },
-          "uri" : {
-            "type" : "string"
-          }
-        },
-        "required" : [ "uri" ]
-      },
-      "org.apache.camel.model.SagaDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "compensation" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.SagaActionUriDefinition"
-          },
-          "completion" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.SagaActionUriDefinition"
-          },
-          "completion-mode" : {
-            "type" : "string",
-            "enum" : [ "AUTO", "MANUAL" ]
+          "compensation" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.SagaActionUriDefinition"
+          },
+          "completion" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.SagaActionUriDefinition"
+          },
+          "completion-mode" : {
+            "type" : "string",
+            "enum" : [ "AUTO", "MANUAL" ]
           },
           "description" : {
             "type" : "string"
@@ -2696,27 +2772,31 @@
         }
       },
       "org.apache.camel.model.SamplingDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "message-frequency" : {
-            "type" : "number"
-          },
-          "sample-period" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "message-frequency" : {
+              "type" : "number"
+            },
+            "sample-period" : {
+              "type" : "string"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.ScriptDefinition" : {
         "type" : "object",
@@ -2765,25 +2845,29 @@
         }
       },
       "org.apache.camel.model.SetExchangePatternDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "pattern" : {
-            "type" : "string",
-            "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "pattern" : {
+              "type" : "string",
+              "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
+            }
           }
-        },
+        } ],
         "required" : [ "pattern" ]
       },
       "org.apache.camel.model.SetHeaderDefinition" : {
@@ -3188,71 +3272,79 @@
         }
       },
       "org.apache.camel.model.ToDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "parameters" : {
-            "type" : "object"
-          },
-          "pattern" : {
-            "type" : "string",
-            "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
-          },
-          "uri" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "parameters" : {
+              "type" : "object"
+            },
+            "pattern" : {
+              "type" : "string",
+              "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
+            },
+            "uri" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "uri" ]
       },
       "org.apache.camel.model.ToDynamicDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "allow-optimised-components" : {
-            "type" : "boolean"
-          },
-          "auto-start-components" : {
-            "type" : "boolean"
-          },
-          "cache-size" : {
-            "type" : "number"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "ignore-invalid-endpoint" : {
-            "type" : "boolean"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "parameters" : {
-            "type" : "object"
-          },
-          "pattern" : {
-            "type" : "string",
-            "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
-          },
-          "uri" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "allow-optimised-components" : {
+              "type" : "boolean"
+            },
+            "auto-start-components" : {
+              "type" : "boolean"
+            },
+            "cache-size" : {
+              "type" : "number"
+            },
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "ignore-invalid-endpoint" : {
+              "type" : "boolean"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "parameters" : {
+              "type" : "object"
+            },
+            "pattern" : {
+              "type" : "string",
+              "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
+            },
+            "uri" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "uri" ]
       },
       "org.apache.camel.model.TransactedDefinition" : {
@@ -3994,94 +4086,98 @@
         }
       },
       "org.apache.camel.model.cloud.ServiceCallDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "blacklist-service-filter" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.BlacklistServiceCallServiceFilterConfiguration"
-          },
-          "caching-service-discovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CachingServiceCallServiceDiscoveryConfiguration"
-          },
-          "combined-service-discovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CombinedServiceCallServiceDiscoveryConfiguration"
-          },
-          "combined-service-filter" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CombinedServiceCallServiceFilterConfiguration"
-          },
-          "component" : {
-            "type" : "string"
-          },
-          "configuration-ref" : {
-            "type" : "string"
-          },
-          "consul-service-discovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.ConsulServiceCallServiceDiscoveryConfiguration"
-          },
-          "custom-service-filter" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CustomServiceCallServiceFilterConfiguration"
-          },
-          "default-load-balancer" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.DefaultServiceCallServiceLoadBalancerConfiguration"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "dns-service-discovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.DnsServiceCallServiceDiscoveryConfiguration"
-          },
-          "expression" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.ServiceCallExpressionConfiguration"
-          },
-          "expression-ref" : {
-            "type" : "string"
-          },
-          "healthy-service-filter" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.HealthyServiceCallServiceFilterConfiguration"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "kubernetes-service-discovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.KubernetesServiceCallServiceDiscoveryConfiguration"
-          },
-          "load-balancer-ref" : {
-            "type" : "string"
-          },
-          "name" : {
-            "type" : "string"
-          },
-          "pass-through-service-filter" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.PassThroughServiceCallServiceFilterConfiguration"
-          },
-          "pattern" : {
-            "type" : "string",
-            "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
-          },
-          "service-chooser-ref" : {
-            "type" : "string"
-          },
-          "service-discovery-ref" : {
-            "type" : "string"
-          },
-          "service-filter-ref" : {
-            "type" : "string"
-          },
-          "static-service-discovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.StaticServiceCallServiceDiscoveryConfiguration"
-          },
-          "uri" : {
-            "type" : "string"
-          },
-          "zookeeper-service-discovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.ZooKeeperServiceCallServiceDiscoveryConfiguration"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "blacklist-service-filter" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.BlacklistServiceCallServiceFilterConfiguration"
+            },
+            "caching-service-discovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CachingServiceCallServiceDiscoveryConfiguration"
+            },
+            "combined-service-discovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CombinedServiceCallServiceDiscoveryConfiguration"
+            },
+            "combined-service-filter" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CombinedServiceCallServiceFilterConfiguration"
+            },
+            "component" : {
+              "type" : "string"
+            },
+            "configuration-ref" : {
+              "type" : "string"
+            },
+            "consul-service-discovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.ConsulServiceCallServiceDiscoveryConfiguration"
+            },
+            "custom-service-filter" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CustomServiceCallServiceFilterConfiguration"
+            },
+            "default-load-balancer" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.DefaultServiceCallServiceLoadBalancerConfiguration"
+            },
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "dns-service-discovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.DnsServiceCallServiceDiscoveryConfiguration"
+            },
+            "expression" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.ServiceCallExpressionConfiguration"
+            },
+            "expression-ref" : {
+              "type" : "string"
+            },
+            "healthy-service-filter" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.HealthyServiceCallServiceFilterConfiguration"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "kubernetes-service-discovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.KubernetesServiceCallServiceDiscoveryConfiguration"
+            },
+            "load-balancer-ref" : {
+              "type" : "string"
+            },
+            "name" : {
+              "type" : "string"
+            },
+            "pass-through-service-filter" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.PassThroughServiceCallServiceFilterConfiguration"
+            },
+            "pattern" : {
+              "type" : "string",
+              "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
+            },
+            "service-chooser-ref" : {
+              "type" : "string"
+            },
+            "service-discovery-ref" : {
+              "type" : "string"
+            },
+            "service-filter-ref" : {
+              "type" : "string"
+            },
+            "static-service-discovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.StaticServiceCallServiceDiscoveryConfiguration"
+            },
+            "uri" : {
+              "type" : "string"
+            },
+            "zookeeper-service-discovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.ZooKeeperServiceCallServiceDiscoveryConfiguration"
+            }
           }
-        },
+        } ],
         "required" : [ "name" ]
       },
       "org.apache.camel.model.cloud.ServiceCallExpressionConfiguration" : {
@@ -4266,165 +4362,177 @@
         }
       },
       "org.apache.camel.model.dataformat.ASN1DataFormat" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "id" : {
+              "type" : "string"
+            },
+            "unmarshal-type" : {
+              "type" : "string"
+            },
+            "using-iterator" : {
+              "type" : "boolean"
+            }
+          }
+        } ]
+      },
+      "org.apache.camel.model.dataformat.Any23DataFormat" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "base-uri" : {
+              "type" : "string"
+            },
+            "configuration" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "extractors" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "output-format" : {
+              "type" : "string",
+              "enum" : [ "NTRIPLES", "TURTLE", "NQUADS", "RDFXML", "JSONLD", "RDFJSON", "RDF4JMODEL" ]
+            }
+          }
+        } ]
+      },
+      "org.apache.camel.model.dataformat.AvroDataFormat" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "allow-jms-type" : {
+              "type" : "boolean"
+            },
+            "allow-unmarshall-type" : {
+              "type" : "boolean"
+            },
+            "auto-discover-object-mapper" : {
+              "type" : "boolean"
+            },
+            "auto-discover-schema-resolver" : {
+              "type" : "boolean"
+            },
+            "collection-type" : {
+              "type" : "string"
+            },
+            "content-type-header" : {
+              "type" : "boolean"
+            },
+            "disable-features" : {
+              "type" : "string"
+            },
+            "enable-features" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "include" : {
+              "type" : "string"
+            },
+            "instance-class-name" : {
+              "type" : "string"
+            },
+            "json-view" : {
+              "type" : "string"
+            },
+            "library" : {
+              "type" : "string",
+              "enum" : [ "ApacheAvro", "Jackson" ]
+            },
+            "module-class-names" : {
+              "type" : "string"
+            },
+            "module-refs" : {
+              "type" : "string"
+            },
+            "object-mapper" : {
+              "type" : "string"
+            },
+            "schema-resolver" : {
+              "type" : "string"
+            },
+            "timezone" : {
+              "type" : "string"
+            },
+            "unmarshal-type" : {
+              "type" : "string"
+            },
+            "use-default-object-mapper" : {
+              "type" : "boolean"
+            },
+            "use-list" : {
+              "type" : "boolean"
+            }
+          }
+        } ]
+      },
+      "org.apache.camel.model.dataformat.BarcodeDataFormat" : {
         "type" : "object",
         "properties" : {
+          "barcode-format" : {
+            "type" : "string"
+          },
+          "height" : {
+            "type" : "number"
+          },
           "id" : {
             "type" : "string"
           },
-          "unmarshal-type" : {
+          "image-type" : {
             "type" : "string"
           },
-          "using-iterator" : {
-            "type" : "boolean"
+          "width" : {
+            "type" : "number"
           }
         }
       },
-      "org.apache.camel.model.dataformat.Any23DataFormat" : {
+      "org.apache.camel.model.dataformat.Base64DataFormat" : {
         "type" : "object",
         "properties" : {
-          "base-uri" : {
+          "id" : {
             "type" : "string"
           },
-          "configuration" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
-            }
-          },
-          "extractors" : {
-            "type" : "array",
-            "items" : {
-              "type" : "string"
-            }
+          "line-length" : {
+            "type" : "number"
           },
-          "id" : {
+          "line-separator" : {
             "type" : "string"
           },
-          "output-format" : {
-            "type" : "string",
-            "enum" : [ "NTRIPLES", "TURTLE", "NQUADS", "RDFXML", "JSONLD", "RDFJSON", "RDF4JMODEL" ]
+          "url-safe" : {
+            "type" : "boolean"
           }
         }
       },
-      "org.apache.camel.model.dataformat.AvroDataFormat" : {
+      "org.apache.camel.model.dataformat.BindyDataFormat" : {
         "type" : "object",
         "properties" : {
-          "allow-jms-type" : {
-            "type" : "boolean"
-          },
-          "allow-unmarshall-type" : {
-            "type" : "boolean"
-          },
-          "auto-discover-object-mapper" : {
-            "type" : "boolean"
-          },
-          "auto-discover-schema-resolver" : {
-            "type" : "boolean"
-          },
-          "collection-type" : {
-            "type" : "string"
-          },
-          "content-type-header" : {
+          "allow-empty-stream" : {
             "type" : "boolean"
           },
-          "disable-features" : {
-            "type" : "string"
-          },
-          "enable-features" : {
+          "class-type" : {
             "type" : "string"
           },
           "id" : {
             "type" : "string"
           },
-          "include" : {
-            "type" : "string"
-          },
-          "instance-class-name" : {
-            "type" : "string"
-          },
-          "json-view" : {
-            "type" : "string"
-          },
-          "library" : {
-            "type" : "string",
-            "enum" : [ "ApacheAvro", "Jackson" ]
-          },
-          "module-class-names" : {
-            "type" : "string"
-          },
-          "module-refs" : {
-            "type" : "string"
-          },
-          "object-mapper" : {
-            "type" : "string"
-          },
-          "schema-resolver" : {
-            "type" : "string"
-          },
-          "timezone" : {
-            "type" : "string"
-          },
-          "unmarshal-type" : {
-            "type" : "string"
-          },
-          "use-default-object-mapper" : {
-            "type" : "boolean"
-          },
-          "use-list" : {
-            "type" : "boolean"
-          }
-        }
-      },
-      "org.apache.camel.model.dataformat.BarcodeDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "barcode-format" : {
-            "type" : "string"
-          },
-          "height" : {
-            "type" : "number"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "image-type" : {
-            "type" : "string"
-          },
-          "width" : {
-            "type" : "number"
-          }
-        }
-      },
-      "org.apache.camel.model.dataformat.Base64DataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "id" : {
-            "type" : "string"
-          },
-          "line-length" : {
-            "type" : "number"
-          },
-          "line-separator" : {
-            "type" : "string"
-          },
-          "url-safe" : {
-            "type" : "boolean"
-          }
-        }
-      },
-      "org.apache.camel.model.dataformat.BindyDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "allow-empty-stream" : {
-            "type" : "boolean"
-          },
-          "class-type" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "locale" : {
+          "locale" : {
             "type" : "string"
           },
           "type" : {
@@ -4511,115 +4619,123 @@
         }
       },
       "org.apache.camel.model.dataformat.CsvDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "allow-missing-column-names" : {
-            "type" : "boolean"
-          },
-          "capture-header-record" : {
-            "type" : "boolean"
-          },
-          "comment-marker" : {
-            "type" : "string"
-          },
-          "comment-marker-disabled" : {
-            "type" : "boolean"
-          },
-          "delimiter" : {
-            "type" : "string"
-          },
-          "escape" : {
-            "type" : "string"
-          },
-          "escape-disabled" : {
-            "type" : "boolean"
-          },
-          "format-name" : {
-            "type" : "string",
-            "enum" : [ "DEFAULT", "EXCEL", "INFORMIX_UNLOAD", "INFORMIX_UNLOAD_CSV", "MYSQL", "RFC4180" ]
-          },
-          "format-ref" : {
-            "type" : "string"
-          },
-          "header" : {
-            "type" : "array",
-            "items" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "allow-missing-column-names" : {
+              "type" : "boolean"
+            },
+            "capture-header-record" : {
+              "type" : "boolean"
+            },
+            "comment-marker" : {
+              "type" : "string"
+            },
+            "comment-marker-disabled" : {
+              "type" : "boolean"
+            },
+            "delimiter" : {
+              "type" : "string"
+            },
+            "escape" : {
+              "type" : "string"
+            },
+            "escape-disabled" : {
+              "type" : "boolean"
+            },
+            "format-name" : {
+              "type" : "string",
+              "enum" : [ "DEFAULT", "EXCEL", "INFORMIX_UNLOAD", "INFORMIX_UNLOAD_CSV", "MYSQL", "RFC4180" ]
+            },
+            "format-ref" : {
+              "type" : "string"
+            },
+            "header" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            },
+            "header-disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "ignore-empty-lines" : {
+              "type" : "boolean"
+            },
+            "ignore-header-case" : {
+              "type" : "boolean"
+            },
+            "ignore-surrounding-spaces" : {
+              "type" : "boolean"
+            },
+            "lazy-load" : {
+              "type" : "boolean"
+            },
+            "marshaller-factory-ref" : {
+              "type" : "string"
+            },
+            "null-string" : {
+              "type" : "string"
+            },
+            "null-string-disabled" : {
+              "type" : "boolean"
+            },
+            "quote" : {
+              "type" : "string"
+            },
+            "quote-disabled" : {
+              "type" : "boolean"
+            },
+            "quote-mode" : {
+              "type" : "string",
+              "enum" : [ "ALL", "ALL_NON_NULL", "MINIMAL", "NON_NUMERIC", "NONE" ]
+            },
+            "record-converter-ref" : {
               "type" : "string"
+            },
+            "record-separator" : {
+              "type" : "string"
+            },
+            "record-separator-disabled" : {
+              "type" : "string"
+            },
+            "skip-header-record" : {
+              "type" : "boolean"
+            },
+            "trailing-delimiter" : {
+              "type" : "boolean"
+            },
+            "trim" : {
+              "type" : "boolean"
+            },
+            "use-maps" : {
+              "type" : "boolean"
+            },
+            "use-ordered-maps" : {
+              "type" : "boolean"
             }
-          },
-          "header-disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "ignore-empty-lines" : {
-            "type" : "boolean"
-          },
-          "ignore-header-case" : {
-            "type" : "boolean"
-          },
-          "ignore-surrounding-spaces" : {
-            "type" : "boolean"
-          },
-          "lazy-load" : {
-            "type" : "boolean"
-          },
-          "marshaller-factory-ref" : {
-            "type" : "string"
-          },
-          "null-string" : {
-            "type" : "string"
-          },
-          "null-string-disabled" : {
-            "type" : "boolean"
-          },
-          "quote" : {
-            "type" : "string"
-          },
-          "quote-disabled" : {
-            "type" : "boolean"
-          },
-          "quote-mode" : {
-            "type" : "string",
-            "enum" : [ "ALL", "ALL_NON_NULL", "MINIMAL", "NON_NUMERIC", "NONE" ]
-          },
-          "record-converter-ref" : {
-            "type" : "string"
-          },
-          "record-separator" : {
-            "type" : "string"
-          },
-          "record-separator-disabled" : {
-            "type" : "string"
-          },
-          "skip-header-record" : {
-            "type" : "boolean"
-          },
-          "trailing-delimiter" : {
-            "type" : "boolean"
-          },
-          "trim" : {
-            "type" : "boolean"
-          },
-          "use-maps" : {
-            "type" : "boolean"
-          },
-          "use-ordered-maps" : {
-            "type" : "boolean"
           }
-        }
+        } ]
       },
       "org.apache.camel.model.dataformat.CustomDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "id" : {
-            "type" : "string"
-          },
-          "ref" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "id" : {
+              "type" : "string"
+            },
+            "ref" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.dataformat.DataFormatsDefinition" : {
@@ -5244,77 +5360,81 @@
         }
       },
       "org.apache.camel.model.dataformat.ProtobufDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "allow-jms-type" : {
-            "type" : "boolean"
-          },
-          "allow-unmarshall-type" : {
-            "type" : "boolean"
-          },
-          "auto-discover-object-mapper" : {
-            "type" : "boolean"
-          },
-          "auto-discover-schema-resolver" : {
-            "type" : "boolean"
-          },
-          "collection-type" : {
-            "type" : "string"
-          },
-          "content-type-format" : {
-            "type" : "string",
-            "enum" : [ "native", "json" ]
-          },
-          "content-type-header" : {
-            "type" : "boolean"
-          },
-          "disable-features" : {
-            "type" : "string"
-          },
-          "enable-features" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "include" : {
-            "type" : "string"
-          },
-          "instance-class" : {
-            "type" : "string"
-          },
-          "json-view" : {
-            "type" : "string"
-          },
-          "library" : {
-            "type" : "string",
-            "enum" : [ "GoogleProtobuf", "Jackson" ]
-          },
-          "module-class-names" : {
-            "type" : "string"
-          },
-          "module-refs" : {
-            "type" : "string"
-          },
-          "object-mapper" : {
-            "type" : "string"
-          },
-          "schema-resolver" : {
-            "type" : "string"
-          },
-          "timezone" : {
-            "type" : "string"
-          },
-          "unmarshal-type" : {
-            "type" : "string"
-          },
-          "use-default-object-mapper" : {
-            "type" : "boolean"
-          },
-          "use-list" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "allow-jms-type" : {
+              "type" : "boolean"
+            },
+            "allow-unmarshall-type" : {
+              "type" : "boolean"
+            },
+            "auto-discover-object-mapper" : {
+              "type" : "boolean"
+            },
+            "auto-discover-schema-resolver" : {
+              "type" : "boolean"
+            },
+            "collection-type" : {
+              "type" : "string"
+            },
+            "content-type-format" : {
+              "type" : "string",
+              "enum" : [ "native", "json" ]
+            },
+            "content-type-header" : {
+              "type" : "boolean"
+            },
+            "disable-features" : {
+              "type" : "string"
+            },
+            "enable-features" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "include" : {
+              "type" : "string"
+            },
+            "instance-class" : {
+              "type" : "string"
+            },
+            "json-view" : {
+              "type" : "string"
+            },
+            "library" : {
+              "type" : "string",
+              "enum" : [ "GoogleProtobuf", "Jackson" ]
+            },
+            "module-class-names" : {
+              "type" : "string"
+            },
+            "module-refs" : {
+              "type" : "string"
+            },
+            "object-mapper" : {
+              "type" : "string"
+            },
+            "schema-resolver" : {
+              "type" : "string"
+            },
+            "timezone" : {
+              "type" : "string"
+            },
+            "unmarshal-type" : {
+              "type" : "string"
+            },
+            "use-default-object-mapper" : {
+              "type" : "boolean"
+            },
+            "use-list" : {
+              "type" : "boolean"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.dataformat.RssDataFormat" : {
         "type" : "object",
@@ -5325,43 +5445,51 @@
         }
       },
       "org.apache.camel.model.dataformat.SoapDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "context-path" : {
-            "type" : "string"
-          },
-          "element-name-strategy-ref" : {
-            "type" : "string"
-          },
-          "encoding" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "namespace-prefix-ref" : {
-            "type" : "string"
-          },
-          "schema" : {
-            "type" : "string"
-          },
-          "version" : {
-            "type" : "string",
-            "enum" : [ "1.1", "1.2" ]
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "context-path" : {
+              "type" : "string"
+            },
+            "element-name-strategy-ref" : {
+              "type" : "string"
+            },
+            "encoding" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "namespace-prefix-ref" : {
+              "type" : "string"
+            },
+            "schema" : {
+              "type" : "string"
+            },
+            "version" : {
+              "type" : "string",
+              "enum" : [ "1.1", "1.2" ]
+            }
           }
-        },
+        } ],
         "required" : [ "context-path" ]
       },
       "org.apache.camel.model.dataformat.SwiftMtDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "id" : {
-            "type" : "string"
-          },
-          "write-in-json" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "id" : {
+              "type" : "string"
+            },
+            "write-in-json" : {
+              "type" : "boolean"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.dataformat.SwiftMxDataFormat" : {
         "type" : "object",
@@ -5412,22 +5540,26 @@
         }
       },
       "org.apache.camel.model.dataformat.ThriftDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "content-type-format" : {
-            "type" : "string",
-            "enum" : [ "binary", "json", "sjson" ]
-          },
-          "content-type-header" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "instance-class" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "content-type-format" : {
+              "type" : "string",
+              "enum" : [ "binary", "json", "sjson" ]
+            },
+            "content-type-header" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "instance-class" : {
+              "type" : "string"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.dataformat.TidyMarkupDataFormat" : {
         "type" : "object",
@@ -5687,94 +5819,98 @@
         }
       },
       "org.apache.camel.model.dataformat.XStreamDataFormat" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "aliases" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "content-type-header" : {
+              "type" : "boolean"
+            },
+            "converters" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "driver" : {
+              "type" : "string"
+            },
+            "driver-ref" : {
+              "type" : "string"
+            },
+            "encoding" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "implicit-collections" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "mode" : {
+              "type" : "string",
+              "enum" : [ "NO_REFERENCES", "ID_REFERENCES", "XPATH_RELATIVE_REFERENCES", "XPATH_ABSOLUTE_REFERENCES", "SINGLE_NODE_XPATH_RELATIVE_REFERENCES", "SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES" ]
+            },
+            "omit-fields" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "permissions" : {
+              "type" : "string"
+            }
+          }
+        } ]
+      },
+      "org.apache.camel.model.dataformat.YAMLDataFormat" : {
         "type" : "object",
         "properties" : {
-          "aliases" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
-            }
+          "allow-any-type" : {
+            "type" : "boolean"
           },
-          "content-type-header" : {
+          "allow-recursive-keys" : {
             "type" : "boolean"
           },
-          "converters" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
-            }
+          "constructor" : {
+            "type" : "string"
           },
-          "driver" : {
+          "dumper-options" : {
             "type" : "string"
           },
-          "driver-ref" : {
+          "id" : {
             "type" : "string"
           },
-          "encoding" : {
+          "library" : {
+            "type" : "string",
+            "enum" : [ "SnakeYAML" ]
+          },
+          "max-aliases-for-collections" : {
+            "type" : "number"
+          },
+          "pretty-flow" : {
+            "type" : "boolean"
+          },
+          "representer" : {
             "type" : "string"
           },
-          "id" : {
+          "resolver" : {
             "type" : "string"
           },
-          "implicit-collections" : {
+          "type-filter" : {
             "type" : "array",
             "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
-            }
-          },
-          "mode" : {
-            "type" : "string",
-            "enum" : [ "NO_REFERENCES", "ID_REFERENCES", "XPATH_RELATIVE_REFERENCES", "XPATH_ABSOLUTE_REFERENCES", "SINGLE_NODE_XPATH_RELATIVE_REFERENCES", "SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES" ]
-          },
-          "omit-fields" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
-            }
-          },
-          "permissions" : {
-            "type" : "string"
-          }
-        }
-      },
-      "org.apache.camel.model.dataformat.YAMLDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "allow-any-type" : {
-            "type" : "boolean"
-          },
-          "allow-recursive-keys" : {
-            "type" : "boolean"
-          },
-          "constructor" : {
-            "type" : "string"
-          },
-          "dumper-options" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "library" : {
-            "type" : "string",
-            "enum" : [ "SnakeYAML" ]
-          },
-          "max-aliases-for-collections" : {
-            "type" : "number"
-          },
-          "pretty-flow" : {
-            "type" : "boolean"
-          },
-          "representer" : {
-            "type" : "string"
-          },
-          "resolver" : {
-            "type" : "string"
-          },
-          "type-filter" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLTypeFilterDefinition"
+              "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLTypeFilterDefinition"
             }
           },
           "unmarshal-type" : {
@@ -6050,78 +6186,94 @@
         }
       },
       "org.apache.camel.model.language.CSimpleExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "result-type" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "result-type" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.ConstantExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "result-type" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "result-type" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.DatasonnetExpression" : {
-        "type" : "object",
-        "properties" : {
-          "body-media-type" : {
-            "type" : "string"
-          },
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "output-media-type" : {
-            "type" : "string"
-          },
-          "result-type" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "body-media-type" : {
+              "type" : "string"
+            },
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "output-media-type" : {
+              "type" : "string"
+            },
+            "result-type" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.ExchangePropertyExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.ExpressionDefinition" : {
@@ -6202,154 +6354,182 @@
         }
       },
       "org.apache.camel.model.language.GroovyExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.HeaderExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.Hl7TerserExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.JavaScriptExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "header-name" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "result-type" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
-          }
-        },
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "header-name" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "result-type" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
+          }
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.JoorExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "pre-compile" : {
-            "type" : "boolean"
-          },
-          "result-type" : {
-            "type" : "string"
-          },
-          "single-quotes" : {
-            "type" : "boolean"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "pre-compile" : {
+              "type" : "boolean"
+            },
+            "result-type" : {
+              "type" : "string"
+            },
+            "single-quotes" : {
+              "type" : "boolean"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.JqExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "header-name" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "result-type" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "header-name" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "result-type" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.JsonPathExpression" : {
-        "type" : "object",
-        "properties" : {
-          "allow-easy-predicate" : {
-            "type" : "boolean"
-          },
-          "allow-simple" : {
-            "type" : "boolean"
-          },
-          "expression" : {
-            "type" : "string"
-          },
-          "header-name" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "option" : {
-            "type" : "string",
-            "enum" : [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ]
-          },
-          "result-type" : {
-            "type" : "string"
-          },
-          "suppress-exceptions" : {
-            "type" : "boolean"
-          },
-          "trim" : {
-            "type" : "boolean"
-          },
-          "unpack-array" : {
-            "type" : "boolean"
-          },
-          "write-as-string" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "allow-easy-predicate" : {
+              "type" : "boolean"
+            },
+            "allow-simple" : {
+              "type" : "boolean"
+            },
+            "expression" : {
+              "type" : "string"
+            },
+            "header-name" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "option" : {
+              "type" : "string",
+              "enum" : [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ]
+            },
+            "result-type" : {
+              "type" : "string"
+            },
+            "suppress-exceptions" : {
+              "type" : "boolean"
+            },
+            "trim" : {
+              "type" : "boolean"
+            },
+            "unpack-array" : {
+              "type" : "boolean"
+            },
+            "write-as-string" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.LanguageExpression" : {
@@ -6371,286 +6551,334 @@
         "required" : [ "expression", "language" ]
       },
       "org.apache.camel.model.language.MethodCallExpression" : {
-        "type" : "object",
-        "properties" : {
-          "bean-type" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "method" : {
-            "type" : "string"
-          },
-          "ref" : {
-            "type" : "string"
-          },
-          "scope" : {
-            "type" : "string",
-            "enum" : [ "Singleton", "Request", "Prototype" ]
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "bean-type" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "method" : {
+              "type" : "string"
+            },
+            "ref" : {
+              "type" : "string"
+            },
+            "scope" : {
+              "type" : "string",
+              "enum" : [ "Singleton", "Request", "Prototype" ]
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.language.MvelExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.OgnlExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.PythonExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "header-name" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "result-type" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
-          }
-        },
-        "required" : [ "expression" ]
-      },
-      "org.apache.camel.model.language.RefExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "header-name" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "result-type" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
+        "required" : [ "expression" ]
+      },
+      "org.apache.camel.model.language.RefExpression" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
+          }
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.SimpleExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "result-type" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "result-type" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.SpELExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.TokenizerExpression" : {
-        "type" : "object",
-        "properties" : {
-          "end-token" : {
-            "type" : "string"
-          },
-          "group" : {
-            "type" : "string"
-          },
-          "group-delimiter" : {
-            "type" : "string"
-          },
-          "header-name" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "include-tokens" : {
-            "type" : "boolean"
-          },
-          "inherit-namespace-tag-name" : {
-            "type" : "string"
-          },
-          "regex" : {
-            "type" : "boolean"
-          },
-          "skip-first" : {
-            "type" : "boolean"
-          },
-          "token" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
-          },
-          "xml" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "end-token" : {
+              "type" : "string"
+            },
+            "group" : {
+              "type" : "string"
+            },
+            "group-delimiter" : {
+              "type" : "string"
+            },
+            "header-name" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "include-tokens" : {
+              "type" : "boolean"
+            },
+            "inherit-namespace-tag-name" : {
+              "type" : "string"
+            },
+            "regex" : {
+              "type" : "boolean"
+            },
+            "skip-first" : {
+              "type" : "boolean"
+            },
+            "token" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            },
+            "xml" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "token" ]
       },
       "org.apache.camel.model.language.XMLTokenizerExpression" : {
-        "type" : "object",
-        "properties" : {
-          "group" : {
-            "type" : "number"
-          },
-          "header-name" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "mode" : {
-            "type" : "string",
-            "enum" : [ "i", "w", "u", "t" ]
-          },
-          "namespace" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "group" : {
+              "type" : "number"
+            },
+            "header-name" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "mode" : {
+              "type" : "string",
+              "enum" : [ "i", "w", "u", "t" ]
+            },
+            "namespace" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "trim" : {
+              "type" : "boolean"
             }
-          },
-          "trim" : {
-            "type" : "boolean"
           }
-        }
+        } ]
       },
       "org.apache.camel.model.language.XPathExpression" : {
-        "type" : "object",
-        "properties" : {
-          "document-type" : {
-            "type" : "string"
-          },
-          "expression" : {
-            "type" : "string"
-          },
-          "factory-ref" : {
-            "type" : "string"
-          },
-          "header-name" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "log-namespaces" : {
-            "type" : "boolean"
-          },
-          "namespace" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "document-type" : {
+              "type" : "string"
+            },
+            "expression" : {
+              "type" : "string"
+            },
+            "factory-ref" : {
+              "type" : "string"
+            },
+            "header-name" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "log-namespaces" : {
+              "type" : "boolean"
+            },
+            "namespace" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "object-model" : {
+              "type" : "string"
+            },
+            "pre-compile" : {
+              "type" : "boolean"
+            },
+            "result-type" : {
+              "type" : "string",
+              "enum" : [ "NUMBER", "STRING", "BOOLEAN", "NODESET", "NODE" ]
+            },
+            "saxon" : {
+              "type" : "boolean"
+            },
+            "thread-safety" : {
+              "type" : "boolean"
+            },
+            "trim" : {
+              "type" : "boolean"
             }
-          },
-          "object-model" : {
-            "type" : "string"
-          },
-          "pre-compile" : {
-            "type" : "boolean"
-          },
-          "result-type" : {
-            "type" : "string",
-            "enum" : [ "NUMBER", "STRING", "BOOLEAN", "NODESET", "NODE" ]
-          },
-          "saxon" : {
-            "type" : "boolean"
-          },
-          "thread-safety" : {
-            "type" : "boolean"
-          },
-          "trim" : {
-            "type" : "boolean"
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.XQueryExpression" : {
-        "type" : "object",
-        "properties" : {
-          "configuration-ref" : {
-            "type" : "string"
-          },
-          "expression" : {
-            "type" : "string"
-          },
-          "header-name" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "namespace" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "configuration-ref" : {
+              "type" : "string"
+            },
+            "expression" : {
+              "type" : "string"
+            },
+            "header-name" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "namespace" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "trim" : {
+              "type" : "boolean"
+            },
+            "type" : {
+              "type" : "string"
             }
-          },
-          "trim" : {
-            "type" : "boolean"
-          },
-          "type" : {
-            "type" : "string"
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.loadbalancer.CustomLoadBalancerDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "id" : {
-            "type" : "string"
-          },
-          "ref" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "id" : {
+              "type" : "string"
+            },
+            "ref" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition" : {
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
index 3e2fa042dbc..464783519a7 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json
@@ -403,34 +403,38 @@
         "required" : [ "aggregationStrategy" ]
       },
       "org.apache.camel.model.BeanDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "beanType" : {
-            "type" : "string"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "method" : {
-            "type" : "string"
-          },
-          "ref" : {
-            "type" : "string"
-          },
-          "scope" : {
-            "type" : "string",
-            "enum" : [ "Singleton", "Request", "Prototype" ]
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "beanType" : {
+              "type" : "string"
+            },
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "method" : {
+              "type" : "string"
+            },
+            "ref" : {
+              "type" : "string"
+            },
+            "scope" : {
+              "type" : "string",
+              "enum" : [ "Singleton", "Request", "Prototype" ]
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.CatchDefinition" : {
         "type" : "object",
@@ -589,30 +593,34 @@
         }
       },
       "org.apache.camel.model.ConvertBodyDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "charset" : {
-            "type" : "string"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "mandatory" : {
-            "type" : "boolean"
-          },
-          "type" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "charset" : {
+              "type" : "string"
+            },
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "mandatory" : {
+              "type" : "boolean"
+            },
+            "type" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "type" ]
       },
       "org.apache.camel.model.DataFormatDefinition" : {
@@ -656,15 +664,19 @@
         }
       },
       "org.apache.camel.model.DescriptionDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "lang" : {
-            "type" : "string"
-          },
-          "text" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "lang" : {
+              "type" : "string"
+            },
+            "text" : {
+              "type" : "string"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.DynamicRouterDefinition" : {
         "type" : "object",
@@ -1037,51 +1049,59 @@
         "required" : [ "idempotentRepository" ]
       },
       "org.apache.camel.model.InOnlyDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "parameters" : {
-            "type" : "object"
-          },
-          "uri" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "parameters" : {
+              "type" : "object"
+            },
+            "uri" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "uri" ]
       },
       "org.apache.camel.model.InOutDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "parameters" : {
-            "type" : "object"
-          },
-          "uri" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "parameters" : {
+              "type" : "object"
+            },
+            "uri" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "uri" ]
       },
       "org.apache.camel.model.InputTypeDefinition" : {
@@ -1126,85 +1146,93 @@
         }
       },
       "org.apache.camel.model.InterceptFromDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "steps" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
-            }
-          },
-          "uri" : {
-            "type" : "string"
-          }
-        }
-      },
-      "org.apache.camel.model.InterceptSendToEndpointDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "afterUri" : {
-            "type" : "string"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "skipSendToOriginalEndpoint" : {
-            "type" : "string"
-          },
-          "steps" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
-            }
-          },
-          "uri" : {
-            "type" : "string"
-          }
-        },
-        "required" : [ "uri" ]
-      },
-      "org.apache.camel.model.KameletDefinition" : {
         "oneOf" : [ {
           "type" : "string"
         }, {
           "type" : "object",
           "properties" : {
-            "inheritErrorHandler" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
               "type" : "boolean"
             },
-            "name" : {
+            "id" : {
               "type" : "string"
             },
-            "parameters" : {
-              "type" : "object"
+            "inheritErrorHandler" : {
+              "type" : "boolean"
             },
             "steps" : {
               "type" : "array",
               "items" : {
                 "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
               }
-            }
+            },
+            "uri" : {
+              "type" : "string"
+            }
+          }
+        } ]
+      },
+      "org.apache.camel.model.InterceptSendToEndpointDefinition" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "afterUri" : {
+              "type" : "string"
+            },
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "skipSendToOriginalEndpoint" : {
+              "type" : "string"
+            },
+            "steps" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
+              }
+            },
+            "uri" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "required" : [ "uri" ]
+      },
+      "org.apache.camel.model.KameletDefinition" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "name" : {
+              "type" : "string"
+            },
+            "parameters" : {
+              "type" : "object"
+            },
+            "steps" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
+              }
+            }
           }
         } ],
         "required" : [ "name" ]
@@ -1254,37 +1282,41 @@
         }
       },
       "org.apache.camel.model.LogDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "logName" : {
-            "type" : "string"
-          },
-          "logger" : {
-            "type" : "string"
-          },
-          "loggingLevel" : {
-            "type" : "string",
-            "enum" : [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ]
-          },
-          "marker" : {
-            "type" : "string"
-          },
-          "message" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "logName" : {
+              "type" : "string"
+            },
+            "logger" : {
+              "type" : "string"
+            },
+            "loggingLevel" : {
+              "type" : "string",
+              "enum" : [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ]
+            },
+            "marker" : {
+              "type" : "string"
+            },
+            "message" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "message" ]
       },
       "org.apache.camel.model.LoopDefinition" : {
@@ -2067,37 +2099,128 @@
         }
       },
       "org.apache.camel.model.RemoveHeaderDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "name" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "name" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "name" ]
       },
       "org.apache.camel.model.RemoveHeadersDefinition" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "excludePattern" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "pattern" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "required" : [ "pattern" ]
+      },
+      "org.apache.camel.model.RemovePropertiesDefinition" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "excludePattern" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "pattern" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "required" : [ "pattern" ]
+      },
+      "org.apache.camel.model.RemovePropertyDefinition" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "name" : {
+              "type" : "string"
+            }
+          }
+        } ],
+        "required" : [ "name" ]
+      },
+      "org.apache.camel.model.ResequenceDefinition" : {
         "type" : "object",
+        "anyOf" : [ {
+          "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
+        } ],
         "properties" : {
+          "batchConfig" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.config.BatchResequencerConfig"
+          },
           "description" : {
             "type" : "string"
           },
           "disabled" : {
             "type" : "boolean"
           },
-          "excludePattern" : {
-            "type" : "string"
+          "expression" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
           },
           "id" : {
             "type" : "string"
@@ -2105,109 +2228,34 @@
           "inheritErrorHandler" : {
             "type" : "boolean"
           },
-          "pattern" : {
-            "type" : "string"
+          "steps" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
+            }
+          },
+          "streamConfig" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.config.StreamResequencerConfig"
           }
         },
-        "required" : [ "pattern" ]
+        "required" : [ "expression" ]
       },
-      "org.apache.camel.model.RemovePropertiesDefinition" : {
+      "org.apache.camel.model.Resilience4jConfigurationDefinition" : {
         "type" : "object",
         "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
+          "automaticTransitionFromOpenToHalfOpenEnabled" : {
             "type" : "boolean"
           },
-          "excludePattern" : {
+          "circuitBreaker" : {
             "type" : "string"
           },
-          "id" : {
+          "config" : {
             "type" : "string"
           },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
+          "failureRateThreshold" : {
+            "type" : "number"
           },
-          "pattern" : {
-            "type" : "string"
-          }
-        },
-        "required" : [ "pattern" ]
-      },
-      "org.apache.camel.model.RemovePropertyDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "name" : {
-            "type" : "string"
-          }
-        },
-        "required" : [ "name" ]
-      },
-      "org.apache.camel.model.ResequenceDefinition" : {
-        "type" : "object",
-        "anyOf" : [ {
-          "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
-        } ],
-        "properties" : {
-          "batchConfig" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.config.BatchResequencerConfig"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "expression" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "steps" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.ProcessorDefinition"
-            }
-          },
-          "streamConfig" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.config.StreamResequencerConfig"
-          }
-        },
-        "required" : [ "expression" ]
-      },
-      "org.apache.camel.model.Resilience4jConfigurationDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "automaticTransitionFromOpenToHalfOpenEnabled" : {
-            "type" : "boolean"
-          },
-          "circuitBreaker" : {
-            "type" : "string"
-          },
-          "config" : {
-            "type" : "string"
-          },
-          "failureRateThreshold" : {
-            "type" : "number"
-          },
-          "id" : {
+          "id" : {
             "type" : "string"
           },
           "minimumNumberOfCalls" : {
@@ -2241,12 +2289,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.ResumableDefinition" : {
@@ -2274,50 +2326,62 @@
         "required" : [ "resumeStrategy" ]
       },
       "org.apache.camel.model.RollbackDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "markRollbackOnly" : {
-            "type" : "boolean"
-          },
-          "markRollbackOnlyLast" : {
-            "type" : "boolean"
-          },
-          "message" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "markRollbackOnly" : {
+              "type" : "boolean"
+            },
+            "markRollbackOnlyLast" : {
+              "type" : "boolean"
+            },
+            "message" : {
+              "type" : "string"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.RouteBuilderDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "id" : {
-            "type" : "string"
-          },
-          "ref" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "id" : {
+              "type" : "string"
+            },
+            "ref" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "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" : {
@@ -2369,12 +2433,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" : {
@@ -2495,73 +2563,81 @@
         "required" : [ "name" ]
       },
       "org.apache.camel.model.RoutingSlipDefinition" : {
-        "type" : "object",
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "cacheSize" : {
+              "type" : "number"
+            },
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "expression" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "ignoreInvalidEndpoints" : {
+              "type" : "boolean"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "uriDelimiter" : {
+              "type" : "string"
+            }
+          }
+        } ],
         "anyOf" : [ {
           "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
+        } ]
+      },
+      "org.apache.camel.model.SagaActionUriDefinition" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "parameters" : {
+              "type" : "object"
+            },
+            "uri" : {
+              "type" : "string"
+            }
+          }
         } ],
+        "required" : [ "uri" ]
+      },
+      "org.apache.camel.model.SagaDefinition" : {
+        "type" : "object",
         "properties" : {
-          "cacheSize" : {
-            "type" : "number"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "expression" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "ignoreInvalidEndpoints" : {
-            "type" : "boolean"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "uriDelimiter" : {
-            "type" : "string"
-          }
-        }
-      },
-      "org.apache.camel.model.SagaActionUriDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "parameters" : {
-            "type" : "object"
-          },
-          "uri" : {
-            "type" : "string"
-          }
-        },
-        "required" : [ "uri" ]
-      },
-      "org.apache.camel.model.SagaDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "compensation" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.SagaActionUriDefinition"
-          },
-          "completion" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.SagaActionUriDefinition"
-          },
-          "completionMode" : {
-            "type" : "string",
-            "enum" : [ "AUTO", "MANUAL" ]
+          "compensation" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.SagaActionUriDefinition"
+          },
+          "completion" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.SagaActionUriDefinition"
+          },
+          "completionMode" : {
+            "type" : "string",
+            "enum" : [ "AUTO", "MANUAL" ]
           },
           "description" : {
             "type" : "string"
@@ -2600,27 +2676,31 @@
         }
       },
       "org.apache.camel.model.SamplingDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "messageFrequency" : {
-            "type" : "number"
-          },
-          "samplePeriod" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "messageFrequency" : {
+              "type" : "number"
+            },
+            "samplePeriod" : {
+              "type" : "string"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.ScriptDefinition" : {
         "type" : "object",
@@ -2669,25 +2749,29 @@
         }
       },
       "org.apache.camel.model.SetExchangePatternDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "pattern" : {
-            "type" : "string",
-            "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "pattern" : {
+              "type" : "string",
+              "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
+            }
           }
-        },
+        } ],
         "required" : [ "pattern" ]
       },
       "org.apache.camel.model.SetHeaderDefinition" : {
@@ -3092,71 +3176,79 @@
         }
       },
       "org.apache.camel.model.ToDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "parameters" : {
-            "type" : "object"
-          },
-          "pattern" : {
-            "type" : "string",
-            "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
-          },
-          "uri" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "parameters" : {
+              "type" : "object"
+            },
+            "pattern" : {
+              "type" : "string",
+              "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
+            },
+            "uri" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "uri" ]
       },
       "org.apache.camel.model.ToDynamicDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "allowOptimisedComponents" : {
-            "type" : "boolean"
-          },
-          "autoStartComponents" : {
-            "type" : "boolean"
-          },
-          "cacheSize" : {
-            "type" : "number"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "ignoreInvalidEndpoint" : {
-            "type" : "boolean"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "parameters" : {
-            "type" : "object"
-          },
-          "pattern" : {
-            "type" : "string",
-            "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
-          },
-          "uri" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "allowOptimisedComponents" : {
+              "type" : "boolean"
+            },
+            "autoStartComponents" : {
+              "type" : "boolean"
+            },
+            "cacheSize" : {
+              "type" : "number"
+            },
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "ignoreInvalidEndpoint" : {
+              "type" : "boolean"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "parameters" : {
+              "type" : "object"
+            },
+            "pattern" : {
+              "type" : "string",
+              "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
+            },
+            "uri" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "uri" ]
       },
       "org.apache.camel.model.TransactedDefinition" : {
@@ -3898,94 +3990,98 @@
         }
       },
       "org.apache.camel.model.cloud.ServiceCallDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "blacklistServiceFilter" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.BlacklistServiceCallServiceFilterConfiguration"
-          },
-          "cachingServiceDiscovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CachingServiceCallServiceDiscoveryConfiguration"
-          },
-          "combinedServiceDiscovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CombinedServiceCallServiceDiscoveryConfiguration"
-          },
-          "combinedServiceFilter" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CombinedServiceCallServiceFilterConfiguration"
-          },
-          "component" : {
-            "type" : "string"
-          },
-          "configurationRef" : {
-            "type" : "string"
-          },
-          "consulServiceDiscovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.ConsulServiceCallServiceDiscoveryConfiguration"
-          },
-          "customServiceFilter" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CustomServiceCallServiceFilterConfiguration"
-          },
-          "defaultLoadBalancer" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.DefaultServiceCallServiceLoadBalancerConfiguration"
-          },
-          "description" : {
-            "type" : "string"
-          },
-          "disabled" : {
-            "type" : "boolean"
-          },
-          "dnsServiceDiscovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.DnsServiceCallServiceDiscoveryConfiguration"
-          },
-          "expression" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.ServiceCallExpressionConfiguration"
-          },
-          "expressionRef" : {
-            "type" : "string"
-          },
-          "healthyServiceFilter" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.HealthyServiceCallServiceFilterConfiguration"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "kubernetesServiceDiscovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.KubernetesServiceCallServiceDiscoveryConfiguration"
-          },
-          "loadBalancerRef" : {
-            "type" : "string"
-          },
-          "name" : {
-            "type" : "string"
-          },
-          "passThroughServiceFilter" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.PassThroughServiceCallServiceFilterConfiguration"
-          },
-          "pattern" : {
-            "type" : "string",
-            "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
-          },
-          "serviceChooserRef" : {
-            "type" : "string"
-          },
-          "serviceDiscoveryRef" : {
-            "type" : "string"
-          },
-          "serviceFilterRef" : {
-            "type" : "string"
-          },
-          "staticServiceDiscovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.StaticServiceCallServiceDiscoveryConfiguration"
-          },
-          "uri" : {
-            "type" : "string"
-          },
-          "zookeeperServiceDiscovery" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.cloud.ZooKeeperServiceCallServiceDiscoveryConfiguration"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "blacklistServiceFilter" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.BlacklistServiceCallServiceFilterConfiguration"
+            },
+            "cachingServiceDiscovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CachingServiceCallServiceDiscoveryConfiguration"
+            },
+            "combinedServiceDiscovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CombinedServiceCallServiceDiscoveryConfiguration"
+            },
+            "combinedServiceFilter" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CombinedServiceCallServiceFilterConfiguration"
+            },
+            "component" : {
+              "type" : "string"
+            },
+            "configurationRef" : {
+              "type" : "string"
+            },
+            "consulServiceDiscovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.ConsulServiceCallServiceDiscoveryConfiguration"
+            },
+            "customServiceFilter" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.CustomServiceCallServiceFilterConfiguration"
+            },
+            "defaultLoadBalancer" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.DefaultServiceCallServiceLoadBalancerConfiguration"
+            },
+            "description" : {
+              "type" : "string"
+            },
+            "disabled" : {
+              "type" : "boolean"
+            },
+            "dnsServiceDiscovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.DnsServiceCallServiceDiscoveryConfiguration"
+            },
+            "expression" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.ServiceCallExpressionConfiguration"
+            },
+            "expressionRef" : {
+              "type" : "string"
+            },
+            "healthyServiceFilter" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.HealthyServiceCallServiceFilterConfiguration"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "kubernetesServiceDiscovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.KubernetesServiceCallServiceDiscoveryConfiguration"
+            },
+            "loadBalancerRef" : {
+              "type" : "string"
+            },
+            "name" : {
+              "type" : "string"
+            },
+            "passThroughServiceFilter" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.PassThroughServiceCallServiceFilterConfiguration"
+            },
+            "pattern" : {
+              "type" : "string",
+              "enum" : [ "InOnly", "InOut", "InOptionalOut" ]
+            },
+            "serviceChooserRef" : {
+              "type" : "string"
+            },
+            "serviceDiscoveryRef" : {
+              "type" : "string"
+            },
+            "serviceFilterRef" : {
+              "type" : "string"
+            },
+            "staticServiceDiscovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.StaticServiceCallServiceDiscoveryConfiguration"
+            },
+            "uri" : {
+              "type" : "string"
+            },
+            "zookeeperServiceDiscovery" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.cloud.ZooKeeperServiceCallServiceDiscoveryConfiguration"
+            }
           }
-        },
+        } ],
         "required" : [ "name" ]
       },
       "org.apache.camel.model.cloud.ServiceCallExpressionConfiguration" : {
@@ -4170,165 +4266,177 @@
         }
       },
       "org.apache.camel.model.dataformat.ASN1DataFormat" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "id" : {
+              "type" : "string"
+            },
+            "unmarshalType" : {
+              "type" : "string"
+            },
+            "usingIterator" : {
+              "type" : "boolean"
+            }
+          }
+        } ]
+      },
+      "org.apache.camel.model.dataformat.Any23DataFormat" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "baseUri" : {
+              "type" : "string"
+            },
+            "configuration" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "extractors" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "outputFormat" : {
+              "type" : "string",
+              "enum" : [ "NTRIPLES", "TURTLE", "NQUADS", "RDFXML", "JSONLD", "RDFJSON", "RDF4JMODEL" ]
+            }
+          }
+        } ]
+      },
+      "org.apache.camel.model.dataformat.AvroDataFormat" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "allowJmsType" : {
+              "type" : "boolean"
+            },
+            "allowUnmarshallType" : {
+              "type" : "boolean"
+            },
+            "autoDiscoverObjectMapper" : {
+              "type" : "boolean"
+            },
+            "autoDiscoverSchemaResolver" : {
+              "type" : "boolean"
+            },
+            "collectionType" : {
+              "type" : "string"
+            },
+            "contentTypeHeader" : {
+              "type" : "boolean"
+            },
+            "disableFeatures" : {
+              "type" : "string"
+            },
+            "enableFeatures" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "include" : {
+              "type" : "string"
+            },
+            "instanceClassName" : {
+              "type" : "string"
+            },
+            "jsonView" : {
+              "type" : "string"
+            },
+            "library" : {
+              "type" : "string",
+              "enum" : [ "ApacheAvro", "Jackson" ]
+            },
+            "moduleClassNames" : {
+              "type" : "string"
+            },
+            "moduleRefs" : {
+              "type" : "string"
+            },
+            "objectMapper" : {
+              "type" : "string"
+            },
+            "schemaResolver" : {
+              "type" : "string"
+            },
+            "timezone" : {
+              "type" : "string"
+            },
+            "unmarshalType" : {
+              "type" : "string"
+            },
+            "useDefaultObjectMapper" : {
+              "type" : "boolean"
+            },
+            "useList" : {
+              "type" : "boolean"
+            }
+          }
+        } ]
+      },
+      "org.apache.camel.model.dataformat.BarcodeDataFormat" : {
         "type" : "object",
         "properties" : {
+          "barcodeFormat" : {
+            "type" : "string"
+          },
+          "height" : {
+            "type" : "number"
+          },
           "id" : {
             "type" : "string"
           },
-          "unmarshalType" : {
+          "imageType" : {
             "type" : "string"
           },
-          "usingIterator" : {
-            "type" : "boolean"
+          "width" : {
+            "type" : "number"
           }
         }
       },
-      "org.apache.camel.model.dataformat.Any23DataFormat" : {
+      "org.apache.camel.model.dataformat.Base64DataFormat" : {
         "type" : "object",
         "properties" : {
-          "baseUri" : {
+          "id" : {
             "type" : "string"
           },
-          "configuration" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
-            }
-          },
-          "extractors" : {
-            "type" : "array",
-            "items" : {
-              "type" : "string"
-            }
+          "lineLength" : {
+            "type" : "number"
           },
-          "id" : {
+          "lineSeparator" : {
             "type" : "string"
           },
-          "outputFormat" : {
-            "type" : "string",
-            "enum" : [ "NTRIPLES", "TURTLE", "NQUADS", "RDFXML", "JSONLD", "RDFJSON", "RDF4JMODEL" ]
+          "urlSafe" : {
+            "type" : "boolean"
           }
         }
       },
-      "org.apache.camel.model.dataformat.AvroDataFormat" : {
+      "org.apache.camel.model.dataformat.BindyDataFormat" : {
         "type" : "object",
         "properties" : {
-          "allowJmsType" : {
-            "type" : "boolean"
-          },
-          "allowUnmarshallType" : {
-            "type" : "boolean"
-          },
-          "autoDiscoverObjectMapper" : {
-            "type" : "boolean"
-          },
-          "autoDiscoverSchemaResolver" : {
-            "type" : "boolean"
-          },
-          "collectionType" : {
-            "type" : "string"
-          },
-          "contentTypeHeader" : {
+          "allowEmptyStream" : {
             "type" : "boolean"
           },
-          "disableFeatures" : {
-            "type" : "string"
-          },
-          "enableFeatures" : {
+          "classType" : {
             "type" : "string"
           },
           "id" : {
             "type" : "string"
           },
-          "include" : {
-            "type" : "string"
-          },
-          "instanceClassName" : {
-            "type" : "string"
-          },
-          "jsonView" : {
-            "type" : "string"
-          },
-          "library" : {
-            "type" : "string",
-            "enum" : [ "ApacheAvro", "Jackson" ]
-          },
-          "moduleClassNames" : {
-            "type" : "string"
-          },
-          "moduleRefs" : {
-            "type" : "string"
-          },
-          "objectMapper" : {
-            "type" : "string"
-          },
-          "schemaResolver" : {
-            "type" : "string"
-          },
-          "timezone" : {
-            "type" : "string"
-          },
-          "unmarshalType" : {
-            "type" : "string"
-          },
-          "useDefaultObjectMapper" : {
-            "type" : "boolean"
-          },
-          "useList" : {
-            "type" : "boolean"
-          }
-        }
-      },
-      "org.apache.camel.model.dataformat.BarcodeDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "barcodeFormat" : {
-            "type" : "string"
-          },
-          "height" : {
-            "type" : "number"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "imageType" : {
-            "type" : "string"
-          },
-          "width" : {
-            "type" : "number"
-          }
-        }
-      },
-      "org.apache.camel.model.dataformat.Base64DataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "id" : {
-            "type" : "string"
-          },
-          "lineLength" : {
-            "type" : "number"
-          },
-          "lineSeparator" : {
-            "type" : "string"
-          },
-          "urlSafe" : {
-            "type" : "boolean"
-          }
-        }
-      },
-      "org.apache.camel.model.dataformat.BindyDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "allowEmptyStream" : {
-            "type" : "boolean"
-          },
-          "classType" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "locale" : {
+          "locale" : {
             "type" : "string"
           },
           "type" : {
@@ -4415,115 +4523,123 @@
         }
       },
       "org.apache.camel.model.dataformat.CsvDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "allowMissingColumnNames" : {
-            "type" : "boolean"
-          },
-          "captureHeaderRecord" : {
-            "type" : "boolean"
-          },
-          "commentMarker" : {
-            "type" : "string"
-          },
-          "commentMarkerDisabled" : {
-            "type" : "boolean"
-          },
-          "delimiter" : {
-            "type" : "string"
-          },
-          "escape" : {
-            "type" : "string"
-          },
-          "escapeDisabled" : {
-            "type" : "boolean"
-          },
-          "formatName" : {
-            "type" : "string",
-            "enum" : [ "DEFAULT", "EXCEL", "INFORMIX_UNLOAD", "INFORMIX_UNLOAD_CSV", "MYSQL", "RFC4180" ]
-          },
-          "formatRef" : {
-            "type" : "string"
-          },
-          "header" : {
-            "type" : "array",
-            "items" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "allowMissingColumnNames" : {
+              "type" : "boolean"
+            },
+            "captureHeaderRecord" : {
+              "type" : "boolean"
+            },
+            "commentMarker" : {
+              "type" : "string"
+            },
+            "commentMarkerDisabled" : {
+              "type" : "boolean"
+            },
+            "delimiter" : {
+              "type" : "string"
+            },
+            "escape" : {
+              "type" : "string"
+            },
+            "escapeDisabled" : {
+              "type" : "boolean"
+            },
+            "formatName" : {
+              "type" : "string",
+              "enum" : [ "DEFAULT", "EXCEL", "INFORMIX_UNLOAD", "INFORMIX_UNLOAD_CSV", "MYSQL", "RFC4180" ]
+            },
+            "formatRef" : {
+              "type" : "string"
+            },
+            "header" : {
+              "type" : "array",
+              "items" : {
+                "type" : "string"
+              }
+            },
+            "headerDisabled" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "ignoreEmptyLines" : {
+              "type" : "boolean"
+            },
+            "ignoreHeaderCase" : {
+              "type" : "boolean"
+            },
+            "ignoreSurroundingSpaces" : {
+              "type" : "boolean"
+            },
+            "lazyLoad" : {
+              "type" : "boolean"
+            },
+            "marshallerFactoryRef" : {
+              "type" : "string"
+            },
+            "nullString" : {
+              "type" : "string"
+            },
+            "nullStringDisabled" : {
+              "type" : "boolean"
+            },
+            "quote" : {
+              "type" : "string"
+            },
+            "quoteDisabled" : {
+              "type" : "boolean"
+            },
+            "quoteMode" : {
+              "type" : "string",
+              "enum" : [ "ALL", "ALL_NON_NULL", "MINIMAL", "NON_NUMERIC", "NONE" ]
+            },
+            "recordConverterRef" : {
               "type" : "string"
+            },
+            "recordSeparator" : {
+              "type" : "string"
+            },
+            "recordSeparatorDisabled" : {
+              "type" : "string"
+            },
+            "skipHeaderRecord" : {
+              "type" : "boolean"
+            },
+            "trailingDelimiter" : {
+              "type" : "boolean"
+            },
+            "trim" : {
+              "type" : "boolean"
+            },
+            "useMaps" : {
+              "type" : "boolean"
+            },
+            "useOrderedMaps" : {
+              "type" : "boolean"
             }
-          },
-          "headerDisabled" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "ignoreEmptyLines" : {
-            "type" : "boolean"
-          },
-          "ignoreHeaderCase" : {
-            "type" : "boolean"
-          },
-          "ignoreSurroundingSpaces" : {
-            "type" : "boolean"
-          },
-          "lazyLoad" : {
-            "type" : "boolean"
-          },
-          "marshallerFactoryRef" : {
-            "type" : "string"
-          },
-          "nullString" : {
-            "type" : "string"
-          },
-          "nullStringDisabled" : {
-            "type" : "boolean"
-          },
-          "quote" : {
-            "type" : "string"
-          },
-          "quoteDisabled" : {
-            "type" : "boolean"
-          },
-          "quoteMode" : {
-            "type" : "string",
-            "enum" : [ "ALL", "ALL_NON_NULL", "MINIMAL", "NON_NUMERIC", "NONE" ]
-          },
-          "recordConverterRef" : {
-            "type" : "string"
-          },
-          "recordSeparator" : {
-            "type" : "string"
-          },
-          "recordSeparatorDisabled" : {
-            "type" : "string"
-          },
-          "skipHeaderRecord" : {
-            "type" : "boolean"
-          },
-          "trailingDelimiter" : {
-            "type" : "boolean"
-          },
-          "trim" : {
-            "type" : "boolean"
-          },
-          "useMaps" : {
-            "type" : "boolean"
-          },
-          "useOrderedMaps" : {
-            "type" : "boolean"
           }
-        }
+        } ]
       },
       "org.apache.camel.model.dataformat.CustomDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "id" : {
-            "type" : "string"
-          },
-          "ref" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "id" : {
+              "type" : "string"
+            },
+            "ref" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.dataformat.DataFormatsDefinition" : {
@@ -5148,77 +5264,81 @@
         }
       },
       "org.apache.camel.model.dataformat.ProtobufDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "allowJmsType" : {
-            "type" : "boolean"
-          },
-          "allowUnmarshallType" : {
-            "type" : "boolean"
-          },
-          "autoDiscoverObjectMapper" : {
-            "type" : "boolean"
-          },
-          "autoDiscoverSchemaResolver" : {
-            "type" : "boolean"
-          },
-          "collectionType" : {
-            "type" : "string"
-          },
-          "contentTypeFormat" : {
-            "type" : "string",
-            "enum" : [ "native", "json" ]
-          },
-          "contentTypeHeader" : {
-            "type" : "boolean"
-          },
-          "disableFeatures" : {
-            "type" : "string"
-          },
-          "enableFeatures" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "include" : {
-            "type" : "string"
-          },
-          "instanceClass" : {
-            "type" : "string"
-          },
-          "jsonView" : {
-            "type" : "string"
-          },
-          "library" : {
-            "type" : "string",
-            "enum" : [ "GoogleProtobuf", "Jackson" ]
-          },
-          "moduleClassNames" : {
-            "type" : "string"
-          },
-          "moduleRefs" : {
-            "type" : "string"
-          },
-          "objectMapper" : {
-            "type" : "string"
-          },
-          "schemaResolver" : {
-            "type" : "string"
-          },
-          "timezone" : {
-            "type" : "string"
-          },
-          "unmarshalType" : {
-            "type" : "string"
-          },
-          "useDefaultObjectMapper" : {
-            "type" : "boolean"
-          },
-          "useList" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "allowJmsType" : {
+              "type" : "boolean"
+            },
+            "allowUnmarshallType" : {
+              "type" : "boolean"
+            },
+            "autoDiscoverObjectMapper" : {
+              "type" : "boolean"
+            },
+            "autoDiscoverSchemaResolver" : {
+              "type" : "boolean"
+            },
+            "collectionType" : {
+              "type" : "string"
+            },
+            "contentTypeFormat" : {
+              "type" : "string",
+              "enum" : [ "native", "json" ]
+            },
+            "contentTypeHeader" : {
+              "type" : "boolean"
+            },
+            "disableFeatures" : {
+              "type" : "string"
+            },
+            "enableFeatures" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "include" : {
+              "type" : "string"
+            },
+            "instanceClass" : {
+              "type" : "string"
+            },
+            "jsonView" : {
+              "type" : "string"
+            },
+            "library" : {
+              "type" : "string",
+              "enum" : [ "GoogleProtobuf", "Jackson" ]
+            },
+            "moduleClassNames" : {
+              "type" : "string"
+            },
+            "moduleRefs" : {
+              "type" : "string"
+            },
+            "objectMapper" : {
+              "type" : "string"
+            },
+            "schemaResolver" : {
+              "type" : "string"
+            },
+            "timezone" : {
+              "type" : "string"
+            },
+            "unmarshalType" : {
+              "type" : "string"
+            },
+            "useDefaultObjectMapper" : {
+              "type" : "boolean"
+            },
+            "useList" : {
+              "type" : "boolean"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.dataformat.RssDataFormat" : {
         "type" : "object",
@@ -5229,43 +5349,51 @@
         }
       },
       "org.apache.camel.model.dataformat.SoapDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "contextPath" : {
-            "type" : "string"
-          },
-          "elementNameStrategyRef" : {
-            "type" : "string"
-          },
-          "encoding" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "namespacePrefixRef" : {
-            "type" : "string"
-          },
-          "schema" : {
-            "type" : "string"
-          },
-          "version" : {
-            "type" : "string",
-            "enum" : [ "1.1", "1.2" ]
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "contextPath" : {
+              "type" : "string"
+            },
+            "elementNameStrategyRef" : {
+              "type" : "string"
+            },
+            "encoding" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "namespacePrefixRef" : {
+              "type" : "string"
+            },
+            "schema" : {
+              "type" : "string"
+            },
+            "version" : {
+              "type" : "string",
+              "enum" : [ "1.1", "1.2" ]
+            }
           }
-        },
+        } ],
         "required" : [ "contextPath" ]
       },
       "org.apache.camel.model.dataformat.SwiftMtDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "id" : {
-            "type" : "string"
-          },
-          "writeInJson" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "id" : {
+              "type" : "string"
+            },
+            "writeInJson" : {
+              "type" : "boolean"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.dataformat.SwiftMxDataFormat" : {
         "type" : "object",
@@ -5316,22 +5444,26 @@
         }
       },
       "org.apache.camel.model.dataformat.ThriftDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "contentTypeFormat" : {
-            "type" : "string",
-            "enum" : [ "binary", "json", "sjson" ]
-          },
-          "contentTypeHeader" : {
-            "type" : "boolean"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "instanceClass" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "contentTypeFormat" : {
+              "type" : "string",
+              "enum" : [ "binary", "json", "sjson" ]
+            },
+            "contentTypeHeader" : {
+              "type" : "boolean"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "instanceClass" : {
+              "type" : "string"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.dataformat.TidyMarkupDataFormat" : {
         "type" : "object",
@@ -5591,94 +5723,98 @@
         }
       },
       "org.apache.camel.model.dataformat.XStreamDataFormat" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "aliases" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "contentTypeHeader" : {
+              "type" : "boolean"
+            },
+            "converters" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "driver" : {
+              "type" : "string"
+            },
+            "driverRef" : {
+              "type" : "string"
+            },
+            "encoding" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "implicitCollections" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "mode" : {
+              "type" : "string",
+              "enum" : [ "NO_REFERENCES", "ID_REFERENCES", "XPATH_RELATIVE_REFERENCES", "XPATH_ABSOLUTE_REFERENCES", "SINGLE_NODE_XPATH_RELATIVE_REFERENCES", "SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES" ]
+            },
+            "omitFields" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "permissions" : {
+              "type" : "string"
+            }
+          }
+        } ]
+      },
+      "org.apache.camel.model.dataformat.YAMLDataFormat" : {
         "type" : "object",
         "properties" : {
-          "aliases" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
-            }
+          "allowAnyType" : {
+            "type" : "boolean"
           },
-          "contentTypeHeader" : {
+          "allowRecursiveKeys" : {
             "type" : "boolean"
           },
-          "converters" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
-            }
+          "constructor" : {
+            "type" : "string"
           },
-          "driver" : {
+          "dumperOptions" : {
             "type" : "string"
           },
-          "driverRef" : {
+          "id" : {
             "type" : "string"
           },
-          "encoding" : {
+          "library" : {
+            "type" : "string",
+            "enum" : [ "SnakeYAML" ]
+          },
+          "maxAliasesForCollections" : {
+            "type" : "number"
+          },
+          "prettyFlow" : {
+            "type" : "boolean"
+          },
+          "representer" : {
             "type" : "string"
           },
-          "id" : {
+          "resolver" : {
             "type" : "string"
           },
-          "implicitCollections" : {
+          "typeFilter" : {
             "type" : "array",
             "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
-            }
-          },
-          "mode" : {
-            "type" : "string",
-            "enum" : [ "NO_REFERENCES", "ID_REFERENCES", "XPATH_RELATIVE_REFERENCES", "XPATH_ABSOLUTE_REFERENCES", "SINGLE_NODE_XPATH_RELATIVE_REFERENCES", "SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES" ]
-          },
-          "omitFields" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
-            }
-          },
-          "permissions" : {
-            "type" : "string"
-          }
-        }
-      },
-      "org.apache.camel.model.dataformat.YAMLDataFormat" : {
-        "type" : "object",
-        "properties" : {
-          "allowAnyType" : {
-            "type" : "boolean"
-          },
-          "allowRecursiveKeys" : {
-            "type" : "boolean"
-          },
-          "constructor" : {
-            "type" : "string"
-          },
-          "dumperOptions" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "library" : {
-            "type" : "string",
-            "enum" : [ "SnakeYAML" ]
-          },
-          "maxAliasesForCollections" : {
-            "type" : "number"
-          },
-          "prettyFlow" : {
-            "type" : "boolean"
-          },
-          "representer" : {
-            "type" : "string"
-          },
-          "resolver" : {
-            "type" : "string"
-          },
-          "typeFilter" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLTypeFilterDefinition"
+              "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.YAMLTypeFilterDefinition"
             }
           },
           "unmarshalType" : {
@@ -5954,78 +6090,94 @@
         }
       },
       "org.apache.camel.model.language.CSimpleExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "resultType" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "resultType" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.ConstantExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "resultType" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "resultType" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.DatasonnetExpression" : {
-        "type" : "object",
-        "properties" : {
-          "bodyMediaType" : {
-            "type" : "string"
-          },
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "outputMediaType" : {
-            "type" : "string"
-          },
-          "resultType" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "bodyMediaType" : {
+              "type" : "string"
+            },
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "outputMediaType" : {
+              "type" : "string"
+            },
+            "resultType" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.ExchangePropertyExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.ExpressionDefinition" : {
@@ -6103,154 +6255,182 @@
         }
       },
       "org.apache.camel.model.language.GroovyExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.HeaderExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.Hl7TerserExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.JavaScriptExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "headerName" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "resultType" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
-          }
-        },
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "headerName" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "resultType" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
+          }
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.JoorExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "preCompile" : {
-            "type" : "boolean"
-          },
-          "resultType" : {
-            "type" : "string"
-          },
-          "singleQuotes" : {
-            "type" : "boolean"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "preCompile" : {
+              "type" : "boolean"
+            },
+            "resultType" : {
+              "type" : "string"
+            },
+            "singleQuotes" : {
+              "type" : "boolean"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.JqExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "headerName" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "resultType" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "headerName" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "resultType" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.JsonPathExpression" : {
-        "type" : "object",
-        "properties" : {
-          "allowEasyPredicate" : {
-            "type" : "boolean"
-          },
-          "allowSimple" : {
-            "type" : "boolean"
-          },
-          "expression" : {
-            "type" : "string"
-          },
-          "headerName" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "option" : {
-            "type" : "string",
-            "enum" : [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ]
-          },
-          "resultType" : {
-            "type" : "string"
-          },
-          "suppressExceptions" : {
-            "type" : "boolean"
-          },
-          "trim" : {
-            "type" : "boolean"
-          },
-          "unpackArray" : {
-            "type" : "boolean"
-          },
-          "writeAsString" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "allowEasyPredicate" : {
+              "type" : "boolean"
+            },
+            "allowSimple" : {
+              "type" : "boolean"
+            },
+            "expression" : {
+              "type" : "string"
+            },
+            "headerName" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "option" : {
+              "type" : "string",
+              "enum" : [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ]
+            },
+            "resultType" : {
+              "type" : "string"
+            },
+            "suppressExceptions" : {
+              "type" : "boolean"
+            },
+            "trim" : {
+              "type" : "boolean"
+            },
+            "unpackArray" : {
+              "type" : "boolean"
+            },
+            "writeAsString" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.LanguageExpression" : {
@@ -6272,286 +6452,334 @@
         "required" : [ "expression", "language" ]
       },
       "org.apache.camel.model.language.MethodCallExpression" : {
-        "type" : "object",
-        "properties" : {
-          "beanType" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "method" : {
-            "type" : "string"
-          },
-          "ref" : {
-            "type" : "string"
-          },
-          "scope" : {
-            "type" : "string",
-            "enum" : [ "Singleton", "Request", "Prototype" ]
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "beanType" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "method" : {
+              "type" : "string"
+            },
+            "ref" : {
+              "type" : "string"
+            },
+            "scope" : {
+              "type" : "string",
+              "enum" : [ "Singleton", "Request", "Prototype" ]
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.language.MvelExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.OgnlExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.PythonExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "headerName" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "resultType" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
-          }
-        },
-        "required" : [ "expression" ]
-      },
-      "org.apache.camel.model.language.RefExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "headerName" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "resultType" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
+        "required" : [ "expression" ]
+      },
+      "org.apache.camel.model.language.RefExpression" : {
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
+          }
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.SimpleExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "resultType" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "resultType" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.SpELExpression" : {
-        "type" : "object",
-        "properties" : {
-          "expression" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.TokenizerExpression" : {
-        "type" : "object",
-        "properties" : {
-          "endToken" : {
-            "type" : "string"
-          },
-          "group" : {
-            "type" : "string"
-          },
-          "groupDelimiter" : {
-            "type" : "string"
-          },
-          "headerName" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "includeTokens" : {
-            "type" : "boolean"
-          },
-          "inheritNamespaceTagName" : {
-            "type" : "string"
-          },
-          "regex" : {
-            "type" : "boolean"
-          },
-          "skipFirst" : {
-            "type" : "boolean"
-          },
-          "token" : {
-            "type" : "string"
-          },
-          "trim" : {
-            "type" : "boolean"
-          },
-          "xml" : {
-            "type" : "boolean"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "endToken" : {
+              "type" : "string"
+            },
+            "group" : {
+              "type" : "string"
+            },
+            "groupDelimiter" : {
+              "type" : "string"
+            },
+            "headerName" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "includeTokens" : {
+              "type" : "boolean"
+            },
+            "inheritNamespaceTagName" : {
+              "type" : "string"
+            },
+            "regex" : {
+              "type" : "boolean"
+            },
+            "skipFirst" : {
+              "type" : "boolean"
+            },
+            "token" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "boolean"
+            },
+            "xml" : {
+              "type" : "boolean"
+            }
           }
-        },
+        } ],
         "required" : [ "token" ]
       },
       "org.apache.camel.model.language.XMLTokenizerExpression" : {
-        "type" : "object",
-        "properties" : {
-          "group" : {
-            "type" : "number"
-          },
-          "headerName" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "mode" : {
-            "type" : "string",
-            "enum" : [ "i", "w", "u", "t" ]
-          },
-          "namespace" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "group" : {
+              "type" : "number"
+            },
+            "headerName" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "mode" : {
+              "type" : "string",
+              "enum" : [ "i", "w", "u", "t" ]
+            },
+            "namespace" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "trim" : {
+              "type" : "boolean"
             }
-          },
-          "trim" : {
-            "type" : "boolean"
           }
-        }
+        } ]
       },
       "org.apache.camel.model.language.XPathExpression" : {
-        "type" : "object",
-        "properties" : {
-          "documentType" : {
-            "type" : "string"
-          },
-          "expression" : {
-            "type" : "string"
-          },
-          "factoryRef" : {
-            "type" : "string"
-          },
-          "headerName" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "logNamespaces" : {
-            "type" : "boolean"
-          },
-          "namespace" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "documentType" : {
+              "type" : "string"
+            },
+            "expression" : {
+              "type" : "string"
+            },
+            "factoryRef" : {
+              "type" : "string"
+            },
+            "headerName" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "logNamespaces" : {
+              "type" : "boolean"
+            },
+            "namespace" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "objectModel" : {
+              "type" : "string"
+            },
+            "preCompile" : {
+              "type" : "boolean"
+            },
+            "resultType" : {
+              "type" : "string",
+              "enum" : [ "NUMBER", "STRING", "BOOLEAN", "NODESET", "NODE" ]
+            },
+            "saxon" : {
+              "type" : "boolean"
+            },
+            "threadSafety" : {
+              "type" : "boolean"
+            },
+            "trim" : {
+              "type" : "boolean"
             }
-          },
-          "objectModel" : {
-            "type" : "string"
-          },
-          "preCompile" : {
-            "type" : "boolean"
-          },
-          "resultType" : {
-            "type" : "string",
-            "enum" : [ "NUMBER", "STRING", "BOOLEAN", "NODESET", "NODE" ]
-          },
-          "saxon" : {
-            "type" : "boolean"
-          },
-          "threadSafety" : {
-            "type" : "boolean"
-          },
-          "trim" : {
-            "type" : "boolean"
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.XQueryExpression" : {
-        "type" : "object",
-        "properties" : {
-          "configurationRef" : {
-            "type" : "string"
-          },
-          "expression" : {
-            "type" : "string"
-          },
-          "headerName" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "namespace" : {
-            "type" : "array",
-            "items" : {
-              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "configurationRef" : {
+              "type" : "string"
+            },
+            "expression" : {
+              "type" : "string"
+            },
+            "headerName" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "namespace" : {
+              "type" : "array",
+              "items" : {
+                "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+              }
+            },
+            "trim" : {
+              "type" : "boolean"
+            },
+            "type" : {
+              "type" : "string"
             }
-          },
-          "trim" : {
-            "type" : "boolean"
-          },
-          "type" : {
-            "type" : "string"
           }
-        },
+        } ],
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.loadbalancer.CustomLoadBalancerDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "id" : {
-            "type" : "string"
-          },
-          "ref" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "id" : {
+              "type" : "string"
+            },
+            "ref" : {
+              "type" : "string"
+            }
           }
-        },
+        } ],
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition" : {