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/21 19:12:57 UTC

[camel] branch main updated: 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


The following commit(s) were added to refs/heads/main by this push:
     new 9f8a3cbd7a4 Regen for commit 9f3d15cade87a4e785c138f0b22b3d910b5ccbc6 (#8754)
9f8a3cbd7a4 is described below

commit 9f8a3cbd7a45c201bd3bd7a871168b55e1ef96a8
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Mon Nov 21 20:12:49 2022 +0100

    Regen for commit 9f3d15cade87a4e785c138f0b22b3d910b5ccbc6 (#8754)
    
    Signed-off-by: GitHub <no...@github.com>
    
    Signed-off-by: GitHub <no...@github.com>
    Co-authored-by: orpiske <or...@users.noreply.github.com>
---
 .../dsl/yaml/deserializers/ModelDeserializers.java |  348 ---
 .../generated/resources/schema/camel-yaml-dsl.json | 3208 +++++++++-----------
 .../generated/resources/schema/camelYamlDsl.json   | 3208 +++++++++-----------
 3 files changed, 2980 insertions(+), 3784 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 56ae69f0acd..342901aa0bb 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,7 +244,6 @@ 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 = {
@@ -263,11 +262,6 @@ 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) {
@@ -517,7 +511,6 @@ 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 = {
@@ -538,11 +531,6 @@ 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) {
@@ -650,7 +638,6 @@ 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 = {
@@ -687,11 +674,6 @@ 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) {
@@ -1025,7 +1007,6 @@ 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 = {
@@ -1049,11 +1030,6 @@ 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) {
@@ -1368,7 +1344,6 @@ 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 = {
@@ -1388,11 +1363,6 @@ 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) {
@@ -2044,7 +2014,6 @@ 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 = {
@@ -2064,11 +2033,6 @@ 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) {
@@ -2263,7 +2227,6 @@ 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 = {
@@ -2286,11 +2249,6 @@ 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) {
@@ -2429,7 +2387,6 @@ 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 = {
@@ -2475,11 +2432,6 @@ 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) {
@@ -2644,7 +2596,6 @@ 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 = {
@@ -2662,11 +2613,6 @@ 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) {
@@ -2694,7 +2640,6 @@ 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 = {
@@ -2712,11 +2657,6 @@ 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) {
@@ -3712,7 +3652,6 @@ 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 = {
@@ -3734,11 +3673,6 @@ 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) {
@@ -4292,7 +4226,6 @@ 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 = {
@@ -4310,11 +4243,6 @@ 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) {
@@ -4826,7 +4754,6 @@ 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 = {
@@ -4845,11 +4772,6 @@ 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) {
@@ -5795,7 +5717,6 @@ 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 = {
@@ -5814,11 +5735,6 @@ 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) {
@@ -6071,7 +5987,6 @@ 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 = {
@@ -6090,11 +6005,6 @@ 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) {
@@ -6177,7 +6087,6 @@ 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 = {
@@ -6196,11 +6105,6 @@ 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) {
@@ -6390,7 +6294,6 @@ 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 = {
@@ -6412,11 +6315,6 @@ 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) {
@@ -6465,7 +6363,6 @@ 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 = {
@@ -6487,11 +6384,6 @@ 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) {
@@ -6654,7 +6546,6 @@ 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 = {
@@ -6676,11 +6567,6 @@ 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) {
@@ -6727,7 +6613,6 @@ 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 = {
@@ -6751,11 +6636,6 @@ 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) {
@@ -6943,7 +6823,6 @@ 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 = {
@@ -6964,11 +6843,6 @@ 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) {
@@ -7166,7 +7040,6 @@ 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 = {
@@ -7188,11 +7061,6 @@ 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) {
@@ -7246,7 +7114,6 @@ 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 = {
@@ -7267,11 +7134,6 @@ 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) {
@@ -7541,7 +7403,6 @@ 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 = {
@@ -7568,11 +7429,6 @@ 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) {
@@ -8142,7 +7998,6 @@ 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 = {
@@ -8167,11 +8022,6 @@ 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) {
@@ -8627,7 +8477,6 @@ 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 = {
@@ -8649,11 +8498,6 @@ 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) {
@@ -8943,7 +8787,6 @@ 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 = {
@@ -8962,11 +8805,6 @@ 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) {
@@ -9112,7 +8950,6 @@ 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 = {
@@ -9131,11 +8968,6 @@ 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) {
@@ -10820,7 +10652,6 @@ 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 = {
@@ -10858,11 +10689,6 @@ 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) {
@@ -11123,7 +10949,6 @@ 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 = {
@@ -11144,11 +10969,6 @@ 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) {
@@ -11568,7 +11388,6 @@ 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 = {
@@ -11587,11 +11406,6 @@ 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) {
@@ -11633,7 +11447,6 @@ 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 = {
@@ -11654,11 +11467,6 @@ 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) {
@@ -11701,7 +11509,6 @@ 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 = {
@@ -11723,11 +11530,6 @@ 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) {
@@ -11775,7 +11577,6 @@ 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 = {
@@ -11797,11 +11598,6 @@ 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) {
@@ -11849,7 +11645,6 @@ 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 = {
@@ -11870,11 +11665,6 @@ 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) {
@@ -12555,7 +12345,6 @@ 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)
@@ -12570,11 +12359,6 @@ 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) {
@@ -13027,7 +12811,6 @@ 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 = {
@@ -13050,11 +12833,6 @@ 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) {
@@ -13143,7 +12921,6 @@ 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 = {
@@ -13161,11 +12938,6 @@ 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) {
@@ -13193,7 +12965,6 @@ 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)
@@ -13208,11 +12979,6 @@ 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) {
@@ -13235,7 +13001,6 @@ 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)
@@ -13250,11 +13015,6 @@ 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) {
@@ -13274,7 +13034,6 @@ 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 = {
@@ -13295,11 +13054,6 @@ 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) {
@@ -13397,7 +13151,6 @@ 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 = {
@@ -13422,11 +13175,6 @@ 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) {
@@ -13522,7 +13270,6 @@ 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 = {
@@ -13544,11 +13291,6 @@ 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) {
@@ -13694,7 +13436,6 @@ 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 = {
@@ -13716,11 +13457,6 @@ 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) {
@@ -14058,7 +13794,6 @@ 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 = {
@@ -14102,11 +13837,6 @@ 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) {
@@ -14584,7 +14314,6 @@ 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 = {
@@ -14605,11 +14334,6 @@ 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) {
@@ -14805,7 +14529,6 @@ 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 = {
@@ -14825,11 +14548,6 @@ 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) {
@@ -14873,7 +14591,6 @@ 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 = {
@@ -14896,11 +14613,6 @@ 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) {
@@ -15025,7 +14737,6 @@ 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 = {
@@ -15044,11 +14755,6 @@ 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) {
@@ -15625,7 +15331,6 @@ 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 = {
@@ -15643,11 +15348,6 @@ 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) {
@@ -16078,7 +15778,6 @@ 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 = {
@@ -16098,11 +15797,6 @@ 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) {
@@ -16366,7 +16060,6 @@ 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 = {
@@ -16389,11 +16082,6 @@ 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) {
@@ -16447,7 +16135,6 @@ 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 = {
@@ -16474,11 +16161,6 @@ 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) {
@@ -16549,7 +16231,6 @@ 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 = {
@@ -16577,11 +16258,6 @@ 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) {
@@ -18318,7 +17994,6 @@ 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 = {
@@ -18340,11 +18015,6 @@ 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) {
@@ -18398,7 +18068,6 @@ 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 = {
@@ -18427,11 +18096,6 @@ 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) {
@@ -18520,7 +18184,6 @@ 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 = {
@@ -18543,11 +18206,6 @@ 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) {
@@ -18606,7 +18264,6 @@ 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 = {
@@ -18633,11 +18290,6 @@ 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 beb1a4929cc..981415da237 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,38 +496,34 @@
         "required" : [ "aggregation-strategy" ]
       },
       "org.apache.camel.model.BeanDefinition" : {
-        "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" ]
-            }
+        "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",
@@ -686,34 +682,30 @@
         }
       },
       "org.apache.camel.model.ConvertBodyDefinition" : {
-        "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"
-            }
+        "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" : {
@@ -757,19 +749,15 @@
         }
       },
       "org.apache.camel.model.DescriptionDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "lang" : {
-              "type" : "string"
-            },
-            "text" : {
-              "type" : "string"
-            }
+        "type" : "object",
+        "properties" : {
+          "lang" : {
+            "type" : "string"
+          },
+          "text" : {
+            "type" : "string"
           }
-        } ]
+        }
       },
       "org.apache.camel.model.DynamicRouterDefinition" : {
         "type" : "object",
@@ -1145,59 +1133,51 @@
         "required" : [ "idempotent-repository" ]
       },
       "org.apache.camel.model.InOnlyDefinition" : {
-        "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"
-            }
+        "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" : {
-        "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"
-            }
+        "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" : {
@@ -1242,86 +1222,78 @@
         }
       },
       "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" : {
-            "description" : {
-              "type" : "string"
-            },
-            "disabled" : {
+            "inherit-error-handler" : {
               "type" : "boolean"
             },
-            "id" : {
+            "name" : {
               "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" : {
-        "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"
+            "parameters" : {
+              "type" : "object"
             },
             "steps" : {
               "type" : "array",
@@ -1378,41 +1350,37 @@
         }
       },
       "org.apache.camel.model.LogDefinition" : {
-        "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"
-            }
+        "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" : {
@@ -2195,128 +2163,37 @@
         }
       },
       "org.apache.camel.model.RemoveHeaderDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "description" : {
-              "type" : "string"
-            },
-            "disabled" : {
-              "type" : "boolean"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "inherit-error-handler" : {
-              "type" : "boolean"
-            },
-            "name" : {
-              "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"
           },
-          "expression" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
+          "exclude-pattern" : {
+            "type" : "string"
           },
           "id" : {
             "type" : "string"
@@ -2324,40 +2201,115 @@
           "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"
+          "pattern" : {
+            "type" : "string"
           }
         },
-        "required" : [ "expression" ]
+        "required" : [ "pattern" ]
       },
-      "org.apache.camel.model.Resilience4jConfigurationDefinition" : {
+      "org.apache.camel.model.RemovePropertiesDefinition" : {
         "type" : "object",
         "properties" : {
-          "automatic-transition-from-open-to-half-open-enabled" : {
-            "type" : "boolean"
-          },
-          "circuit-breaker" : {
+          "description" : {
             "type" : "string"
           },
-          "config" : {
-            "type" : "string"
+          "disabled" : {
+            "type" : "boolean"
           },
-          "failure-rate-threshold" : {
-            "type" : "number"
+          "exclude-pattern" : {
+            "type" : "string"
           },
           "id" : {
             "type" : "string"
           },
-          "minimum-number-of-calls" : {
-            "type" : "number"
+          "inherit-error-handler" : {
+            "type" : "boolean"
           },
-          "permitted-number-of-calls-in-half-open-state" : {
+          "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" : {
+            "type" : "string"
+          },
+          "minimum-number-of-calls" : {
+            "type" : "number"
+          },
+          "permitted-number-of-calls-in-half-open-state" : {
             "type" : "number"
           },
           "sliding-window-size" : {
@@ -2385,16 +2337,12 @@
         }
       },
       "org.apache.camel.model.RestContextRefDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "ref" : {
-              "type" : "string"
-            }
+        "type" : "object",
+        "properties" : {
+          "ref" : {
+            "type" : "string"
           }
-        } ],
+        },
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.ResumableDefinition" : {
@@ -2422,62 +2370,50 @@
         "required" : [ "resume-strategy" ]
       },
       "org.apache.camel.model.RollbackDefinition" : {
-        "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"
-            }
+        "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" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "id" : {
-              "type" : "string"
-            },
-            "ref" : {
-              "type" : "string"
-            }
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          },
+          "ref" : {
+            "type" : "string"
           }
-        } ],
+        },
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.RouteConfigurationContextRefDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "ref" : {
-              "type" : "string"
-            }
+        "type" : "object",
+        "properties" : {
+          "ref" : {
+            "type" : "string"
           }
-        } ],
+        },
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.RouteConfigurationDefinition" : {
@@ -2529,16 +2465,12 @@
         } ]
       },
       "org.apache.camel.model.RouteContextRefDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "ref" : {
-              "type" : "string"
-            }
+        "type" : "object",
+        "properties" : {
+          "ref" : {
+            "type" : "string"
           }
-        } ],
+        },
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.RouteDefinition" : {
@@ -2659,81 +2591,13 @@
         "required" : [ "name" ]
       },
       "org.apache.camel.model.RoutingSlipDefinition" : {
-        "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"
-            }
-          }
-        } ],
+        "type" : "object",
         "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" : {
-          "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" ]
+          "cache-size" : {
+            "type" : "number"
           },
           "description" : {
             "type" : "string"
@@ -2741,13 +2605,73 @@
           "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"
           },
-          "option" : {
+          "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" ]
+          },
+          "description" : {
+            "type" : "string"
+          },
+          "disabled" : {
+            "type" : "boolean"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "inherit-error-handler" : {
+            "type" : "boolean"
+          },
+          "option" : {
             "type" : "array",
             "items" : {
               "$ref" : "#/items/definitions/org.apache.camel.model.PropertyExpressionDefinition"
@@ -2772,31 +2696,27 @@
         }
       },
       "org.apache.camel.model.SamplingDefinition" : {
-        "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"
-            }
+        "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",
@@ -2845,29 +2765,25 @@
         }
       },
       "org.apache.camel.model.SetExchangePatternDefinition" : {
-        "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" ]
-            }
+        "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" : {
@@ -3272,79 +3188,71 @@
         }
       },
       "org.apache.camel.model.ToDefinition" : {
-        "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"
-            }
+        "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" : {
-        "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"
-            }
+        "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" : {
@@ -4086,98 +3994,94 @@
         }
       },
       "org.apache.camel.model.cloud.ServiceCallDefinition" : {
-        "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"
-            }
+        "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" : {
@@ -4362,178 +4266,166 @@
         }
       },
       "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"
           },
-          "image-type" : {
+          "unmarshal-type" : {
             "type" : "string"
           },
-          "width" : {
-            "type" : "number"
+          "using-iterator" : {
+            "type" : "boolean"
           }
         }
       },
-      "org.apache.camel.model.dataformat.Base64DataFormat" : {
+      "org.apache.camel.model.dataformat.Any23DataFormat" : {
         "type" : "object",
         "properties" : {
-          "id" : {
+          "base-uri" : {
             "type" : "string"
           },
-          "line-length" : {
-            "type" : "number"
+          "configuration" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+            }
           },
-          "line-separator" : {
+          "extractors" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            }
+          },
+          "id" : {
             "type" : "string"
           },
-          "url-safe" : {
-            "type" : "boolean"
+          "output-format" : {
+            "type" : "string",
+            "enum" : [ "NTRIPLES", "TURTLE", "NQUADS", "RDFXML", "JSONLD", "RDFJSON", "RDF4JMODEL" ]
           }
         }
       },
-      "org.apache.camel.model.dataformat.BindyDataFormat" : {
+      "org.apache.camel.model.dataformat.AvroDataFormat" : {
         "type" : "object",
         "properties" : {
-          "allow-empty-stream" : {
+          "allow-jms-type" : {
             "type" : "boolean"
           },
-          "class-type" : {
-            "type" : "string"
+          "allow-unmarshall-type" : {
+            "type" : "boolean"
           },
-          "id" : {
-            "type" : "string"
+          "auto-discover-object-mapper" : {
+            "type" : "boolean"
           },
-          "locale" : {
-            "type" : "string"
+          "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"
+          },
+          "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" : {
+            "type" : "string"
           },
           "type" : {
             "type" : "string",
@@ -4619,187 +4511,179 @@
         }
       },
       "org.apache.camel.model.dataformat.CsvDataFormat" : {
-        "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"
-            }
-          }
-        } ]
-      },
-      "org.apache.camel.model.dataformat.CustomDataFormat" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "id" : {
-              "type" : "string"
-            },
-            "ref" : {
-              "type" : "string"
-            }
-          }
-        } ],
-        "required" : [ "ref" ]
-      },
-      "org.apache.camel.model.dataformat.DataFormatsDefinition" : {
         "type" : "object",
         "properties" : {
-          "any23" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Any23DataFormat"
-          },
-          "asn1" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ASN1DataFormat"
+          "allow-missing-column-names" : {
+            "type" : "boolean"
           },
-          "avro" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.AvroDataFormat"
+          "capture-header-record" : {
+            "type" : "boolean"
           },
-          "barcode" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.BarcodeDataFormat"
+          "comment-marker" : {
+            "type" : "string"
           },
-          "base64" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Base64DataFormat"
+          "comment-marker-disabled" : {
+            "type" : "boolean"
           },
-          "bindy" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.BindyDataFormat"
+          "delimiter" : {
+            "type" : "string"
           },
-          "cbor" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CBORDataFormat"
+          "escape" : {
+            "type" : "string"
           },
-          "crypto" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CryptoDataFormat"
+          "escape-disabled" : {
+            "type" : "boolean"
           },
-          "csv" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CsvDataFormat"
+          "format-name" : {
+            "type" : "string",
+            "enum" : [ "DEFAULT", "EXCEL", "INFORMIX_UNLOAD", "INFORMIX_UNLOAD_CSV", "MYSQL", "RFC4180" ]
           },
-          "custom" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CustomDataFormat"
+          "format-ref" : {
+            "type" : "string"
           },
-          "fhir-json" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FhirJsonDataFormat"
+          "header" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            }
           },
-          "fhir-xml" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FhirXmlDataFormat"
+          "header-disabled" : {
+            "type" : "boolean"
           },
-          "flatpack" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FlatpackDataFormat"
+          "id" : {
+            "type" : "string"
           },
-          "grok" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GrokDataFormat"
+          "ignore-empty-lines" : {
+            "type" : "boolean"
           },
-          "gzip-deflater" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GzipDeflaterDataFormat"
+          "ignore-header-case" : {
+            "type" : "boolean"
           },
-          "hl7" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.HL7DataFormat"
+          "ignore-surrounding-spaces" : {
+            "type" : "boolean"
           },
-          "ical" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.IcalDataFormat"
+          "lazy-load" : {
+            "type" : "boolean"
           },
-          "jackson-xml" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JacksonXMLDataFormat"
+          "marshaller-factory-ref" : {
+            "type" : "string"
           },
-          "jaxb" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JaxbDataFormat"
+          "null-string" : {
+            "type" : "string"
           },
-          "json" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JsonDataFormat"
+          "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"
+          }
+        },
+        "required" : [ "ref" ]
+      },
+      "org.apache.camel.model.dataformat.DataFormatsDefinition" : {
+        "type" : "object",
+        "properties" : {
+          "any23" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Any23DataFormat"
+          },
+          "asn1" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ASN1DataFormat"
+          },
+          "avro" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.AvroDataFormat"
+          },
+          "barcode" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.BarcodeDataFormat"
+          },
+          "base64" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Base64DataFormat"
+          },
+          "bindy" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.BindyDataFormat"
+          },
+          "cbor" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CBORDataFormat"
+          },
+          "crypto" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CryptoDataFormat"
+          },
+          "csv" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CsvDataFormat"
+          },
+          "custom" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CustomDataFormat"
+          },
+          "fhir-json" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FhirJsonDataFormat"
+          },
+          "fhir-xml" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FhirXmlDataFormat"
+          },
+          "flatpack" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FlatpackDataFormat"
+          },
+          "grok" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GrokDataFormat"
+          },
+          "gzip-deflater" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GzipDeflaterDataFormat"
+          },
+          "hl7" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.HL7DataFormat"
+          },
+          "ical" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.IcalDataFormat"
+          },
+          "jackson-xml" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JacksonXMLDataFormat"
+          },
+          "jaxb" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JaxbDataFormat"
+          },
+          "json" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JsonDataFormat"
           },
           "json-api" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JsonApiDataFormat"
@@ -5360,158 +5244,146 @@
         }
       },
       "org.apache.camel.model.dataformat.ProtobufDataFormat" : {
-        "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",
         "properties" : {
-          "id" : {
+          "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"
-          }
-        }
-      },
-      "org.apache.camel.model.dataformat.SoapDataFormat" : {
-        "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" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "id" : {
-              "type" : "string"
-            },
-            "write-in-json" : {
-              "type" : "boolean"
-            }
-          }
-        } ]
-      },
-      "org.apache.camel.model.dataformat.SwiftMxDataFormat" : {
-        "type" : "object",
-        "properties" : {
+          },
+          "content-type-format" : {
+            "type" : "string",
+            "enum" : [ "native", "json" ]
+          },
+          "content-type-header" : {
+            "type" : "boolean"
+          },
+          "disable-features" : {
+            "type" : "string"
+          },
+          "enable-features" : {
+            "type" : "string"
+          },
           "id" : {
             "type" : "string"
           },
-          "read-config-ref" : {
+          "include" : {
             "type" : "string"
           },
-          "read-message-id" : {
+          "instance-class" : {
             "type" : "string"
           },
-          "write-config-ref" : {
+          "json-view" : {
             "type" : "string"
           },
-          "write-in-json" : {
+          "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.SyslogDataFormat" : {
+      "org.apache.camel.model.dataformat.RssDataFormat" : {
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          }
+        }
+      },
+      "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" ]
+          }
+        },
+        "required" : [ "context-path" ]
+      },
+      "org.apache.camel.model.dataformat.SwiftMtDataFormat" : {
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          },
+          "write-in-json" : {
+            "type" : "boolean"
+          }
+        }
+      },
+      "org.apache.camel.model.dataformat.SwiftMxDataFormat" : {
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          },
+          "read-config-ref" : {
+            "type" : "string"
+          },
+          "read-message-id" : {
+            "type" : "string"
+          },
+          "write-config-ref" : {
+            "type" : "string"
+          },
+          "write-in-json" : {
+            "type" : "boolean"
+          }
+        }
+      },
+      "org.apache.camel.model.dataformat.SyslogDataFormat" : {
         "type" : "object",
         "properties" : {
           "id" : {
@@ -5540,26 +5412,22 @@
         }
       },
       "org.apache.camel.model.dataformat.ThriftDataFormat" : {
-        "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"
-            }
+        "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",
@@ -5819,59 +5687,55 @@
         }
       },
       "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"
+        "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",
@@ -6186,94 +6050,78 @@
         }
       },
       "org.apache.camel.model.language.CSimpleExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "result-type" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "result-type" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.ConstantExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "result-type" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "result-type" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.DatasonnetExpression" : {
-        "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"
-            }
+        "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" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.ExpressionDefinition" : {
@@ -6354,182 +6202,154 @@
         }
       },
       "org.apache.camel.model.language.GroovyExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.HeaderExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.Hl7TerserExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.JavaScriptExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "header-name" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "result-type" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "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" : {
-        "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"
-            }
+        "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" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "header-name" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "result-type" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "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" : {
-        "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"
-            }
+        "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" : {
@@ -6551,334 +6371,286 @@
         "required" : [ "expression", "language" ]
       },
       "org.apache.camel.model.language.MethodCallExpression" : {
-        "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"
-            }
+        "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" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.OgnlExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.PythonExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "header-name" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "result-type" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "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"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.SimpleExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "result-type" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "result-type" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.SpELExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.TokenizerExpression" : {
-        "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"
-            }
+        "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" : {
-        "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"
+        "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"
           }
-        } ]
+        }
       },
       "org.apache.camel.model.language.XPathExpression" : {
-        "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"
+        "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"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.XQueryExpression" : {
-        "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"
+        "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"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.loadbalancer.CustomLoadBalancerDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "id" : {
-              "type" : "string"
-            },
-            "ref" : {
-              "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 464783519a7..3e2fa042dbc 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,38 +403,34 @@
         "required" : [ "aggregationStrategy" ]
       },
       "org.apache.camel.model.BeanDefinition" : {
-        "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" ]
-            }
+        "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",
@@ -593,34 +589,30 @@
         }
       },
       "org.apache.camel.model.ConvertBodyDefinition" : {
-        "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"
-            }
+        "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" : {
@@ -664,19 +656,15 @@
         }
       },
       "org.apache.camel.model.DescriptionDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "lang" : {
-              "type" : "string"
-            },
-            "text" : {
-              "type" : "string"
-            }
+        "type" : "object",
+        "properties" : {
+          "lang" : {
+            "type" : "string"
+          },
+          "text" : {
+            "type" : "string"
           }
-        } ]
+        }
       },
       "org.apache.camel.model.DynamicRouterDefinition" : {
         "type" : "object",
@@ -1049,59 +1037,51 @@
         "required" : [ "idempotentRepository" ]
       },
       "org.apache.camel.model.InOnlyDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "description" : {
-              "type" : "string"
-            },
-            "disabled" : {
-              "type" : "boolean"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "inheritErrorHandler" : {
-              "type" : "boolean"
-            },
-            "parameters" : {
-              "type" : "object"
-            },
-            "uri" : {
-              "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" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "description" : {
-              "type" : "string"
-            },
-            "disabled" : {
-              "type" : "boolean"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "inheritErrorHandler" : {
-              "type" : "boolean"
-            },
-            "parameters" : {
-              "type" : "object"
-            },
-            "uri" : {
-              "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" : {
@@ -1146,86 +1126,78 @@
         }
       },
       "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" : {
-            "description" : {
-              "type" : "string"
-            },
-            "disabled" : {
+            "inheritErrorHandler" : {
               "type" : "boolean"
             },
-            "id" : {
+            "name" : {
               "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" : {
-        "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"
+            "parameters" : {
+              "type" : "object"
             },
             "steps" : {
               "type" : "array",
@@ -1282,41 +1254,37 @@
         }
       },
       "org.apache.camel.model.LogDefinition" : {
-        "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"
-            }
+        "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" : {
@@ -2099,128 +2067,37 @@
         }
       },
       "org.apache.camel.model.RemoveHeaderDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "description" : {
-              "type" : "string"
-            },
-            "disabled" : {
-              "type" : "boolean"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "inheritErrorHandler" : {
-              "type" : "boolean"
-            },
-            "name" : {
-              "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"
           },
-          "expression" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
+          "excludePattern" : {
+            "type" : "string"
           },
           "id" : {
             "type" : "string"
@@ -2228,40 +2105,115 @@
           "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"
+          "pattern" : {
+            "type" : "string"
           }
         },
-        "required" : [ "expression" ]
+        "required" : [ "pattern" ]
       },
-      "org.apache.camel.model.Resilience4jConfigurationDefinition" : {
+      "org.apache.camel.model.RemovePropertiesDefinition" : {
         "type" : "object",
         "properties" : {
-          "automaticTransitionFromOpenToHalfOpenEnabled" : {
-            "type" : "boolean"
-          },
-          "circuitBreaker" : {
+          "description" : {
             "type" : "string"
           },
-          "config" : {
-            "type" : "string"
+          "disabled" : {
+            "type" : "boolean"
           },
-          "failureRateThreshold" : {
-            "type" : "number"
+          "excludePattern" : {
+            "type" : "string"
           },
           "id" : {
             "type" : "string"
           },
-          "minimumNumberOfCalls" : {
-            "type" : "number"
+          "inheritErrorHandler" : {
+            "type" : "boolean"
           },
-          "permittedNumberOfCallsInHalfOpenState" : {
+          "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" : {
+            "type" : "string"
+          },
+          "minimumNumberOfCalls" : {
+            "type" : "number"
+          },
+          "permittedNumberOfCallsInHalfOpenState" : {
             "type" : "number"
           },
           "slidingWindowSize" : {
@@ -2289,16 +2241,12 @@
         }
       },
       "org.apache.camel.model.RestContextRefDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "ref" : {
-              "type" : "string"
-            }
+        "type" : "object",
+        "properties" : {
+          "ref" : {
+            "type" : "string"
           }
-        } ],
+        },
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.ResumableDefinition" : {
@@ -2326,62 +2274,50 @@
         "required" : [ "resumeStrategy" ]
       },
       "org.apache.camel.model.RollbackDefinition" : {
-        "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"
-            }
+        "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" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "id" : {
-              "type" : "string"
-            },
-            "ref" : {
-              "type" : "string"
-            }
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          },
+          "ref" : {
+            "type" : "string"
           }
-        } ],
+        },
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.RouteConfigurationContextRefDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "ref" : {
-              "type" : "string"
-            }
+        "type" : "object",
+        "properties" : {
+          "ref" : {
+            "type" : "string"
           }
-        } ],
+        },
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.RouteConfigurationDefinition" : {
@@ -2433,16 +2369,12 @@
         } ]
       },
       "org.apache.camel.model.RouteContextRefDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "ref" : {
-              "type" : "string"
-            }
+        "type" : "object",
+        "properties" : {
+          "ref" : {
+            "type" : "string"
           }
-        } ],
+        },
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.RouteDefinition" : {
@@ -2563,81 +2495,13 @@
         "required" : [ "name" ]
       },
       "org.apache.camel.model.RoutingSlipDefinition" : {
-        "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"
-            }
-          }
-        } ],
+        "type" : "object",
         "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" : {
-          "compensation" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.SagaActionUriDefinition"
-          },
-          "completion" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.SagaActionUriDefinition"
-          },
-          "completionMode" : {
-            "type" : "string",
-            "enum" : [ "AUTO", "MANUAL" ]
+          "cacheSize" : {
+            "type" : "number"
           },
           "description" : {
             "type" : "string"
@@ -2645,13 +2509,73 @@
           "disabled" : {
             "type" : "boolean"
           },
+          "expression" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.language.ExpressionDefinition"
+          },
           "id" : {
             "type" : "string"
           },
+          "ignoreInvalidEndpoints" : {
+            "type" : "boolean"
+          },
           "inheritErrorHandler" : {
             "type" : "boolean"
           },
-          "option" : {
+          "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" ]
+          },
+          "description" : {
+            "type" : "string"
+          },
+          "disabled" : {
+            "type" : "boolean"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "inheritErrorHandler" : {
+            "type" : "boolean"
+          },
+          "option" : {
             "type" : "array",
             "items" : {
               "$ref" : "#/items/definitions/org.apache.camel.model.PropertyExpressionDefinition"
@@ -2676,31 +2600,27 @@
         }
       },
       "org.apache.camel.model.SamplingDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "description" : {
-              "type" : "string"
-            },
-            "disabled" : {
-              "type" : "boolean"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "inheritErrorHandler" : {
-              "type" : "boolean"
-            },
-            "messageFrequency" : {
-              "type" : "number"
-            },
-            "samplePeriod" : {
-              "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",
@@ -2749,29 +2669,25 @@
         }
       },
       "org.apache.camel.model.SetExchangePatternDefinition" : {
-        "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" ]
-            }
+        "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" : {
@@ -3176,79 +3092,71 @@
         }
       },
       "org.apache.camel.model.ToDefinition" : {
-        "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"
-            }
+        "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" : {
-        "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"
-            }
+        "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" : {
@@ -3990,98 +3898,94 @@
         }
       },
       "org.apache.camel.model.cloud.ServiceCallDefinition" : {
-        "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"
-            }
+        "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" : {
@@ -4266,178 +4170,166 @@
         }
       },
       "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"
           },
-          "imageType" : {
+          "unmarshalType" : {
             "type" : "string"
           },
-          "width" : {
-            "type" : "number"
+          "usingIterator" : {
+            "type" : "boolean"
           }
         }
       },
-      "org.apache.camel.model.dataformat.Base64DataFormat" : {
+      "org.apache.camel.model.dataformat.Any23DataFormat" : {
         "type" : "object",
         "properties" : {
-          "id" : {
+          "baseUri" : {
             "type" : "string"
           },
-          "lineLength" : {
-            "type" : "number"
+          "configuration" : {
+            "type" : "array",
+            "items" : {
+              "$ref" : "#/items/definitions/org.apache.camel.model.PropertyDefinition"
+            }
           },
-          "lineSeparator" : {
+          "extractors" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            }
+          },
+          "id" : {
             "type" : "string"
           },
-          "urlSafe" : {
-            "type" : "boolean"
+          "outputFormat" : {
+            "type" : "string",
+            "enum" : [ "NTRIPLES", "TURTLE", "NQUADS", "RDFXML", "JSONLD", "RDFJSON", "RDF4JMODEL" ]
           }
         }
       },
-      "org.apache.camel.model.dataformat.BindyDataFormat" : {
+      "org.apache.camel.model.dataformat.AvroDataFormat" : {
         "type" : "object",
         "properties" : {
-          "allowEmptyStream" : {
+          "allowJmsType" : {
             "type" : "boolean"
           },
-          "classType" : {
-            "type" : "string"
+          "allowUnmarshallType" : {
+            "type" : "boolean"
           },
-          "id" : {
-            "type" : "string"
+          "autoDiscoverObjectMapper" : {
+            "type" : "boolean"
           },
-          "locale" : {
-            "type" : "string"
+          "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"
+          },
+          "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" : {
+            "type" : "string"
           },
           "type" : {
             "type" : "string",
@@ -4523,187 +4415,179 @@
         }
       },
       "org.apache.camel.model.dataformat.CsvDataFormat" : {
-        "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"
-            }
-          }
-        } ]
-      },
-      "org.apache.camel.model.dataformat.CustomDataFormat" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "id" : {
-              "type" : "string"
-            },
-            "ref" : {
-              "type" : "string"
-            }
-          }
-        } ],
-        "required" : [ "ref" ]
-      },
-      "org.apache.camel.model.dataformat.DataFormatsDefinition" : {
         "type" : "object",
         "properties" : {
-          "any23" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Any23DataFormat"
-          },
-          "asn1" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ASN1DataFormat"
+          "allowMissingColumnNames" : {
+            "type" : "boolean"
           },
-          "avro" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.AvroDataFormat"
+          "captureHeaderRecord" : {
+            "type" : "boolean"
           },
-          "barcode" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.BarcodeDataFormat"
+          "commentMarker" : {
+            "type" : "string"
           },
-          "base64" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Base64DataFormat"
+          "commentMarkerDisabled" : {
+            "type" : "boolean"
           },
-          "bindy" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.BindyDataFormat"
+          "delimiter" : {
+            "type" : "string"
           },
-          "cbor" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CBORDataFormat"
+          "escape" : {
+            "type" : "string"
           },
-          "crypto" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CryptoDataFormat"
+          "escapeDisabled" : {
+            "type" : "boolean"
           },
-          "csv" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CsvDataFormat"
+          "formatName" : {
+            "type" : "string",
+            "enum" : [ "DEFAULT", "EXCEL", "INFORMIX_UNLOAD", "INFORMIX_UNLOAD_CSV", "MYSQL", "RFC4180" ]
           },
-          "custom" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CustomDataFormat"
+          "formatRef" : {
+            "type" : "string"
           },
-          "fhirJson" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FhirJsonDataFormat"
+          "header" : {
+            "type" : "array",
+            "items" : {
+              "type" : "string"
+            }
           },
-          "fhirXml" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FhirXmlDataFormat"
+          "headerDisabled" : {
+            "type" : "boolean"
           },
-          "flatpack" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FlatpackDataFormat"
+          "id" : {
+            "type" : "string"
           },
-          "grok" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GrokDataFormat"
+          "ignoreEmptyLines" : {
+            "type" : "boolean"
           },
-          "gzipDeflater" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GzipDeflaterDataFormat"
+          "ignoreHeaderCase" : {
+            "type" : "boolean"
           },
-          "hl7" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.HL7DataFormat"
+          "ignoreSurroundingSpaces" : {
+            "type" : "boolean"
           },
-          "ical" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.IcalDataFormat"
+          "lazyLoad" : {
+            "type" : "boolean"
           },
-          "jacksonXml" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JacksonXMLDataFormat"
+          "marshallerFactoryRef" : {
+            "type" : "string"
           },
-          "jaxb" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JaxbDataFormat"
+          "nullString" : {
+            "type" : "string"
           },
-          "json" : {
-            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JsonDataFormat"
+          "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"
+          }
+        },
+        "required" : [ "ref" ]
+      },
+      "org.apache.camel.model.dataformat.DataFormatsDefinition" : {
+        "type" : "object",
+        "properties" : {
+          "any23" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Any23DataFormat"
+          },
+          "asn1" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.ASN1DataFormat"
+          },
+          "avro" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.AvroDataFormat"
+          },
+          "barcode" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.BarcodeDataFormat"
+          },
+          "base64" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.Base64DataFormat"
+          },
+          "bindy" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.BindyDataFormat"
+          },
+          "cbor" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CBORDataFormat"
+          },
+          "crypto" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CryptoDataFormat"
+          },
+          "csv" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CsvDataFormat"
+          },
+          "custom" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.CustomDataFormat"
+          },
+          "fhirJson" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FhirJsonDataFormat"
+          },
+          "fhirXml" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FhirXmlDataFormat"
+          },
+          "flatpack" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.FlatpackDataFormat"
+          },
+          "grok" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GrokDataFormat"
+          },
+          "gzipDeflater" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.GzipDeflaterDataFormat"
+          },
+          "hl7" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.HL7DataFormat"
+          },
+          "ical" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.IcalDataFormat"
+          },
+          "jacksonXml" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JacksonXMLDataFormat"
+          },
+          "jaxb" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JaxbDataFormat"
+          },
+          "json" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JsonDataFormat"
           },
           "jsonApi" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.dataformat.JsonApiDataFormat"
@@ -5264,158 +5148,146 @@
         }
       },
       "org.apache.camel.model.dataformat.ProtobufDataFormat" : {
-        "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",
         "properties" : {
-          "id" : {
+          "allowJmsType" : {
+            "type" : "boolean"
+          },
+          "allowUnmarshallType" : {
+            "type" : "boolean"
+          },
+          "autoDiscoverObjectMapper" : {
+            "type" : "boolean"
+          },
+          "autoDiscoverSchemaResolver" : {
+            "type" : "boolean"
+          },
+          "collectionType" : {
             "type" : "string"
-          }
-        }
-      },
-      "org.apache.camel.model.dataformat.SoapDataFormat" : {
-        "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" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "id" : {
-              "type" : "string"
-            },
-            "writeInJson" : {
-              "type" : "boolean"
-            }
-          }
-        } ]
-      },
-      "org.apache.camel.model.dataformat.SwiftMxDataFormat" : {
-        "type" : "object",
-        "properties" : {
+          },
+          "contentTypeFormat" : {
+            "type" : "string",
+            "enum" : [ "native", "json" ]
+          },
+          "contentTypeHeader" : {
+            "type" : "boolean"
+          },
+          "disableFeatures" : {
+            "type" : "string"
+          },
+          "enableFeatures" : {
+            "type" : "string"
+          },
           "id" : {
             "type" : "string"
           },
-          "readConfigRef" : {
+          "include" : {
             "type" : "string"
           },
-          "readMessageId" : {
+          "instanceClass" : {
             "type" : "string"
           },
-          "writeConfigRef" : {
+          "jsonView" : {
             "type" : "string"
           },
-          "writeInJson" : {
+          "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.SyslogDataFormat" : {
+      "org.apache.camel.model.dataformat.RssDataFormat" : {
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          }
+        }
+      },
+      "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" ]
+          }
+        },
+        "required" : [ "contextPath" ]
+      },
+      "org.apache.camel.model.dataformat.SwiftMtDataFormat" : {
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          },
+          "writeInJson" : {
+            "type" : "boolean"
+          }
+        }
+      },
+      "org.apache.camel.model.dataformat.SwiftMxDataFormat" : {
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          },
+          "readConfigRef" : {
+            "type" : "string"
+          },
+          "readMessageId" : {
+            "type" : "string"
+          },
+          "writeConfigRef" : {
+            "type" : "string"
+          },
+          "writeInJson" : {
+            "type" : "boolean"
+          }
+        }
+      },
+      "org.apache.camel.model.dataformat.SyslogDataFormat" : {
         "type" : "object",
         "properties" : {
           "id" : {
@@ -5444,26 +5316,22 @@
         }
       },
       "org.apache.camel.model.dataformat.ThriftDataFormat" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "contentTypeFormat" : {
-              "type" : "string",
-              "enum" : [ "binary", "json", "sjson" ]
-            },
-            "contentTypeHeader" : {
-              "type" : "boolean"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "instanceClass" : {
-              "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",
@@ -5723,59 +5591,55 @@
         }
       },
       "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"
+        "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",
@@ -6090,94 +5954,78 @@
         }
       },
       "org.apache.camel.model.language.CSimpleExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "resultType" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "resultType" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.ConstantExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "resultType" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "resultType" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.DatasonnetExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "bodyMediaType" : {
-              "type" : "string"
-            },
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "outputMediaType" : {
-              "type" : "string"
-            },
-            "resultType" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "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" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.ExpressionDefinition" : {
@@ -6255,182 +6103,154 @@
         }
       },
       "org.apache.camel.model.language.GroovyExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.HeaderExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.Hl7TerserExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.JavaScriptExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "headerName" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "resultType" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "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" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "preCompile" : {
-              "type" : "boolean"
-            },
-            "resultType" : {
-              "type" : "string"
-            },
-            "singleQuotes" : {
-              "type" : "boolean"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "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" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "headerName" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "resultType" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "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" : {
-        "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"
-            }
+        "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" : {
@@ -6452,334 +6272,286 @@
         "required" : [ "expression", "language" ]
       },
       "org.apache.camel.model.language.MethodCallExpression" : {
-        "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"
-            }
+        "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" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.OgnlExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.PythonExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "headerName" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "resultType" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "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"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.SimpleExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "resultType" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "resultType" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.SpELExpression" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "expression" : {
-              "type" : "string"
-            },
-            "id" : {
-              "type" : "string"
-            },
-            "trim" : {
-              "type" : "boolean"
-            }
+        "type" : "object",
+        "properties" : {
+          "expression" : {
+            "type" : "string"
+          },
+          "id" : {
+            "type" : "string"
+          },
+          "trim" : {
+            "type" : "boolean"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.TokenizerExpression" : {
-        "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"
-            }
+        "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" : {
-        "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"
+        "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"
           }
-        } ]
+        }
       },
       "org.apache.camel.model.language.XPathExpression" : {
-        "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"
+        "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"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.language.XQueryExpression" : {
-        "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"
+        "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"
           }
-        } ],
+        },
         "required" : [ "expression" ]
       },
       "org.apache.camel.model.loadbalancer.CustomLoadBalancerDefinition" : {
-        "oneOf" : [ {
-          "type" : "string"
-        }, {
-          "type" : "object",
-          "properties" : {
-            "id" : {
-              "type" : "string"
-            },
-            "ref" : {
-              "type" : "string"
-            }
+        "type" : "object",
+        "properties" : {
+          "id" : {
+            "type" : "string"
+          },
+          "ref" : {
+            "type" : "string"
           }
-        } ],
+        },
         "required" : [ "ref" ]
       },
       "org.apache.camel.model.loadbalancer.FailoverLoadBalancerDefinition" : {