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 2024/05/28 10:25:18 UTC
(camel) 14/47: CAMEL-20798: Add RemoteAddress to endpoints so they can tell the url/hostname etc for the system it connects. This is needed for better monitoring, tracing and management. Add this information into camel-tracer as tags.

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch ra
in repository https://gitbox.apache.org/repos/asf/camel.git

commit abb2f5de8999b986e43d88dccdf0caa0e8d259e9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun May 26 11:05:03 2024 +0200

    CAMEL-20798: Add RemoteAddress to endpoints so they can tell the url/hostname etc for the system it connects. This is needed for better monitoring, tracing and management. Add this information into camel-tracer as tags.
---
 .../org/apache/camel/catalog/components/cql.json   |  59 +-
 .../camel/catalog/components/infinispan.json       |  86 +--
 .../org/apache/camel/catalog/components/kudu.json  |   4 +-
 .../component/infinispan/remote/infinispan.json    |  86 +--
 .../builder/endpoint/StaticEndpointBuilders.java   |   8 +-
 .../dsl/CassandraEndpointBuilderFactory.java       | 662 +++++++++------------
 .../InfinispanRemoteEndpointBuilderFactory.java    | 177 +++---
 .../endpoint/dsl/KuduEndpointBuilderFactory.java   |   8 +-
 .../apache/camel/kotlin/components/CqlUriDsl.kt    | 101 ++--
 .../camel/kotlin/components/InfinispanUriDsl.kt    |  31 +-
 10 files changed, 561 insertions(+), 661 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cql.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cql.json
index 53631807626..2250bc57ab3 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cql.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cql.json
@@ -37,35 +37,34 @@
     "port": { "index": 2, "kind": "path", "displayName": "Port", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "Port number of Cassandra server(s)" },
     "keyspace": { "index": 3, "kind": "path", "displayName": "Keyspace", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Keyspace to use" },
     "clusterName": { "index": 4, "kind": "parameter", "displayName": "Cluster Name", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Cluster name" },
-    "consistencyLevel": { "index": 5, "kind": "parameter", "displayName": "Consistency Level", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.datastax.oss.driver.api.core.DefaultConsistencyLevel", "enum": [ "ANY", "ONE", "TWO", "THREE", "QUORUM", "ALL", "LOCAL_ONE", "LOCAL_QUORUM", "EACH_QUORUM", "SERIAL", "LOCAL_SERIAL" ], "deprecated": false, "autowired": false, "secret": false, "description": "Consistency level to use" },
-    "cql": { "index": 6, "kind": "parameter", "displayName": "Cql", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "CQL query to perform. Can be overridden with the message header with key CamelCqlQuery." },
-    "datacenter": { "index": 7, "kind": "parameter", "displayName": "Datacenter", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "datacenter1", "description": "Datacenter to use" },
-    "extraTypeCodecs": { "index": 8, "kind": "parameter", "displayName": "Extra Type Codecs", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a specific comma separated list of Extra Type codecs. Possible values are: BLOB_TO_ARRAY, BOOLEAN_LIST_TO_ARRAY, BYTE_LIST_TO_ARRAY, SHORT_LIST_TO_ARRAY, INT_LIST_TO_ARRAY, LONG_LIST_TO_ARRAY, FLOAT_LIST_TO_ARRAY, DO [...]
-    "loadBalancingPolicyClass": { "index": 9, "kind": "parameter", "displayName": "Load Balancing Policy Class", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a specific LoadBalancingPolicyClass" },
-    "password": { "index": 10, "kind": "parameter", "displayName": "Password", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Password for session authentication" },
-    "prepareStatements": { "index": 11, "kind": "parameter", "displayName": "Prepare Statements", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to use PreparedStatements or regular Statements" },
-    "resultSetConversionStrategy": { "index": 12, "kind": "parameter", "displayName": "Result Set Conversion Strategy", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.cassandra.ResultSetConversionStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom class that implements logic for converting ResultSet into message body ALL, ONE, LIMIT_10, LIMIT_100..." },
-    "session": { "index": 13, "kind": "parameter", "displayName": "Session", "group": "common", "label": "", "required": false, "type": "object", "javaType": "com.datastax.oss.driver.api.core.CqlSession", "deprecated": false, "autowired": false, "secret": false, "description": "To use the Session instance (you would normally not use this option)" },
-    "username": { "index": 14, "kind": "parameter", "displayName": "Username", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Username for session authentication" },
-    "sendEmptyMessageWhenIdle": { "index": 15, "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
-    "bridgeErrorHandler": { "index": 16, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming [...]
-    "exceptionHandler": { "index": 17, "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By de [...]
-    "exchangePattern": { "index": 18, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
-    "pollStrategy": { "index": 19, "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the po [...]
-    "lazyStartProducer": { "index": 20, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
-    "backoffErrorThreshold": { "index": 21, "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
-    "backoffIdleThreshold": { "index": 22, "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
-    "backoffMultiplier": { "index": 23, "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is h [...]
-    "delay": { "index": 24, "kind": "parameter", "displayName": "Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 500, "description": "Milliseconds before the next poll." },
-    "greedy": { "index": 25, "kind": "parameter", "displayName": "Greedy", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages." },
-    "initialDelay": { "index": 26, "kind": "parameter", "displayName": "Initial Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1000, "description": "Milliseconds before the first poll starts." },
-    "repeatCount": { "index": 27, "kind": "parameter", "displayName": "Repeat Count", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 0, "description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever." },
-    "runLoggingLevel": { "index": 28, "kind": "parameter", "displayName": "Run Logging Level", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "TRACE", "description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the l [...]
-    "scheduledExecutorService": { "index": 29, "kind": "parameter", "displayName": "Scheduled Executor Service", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService", "deprecated": false, "autowired": false, "secret": false, "description": "Allows for configuring a custom\/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool." },
-    "scheduler": { "index": 30, "kind": "parameter", "displayName": "Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "none", "description": "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler" },
-    "schedulerProperties": { "index": 31, "kind": "parameter", "displayName": "Scheduler Properties", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "scheduler.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler." },
-    "startScheduler": { "index": 32, "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the scheduler should be auto started." },
-    "timeUnit": { "index": 33, "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
-    "useFixedDelay": { "index": 34, "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." }
+    "cql": { "index": 5, "kind": "parameter", "displayName": "Cql", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "CQL query to perform. Can be overridden with the message header with key CamelCqlQuery." },
+    "datacenter": { "index": 6, "kind": "parameter", "displayName": "Datacenter", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "datacenter1", "description": "Datacenter to use" },
+    "prepareStatements": { "index": 7, "kind": "parameter", "displayName": "Prepare Statements", "group": "common", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to use PreparedStatements or regular Statements" },
+    "sendEmptyMessageWhenIdle": { "index": 8, "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
+    "bridgeErrorHandler": { "index": 9, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming  [...]
+    "exceptionHandler": { "index": 10, "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By de [...]
+    "exchangePattern": { "index": 11, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
+    "pollStrategy": { "index": 12, "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the po [...]
+    "lazyStartProducer": { "index": 13, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
+    "extraTypeCodecs": { "index": 14, "kind": "parameter", "displayName": "Extra Type Codecs", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a specific comma separated list of Extra Type codecs. Possible values are: BLOB_TO_ARRAY, BOOLEAN_LIST_TO_ARRAY, BYTE_LIST_TO_ARRAY, SHORT_LIST_TO_ARRAY, INT_LIST_TO_ARRAY, LONG_LIST_TO_ARRAY, FLOAT_LIST_T [...]
+    "loadBalancingPolicyClass": { "index": 15, "kind": "parameter", "displayName": "Load Balancing Policy Class", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To use a specific LoadBalancingPolicyClass" },
+    "resultSetConversionStrategy": { "index": 16, "kind": "parameter", "displayName": "Result Set Conversion Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.cassandra.ResultSetConversionStrategy", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom class that implements logic for converting ResultSet into message body ALL, ONE, LIMIT_10, LIMIT_100..." },
+    "session": { "index": 17, "kind": "parameter", "displayName": "Session", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.datastax.oss.driver.api.core.CqlSession", "deprecated": false, "autowired": false, "secret": false, "description": "To use the Session instance (you would normally not use this option)" },
+    "backoffErrorThreshold": { "index": 18, "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
+    "backoffIdleThreshold": { "index": 19, "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
+    "backoffMultiplier": { "index": 20, "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is h [...]
+    "delay": { "index": 21, "kind": "parameter", "displayName": "Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 500, "description": "Milliseconds before the next poll." },
+    "greedy": { "index": 22, "kind": "parameter", "displayName": "Greedy", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages." },
+    "initialDelay": { "index": 23, "kind": "parameter", "displayName": "Initial Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 1000, "description": "Milliseconds before the first poll starts." },
+    "repeatCount": { "index": 24, "kind": "parameter", "displayName": "Repeat Count", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 0, "description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever." },
+    "runLoggingLevel": { "index": 25, "kind": "parameter", "displayName": "Run Logging Level", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "TRACE", "description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the l [...]
+    "scheduledExecutorService": { "index": 26, "kind": "parameter", "displayName": "Scheduled Executor Service", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService", "deprecated": false, "autowired": false, "secret": false, "description": "Allows for configuring a custom\/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool." },
+    "scheduler": { "index": 27, "kind": "parameter", "displayName": "Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "none", "description": "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler" },
+    "schedulerProperties": { "index": 28, "kind": "parameter", "displayName": "Scheduler Properties", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "scheduler.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler." },
+    "startScheduler": { "index": 29, "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the scheduler should be auto started." },
+    "timeUnit": { "index": 30, "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
+    "useFixedDelay": { "index": 31, "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
+    "password": { "index": 32, "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Password for session authentication" },
+    "username": { "index": 33, "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "description": "Username for session authentication" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan.json
index 809751e7153..778d4091f74 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/infinispan.json
@@ -24,28 +24,28 @@
   },
   "componentProperties": {
     "configuration": { "index": 0, "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "Component configuration" },
-    "hosts": { "index": 1, "kind": "property", "displayName": "Hosts", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the host of the cache on Infinispan instance" },
+    "hosts": { "index": 1, "kind": "property", "displayName": "Hosts", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the host of the cache on Infinispan instance. Multiple hosts can be separated by semicolon." },
     "queryBuilder": { "index": 2, "kind": "property", "displayName": "Query Builder", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.InfinispanQueryBuilder", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the query builder." },
-    "secure": { "index": 3, "kind": "property", "displayName": "Secure", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define if we are connecting to a secured Infinispan instance" },
-    "bridgeErrorHandler": { "index": 4, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the like [...]
-    "customListener": { "index": 5, "kind": "property", "displayName": "Custom Listener", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteCustomListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Returns the custom  [...]
-    "eventTypes": { "index": 6, "kind": "property", "displayName": "Event Types", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the set of event types to register by the consumer.Multiple event can be sep [...]
-    "defaultValue": { "index": 7, "kind": "property", "displayName": "Default Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific default value for some producer operations" },
-    "key": { "index": 8, "kind": "property", "displayName": "Key", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific key for producer operations" },
-    "lazyStartProducer": { "index": 9, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
-    "oldValue": { "index": 10, "kind": "property", "displayName": "Old Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific old value for some producer operations" },
-    "operation": { "index": 11, "kind": "property", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.InfinispanOperation", "enum": [ "PUT", "PUTASYNC", "PUTALL", "PUTALLASYNC", "PUTIFABSENT", "PUTIFABSENTASYNC", "GET", "GETORDEFAULT", "CONTAINSKEY", "CONTAINSVALUE", "REMOVE", "REMOVEASYNC", "REPLACE", "REPLACEASYNC", "SIZE", "CLEAR", "CLEARASYNC", "QUERY", "STATS", "COMPUTE", "COM [...]
-    "value": { "index": 12, "kind": "property", "displayName": "Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific value for producer operations" },
-    "autowiredEnabled": { "index": 13, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching  [...]
-    "cacheContainer": { "index": 14, "kind": "property", "displayName": "Cache Container", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.RemoteCacheManager", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the cache Cont [...]
-    "cacheContainerConfiguration": { "index": 15, "kind": "property", "displayName": "Cache Container Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.configuration.Configuration", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "des [...]
-    "configurationProperties": { "index": 16, "kind": "property", "displayName": "Configuration Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Implementation specific pr [...]
-    "configurationUri": { "index": 17, "kind": "property", "displayName": "Configuration Uri", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "An implementation sp [...]
-    "flags": { "index": 18, "kind": "property", "displayName": "Flags", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "A comma separated list of org.infinispan.client.hotrod.Flag to be applied by default on each cac [...]
-    "remappingFunction": { "index": 19, "kind": "property", "displayName": "Remapping Function", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.function.BiFunction", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific remappingFunction to use in a compute opera [...]
-    "resultHeader": { "index": 20, "kind": "property", "displayName": "Result Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Store the operation result in a header instead of the message body. By default, r [...]
-    "password": { "index": 21, "kind": "property", "displayName": "Password", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the password to access the infinispan instance" },
-    "saslMechanism": { "index": 22, "kind": "property", "displayName": "Sasl Mechanism", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the SASL Mechanism to access the infinispan instance" },
+    "bridgeErrorHandler": { "index": 3, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the like [...]
+    "customListener": { "index": 4, "kind": "property", "displayName": "Custom Listener", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteCustomListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Returns the custom  [...]
+    "eventTypes": { "index": 5, "kind": "property", "displayName": "Event Types", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the set of event types to register by the consumer.Multiple event can be sep [...]
+    "defaultValue": { "index": 6, "kind": "property", "displayName": "Default Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific default value for some producer operations" },
+    "key": { "index": 7, "kind": "property", "displayName": "Key", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific key for producer operations" },
+    "lazyStartProducer": { "index": 8, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
+    "oldValue": { "index": 9, "kind": "property", "displayName": "Old Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific old value for some producer operations" },
+    "operation": { "index": 10, "kind": "property", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.InfinispanOperation", "enum": [ "PUT", "PUTASYNC", "PUTALL", "PUTALLASYNC", "PUTIFABSENT", "PUTIFABSENTASYNC", "GET", "GETORDEFAULT", "CONTAINSKEY", "CONTAINSVALUE", "REMOVE", "REMOVEASYNC", "REPLACE", "REPLACEASYNC", "SIZE", "CLEAR", "CLEARASYNC", "QUERY", "STATS", "COMPUTE", "COM [...]
+    "value": { "index": 11, "kind": "property", "displayName": "Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific value for producer operations" },
+    "autowiredEnabled": { "index": 12, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching  [...]
+    "cacheContainer": { "index": 13, "kind": "property", "displayName": "Cache Container", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.RemoteCacheManager", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the cache Cont [...]
+    "cacheContainerConfiguration": { "index": 14, "kind": "property", "displayName": "Cache Container Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.configuration.Configuration", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "des [...]
+    "configurationProperties": { "index": 15, "kind": "property", "displayName": "Configuration Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Implementation specific pr [...]
+    "configurationUri": { "index": 16, "kind": "property", "displayName": "Configuration Uri", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "An implementation sp [...]
+    "flags": { "index": 17, "kind": "property", "displayName": "Flags", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "A comma separated list of org.infinispan.client.hotrod.Flag to be applied by default on each cac [...]
+    "remappingFunction": { "index": 18, "kind": "property", "displayName": "Remapping Function", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.function.BiFunction", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific remappingFunction to use in a compute opera [...]
+    "resultHeader": { "index": 19, "kind": "property", "displayName": "Result Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Store the operation result in a header instead of the message body. By default, r [...]
+    "password": { "index": 20, "kind": "property", "displayName": "Password", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the password to access the infinispan instance" },
+    "saslMechanism": { "index": 21, "kind": "property", "displayName": "Sasl Mechanism", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the SASL Mechanism to access the infinispan instance" },
+    "secure": { "index": 22, "kind": "property", "displayName": "Secure", "group": "security", "label": "common,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define if we are connecting to a secured Infinispan instance" },
     "securityRealm": { "index": 23, "kind": "property", "displayName": "Security Realm", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the security realm to access the infinispan instance" },
     "securityServerName": { "index": 24, "kind": "property", "displayName": "Security Server Name", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the security server name to access the infinispan inst [...]
     "username": { "index": 25, "kind": "property", "displayName": "Username", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the username to access the infinispan instance" }
@@ -72,29 +72,29 @@
   },
   "properties": {
     "cacheName": { "index": 0, "kind": "path", "displayName": "Cache Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name of the cache to use. Use current to use the existing cache name from the currently configured cached manager. Or use default for the default cache manager name." },
-    "hosts": { "index": 1, "kind": "parameter", "displayName": "Hosts", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the host of the cache on Infinispan instance" },
+    "hosts": { "index": 1, "kind": "parameter", "displayName": "Hosts", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the host of the cache on Infinispan instance. Multiple hosts can be separated by semicolon." },
     "queryBuilder": { "index": 2, "kind": "parameter", "displayName": "Query Builder", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.InfinispanQueryBuilder", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the query builder." },
-    "secure": { "index": 3, "kind": "parameter", "displayName": "Secure", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define if we are connecting to a secured Infinispan instance" },
-    "customListener": { "index": 4, "kind": "parameter", "displayName": "Custom Listener", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteCustomListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Returns the custom [...]
-    "eventTypes": { "index": 5, "kind": "parameter", "displayName": "Event Types", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the set of event types to register by the consumer.Multiple event can be se [...]
-    "bridgeErrorHandler": { "index": 6, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming  [...]
-    "exceptionHandler": { "index": 7, "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By def [...]
-    "exchangePattern": { "index": 8, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
-    "defaultValue": { "index": 9, "kind": "parameter", "displayName": "Default Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific default value for some producer operations" },
-    "key": { "index": 10, "kind": "parameter", "displayName": "Key", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific key for producer operations" },
-    "oldValue": { "index": 11, "kind": "parameter", "displayName": "Old Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific old value for some producer operations" },
-    "operation": { "index": 12, "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.InfinispanOperation", "enum": [ "PUT", "PUTASYNC", "PUTALL", "PUTALLASYNC", "PUTIFABSENT", "PUTIFABSENTASYNC", "GET", "GETORDEFAULT", "CONTAINSKEY", "CONTAINSVALUE", "REMOVE", "REMOVEASYNC", "REPLACE", "REPLACEASYNC", "SIZE", "CLEAR", "CLEARASYNC", "QUERY", "STATS", "COMPUTE", "CO [...]
-    "value": { "index": 13, "kind": "parameter", "displayName": "Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific value for producer operations" },
-    "lazyStartProducer": { "index": 14, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
-    "cacheContainer": { "index": 15, "kind": "parameter", "displayName": "Cache Container", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.RemoteCacheManager", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the cache Con [...]
-    "cacheContainerConfiguration": { "index": 16, "kind": "parameter", "displayName": "Cache Container Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.configuration.Configuration", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "de [...]
-    "configurationProperties": { "index": 17, "kind": "parameter", "displayName": "Configuration Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Implementation specific p [...]
-    "configurationUri": { "index": 18, "kind": "parameter", "displayName": "Configuration Uri", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "An implementation s [...]
-    "flags": { "index": 19, "kind": "parameter", "displayName": "Flags", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "A comma separated list of org.infinispan.client.hotrod.Flag to be applied by default on each ca [...]
-    "remappingFunction": { "index": 20, "kind": "parameter", "displayName": "Remapping Function", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.function.BiFunction", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific remappingFunction to use in a compute oper [...]
-    "resultHeader": { "index": 21, "kind": "parameter", "displayName": "Result Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Store the operation result in a header instead of the message body. By default,  [...]
-    "password": { "index": 22, "kind": "parameter", "displayName": "Password", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the password to access the infinispan instance" },
-    "saslMechanism": { "index": 23, "kind": "parameter", "displayName": "Sasl Mechanism", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the SASL Mechanism to access the infinispan instance" },
+    "customListener": { "index": 3, "kind": "parameter", "displayName": "Custom Listener", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteCustomListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Returns the custom [...]
+    "eventTypes": { "index": 4, "kind": "parameter", "displayName": "Event Types", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the set of event types to register by the consumer.Multiple event can be se [...]
+    "bridgeErrorHandler": { "index": 5, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming  [...]
+    "exceptionHandler": { "index": 6, "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By def [...]
+    "exchangePattern": { "index": 7, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
+    "defaultValue": { "index": 8, "kind": "parameter", "displayName": "Default Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific default value for some producer operations" },
+    "key": { "index": 9, "kind": "parameter", "displayName": "Key", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific key for producer operations" },
+    "oldValue": { "index": 10, "kind": "parameter", "displayName": "Old Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific old value for some producer operations" },
+    "operation": { "index": 11, "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.InfinispanOperation", "enum": [ "PUT", "PUTASYNC", "PUTALL", "PUTALLASYNC", "PUTIFABSENT", "PUTIFABSENTASYNC", "GET", "GETORDEFAULT", "CONTAINSKEY", "CONTAINSVALUE", "REMOVE", "REMOVEASYNC", "REPLACE", "REPLACEASYNC", "SIZE", "CLEAR", "CLEARASYNC", "QUERY", "STATS", "COMPUTE", "CO [...]
+    "value": { "index": 12, "kind": "parameter", "displayName": "Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific value for producer operations" },
+    "lazyStartProducer": { "index": 13, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
+    "cacheContainer": { "index": 14, "kind": "parameter", "displayName": "Cache Container", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.RemoteCacheManager", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the cache Con [...]
+    "cacheContainerConfiguration": { "index": 15, "kind": "parameter", "displayName": "Cache Container Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.configuration.Configuration", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "de [...]
+    "configurationProperties": { "index": 16, "kind": "parameter", "displayName": "Configuration Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Implementation specific p [...]
+    "configurationUri": { "index": 17, "kind": "parameter", "displayName": "Configuration Uri", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "An implementation s [...]
+    "flags": { "index": 18, "kind": "parameter", "displayName": "Flags", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "A comma separated list of org.infinispan.client.hotrod.Flag to be applied by default on each ca [...]
+    "remappingFunction": { "index": 19, "kind": "parameter", "displayName": "Remapping Function", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.function.BiFunction", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific remappingFunction to use in a compute oper [...]
+    "resultHeader": { "index": 20, "kind": "parameter", "displayName": "Result Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Store the operation result in a header instead of the message body. By default,  [...]
+    "password": { "index": 21, "kind": "parameter", "displayName": "Password", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the password to access the infinispan instance" },
+    "saslMechanism": { "index": 22, "kind": "parameter", "displayName": "Sasl Mechanism", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the SASL Mechanism to access the infinispan instance" },
+    "secure": { "index": 23, "kind": "parameter", "displayName": "Secure", "group": "security", "label": "common,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define if we are connecting to a secured Infinispan instance" },
     "securityRealm": { "index": 24, "kind": "parameter", "displayName": "Security Realm", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the security realm to access the infinispan instance" },
     "securityServerName": { "index": 25, "kind": "parameter", "displayName": "Security Server Name", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the security server name to access the infinispan ins [...]
     "username": { "index": 26, "kind": "parameter", "displayName": "Username", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the username to access the infinispan instance" }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kudu.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kudu.json
index 7d9401c167d..d0309c30780 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kudu.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kudu.json
@@ -35,8 +35,8 @@
     "CamelKuduScanLimit": { "index": 4, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The limit on the number of rows for scan operation", "constantName": "org.apache.camel.component.kudu.KuduConstants#CAMEL_KUDU_SCAN_LIMIT" }
   },
   "properties": {
-    "host": { "index": 0, "kind": "path", "displayName": "Host", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Host of the server to connect to" },
-    "port": { "index": 1, "kind": "path", "displayName": "Port", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Port of the server to connect to" },
+    "host": { "index": 0, "kind": "path", "displayName": "Host", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Host of the server to connect to" },
+    "port": { "index": 1, "kind": "path", "displayName": "Port", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Port of the server to connect to" },
     "tableName": { "index": 2, "kind": "path", "displayName": "Table Name", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Table to connect to" },
     "operation": { "index": 3, "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.kudu.KuduOperations", "enum": [ "INSERT", "DELETE", "UPDATE", "UPSERT", "CREATE_TABLE", "SCAN" ], "deprecated": false, "autowired": false, "secret": false, "description": "Operation to perform" },
     "lazyStartProducer": { "index": 4, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produc [...]
diff --git a/components/camel-infinispan/camel-infinispan/src/generated/resources/META-INF/org/apache/camel/component/infinispan/remote/infinispan.json b/components/camel-infinispan/camel-infinispan/src/generated/resources/META-INF/org/apache/camel/component/infinispan/remote/infinispan.json
index 809751e7153..778d4091f74 100644
--- a/components/camel-infinispan/camel-infinispan/src/generated/resources/META-INF/org/apache/camel/component/infinispan/remote/infinispan.json
+++ b/components/camel-infinispan/camel-infinispan/src/generated/resources/META-INF/org/apache/camel/component/infinispan/remote/infinispan.json
@@ -24,28 +24,28 @@
   },
   "componentProperties": {
     "configuration": { "index": 0, "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "Component configuration" },
-    "hosts": { "index": 1, "kind": "property", "displayName": "Hosts", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the host of the cache on Infinispan instance" },
+    "hosts": { "index": 1, "kind": "property", "displayName": "Hosts", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the host of the cache on Infinispan instance. Multiple hosts can be separated by semicolon." },
     "queryBuilder": { "index": 2, "kind": "property", "displayName": "Query Builder", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.InfinispanQueryBuilder", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the query builder." },
-    "secure": { "index": 3, "kind": "property", "displayName": "Secure", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define if we are connecting to a secured Infinispan instance" },
-    "bridgeErrorHandler": { "index": 4, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the like [...]
-    "customListener": { "index": 5, "kind": "property", "displayName": "Custom Listener", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteCustomListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Returns the custom  [...]
-    "eventTypes": { "index": 6, "kind": "property", "displayName": "Event Types", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the set of event types to register by the consumer.Multiple event can be sep [...]
-    "defaultValue": { "index": 7, "kind": "property", "displayName": "Default Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific default value for some producer operations" },
-    "key": { "index": 8, "kind": "property", "displayName": "Key", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific key for producer operations" },
-    "lazyStartProducer": { "index": 9, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
-    "oldValue": { "index": 10, "kind": "property", "displayName": "Old Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific old value for some producer operations" },
-    "operation": { "index": 11, "kind": "property", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.InfinispanOperation", "enum": [ "PUT", "PUTASYNC", "PUTALL", "PUTALLASYNC", "PUTIFABSENT", "PUTIFABSENTASYNC", "GET", "GETORDEFAULT", "CONTAINSKEY", "CONTAINSVALUE", "REMOVE", "REMOVEASYNC", "REPLACE", "REPLACEASYNC", "SIZE", "CLEAR", "CLEARASYNC", "QUERY", "STATS", "COMPUTE", "COM [...]
-    "value": { "index": 12, "kind": "property", "displayName": "Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific value for producer operations" },
-    "autowiredEnabled": { "index": 13, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching  [...]
-    "cacheContainer": { "index": 14, "kind": "property", "displayName": "Cache Container", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.RemoteCacheManager", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the cache Cont [...]
-    "cacheContainerConfiguration": { "index": 15, "kind": "property", "displayName": "Cache Container Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.configuration.Configuration", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "des [...]
-    "configurationProperties": { "index": 16, "kind": "property", "displayName": "Configuration Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Implementation specific pr [...]
-    "configurationUri": { "index": 17, "kind": "property", "displayName": "Configuration Uri", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "An implementation sp [...]
-    "flags": { "index": 18, "kind": "property", "displayName": "Flags", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "A comma separated list of org.infinispan.client.hotrod.Flag to be applied by default on each cac [...]
-    "remappingFunction": { "index": 19, "kind": "property", "displayName": "Remapping Function", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.function.BiFunction", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific remappingFunction to use in a compute opera [...]
-    "resultHeader": { "index": 20, "kind": "property", "displayName": "Result Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Store the operation result in a header instead of the message body. By default, r [...]
-    "password": { "index": 21, "kind": "property", "displayName": "Password", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the password to access the infinispan instance" },
-    "saslMechanism": { "index": 22, "kind": "property", "displayName": "Sasl Mechanism", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the SASL Mechanism to access the infinispan instance" },
+    "bridgeErrorHandler": { "index": 3, "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming messages, or the like [...]
+    "customListener": { "index": 4, "kind": "property", "displayName": "Custom Listener", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteCustomListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Returns the custom  [...]
+    "eventTypes": { "index": 5, "kind": "property", "displayName": "Event Types", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the set of event types to register by the consumer.Multiple event can be sep [...]
+    "defaultValue": { "index": 6, "kind": "property", "displayName": "Default Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific default value for some producer operations" },
+    "key": { "index": 7, "kind": "property", "displayName": "Key", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific key for producer operations" },
+    "lazyStartProducer": { "index": 8, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...]
+    "oldValue": { "index": 9, "kind": "property", "displayName": "Old Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific old value for some producer operations" },
+    "operation": { "index": 10, "kind": "property", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.InfinispanOperation", "enum": [ "PUT", "PUTASYNC", "PUTALL", "PUTALLASYNC", "PUTIFABSENT", "PUTIFABSENTASYNC", "GET", "GETORDEFAULT", "CONTAINSKEY", "CONTAINSVALUE", "REMOVE", "REMOVEASYNC", "REPLACE", "REPLACEASYNC", "SIZE", "CLEAR", "CLEARASYNC", "QUERY", "STATS", "COMPUTE", "COM [...]
+    "value": { "index": 11, "kind": "property", "displayName": "Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific value for producer operations" },
+    "autowiredEnabled": { "index": 12, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching  [...]
+    "cacheContainer": { "index": 13, "kind": "property", "displayName": "Cache Container", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.RemoteCacheManager", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the cache Cont [...]
+    "cacheContainerConfiguration": { "index": 14, "kind": "property", "displayName": "Cache Container Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.configuration.Configuration", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "des [...]
+    "configurationProperties": { "index": 15, "kind": "property", "displayName": "Configuration Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Implementation specific pr [...]
+    "configurationUri": { "index": 16, "kind": "property", "displayName": "Configuration Uri", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "An implementation sp [...]
+    "flags": { "index": 17, "kind": "property", "displayName": "Flags", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "A comma separated list of org.infinispan.client.hotrod.Flag to be applied by default on each cac [...]
+    "remappingFunction": { "index": 18, "kind": "property", "displayName": "Remapping Function", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.function.BiFunction", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific remappingFunction to use in a compute opera [...]
+    "resultHeader": { "index": 19, "kind": "property", "displayName": "Result Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Store the operation result in a header instead of the message body. By default, r [...]
+    "password": { "index": 20, "kind": "property", "displayName": "Password", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the password to access the infinispan instance" },
+    "saslMechanism": { "index": 21, "kind": "property", "displayName": "Sasl Mechanism", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the SASL Mechanism to access the infinispan instance" },
+    "secure": { "index": 22, "kind": "property", "displayName": "Secure", "group": "security", "label": "common,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define if we are connecting to a secured Infinispan instance" },
     "securityRealm": { "index": 23, "kind": "property", "displayName": "Security Realm", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the security realm to access the infinispan instance" },
     "securityServerName": { "index": 24, "kind": "property", "displayName": "Security Server Name", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the security server name to access the infinispan inst [...]
     "username": { "index": 25, "kind": "property", "displayName": "Username", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the username to access the infinispan instance" }
@@ -72,29 +72,29 @@
   },
   "properties": {
     "cacheName": { "index": 0, "kind": "path", "displayName": "Cache Name", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name of the cache to use. Use current to use the existing cache name from the currently configured cached manager. Or use default for the default cache manager name." },
-    "hosts": { "index": 1, "kind": "parameter", "displayName": "Hosts", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the host of the cache on Infinispan instance" },
+    "hosts": { "index": 1, "kind": "parameter", "displayName": "Hosts", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the host of the cache on Infinispan instance. Multiple hosts can be separated by semicolon." },
     "queryBuilder": { "index": 2, "kind": "parameter", "displayName": "Query Builder", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.InfinispanQueryBuilder", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the query builder." },
-    "secure": { "index": 3, "kind": "parameter", "displayName": "Secure", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define if we are connecting to a secured Infinispan instance" },
-    "customListener": { "index": 4, "kind": "parameter", "displayName": "Custom Listener", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteCustomListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Returns the custom [...]
-    "eventTypes": { "index": 5, "kind": "parameter", "displayName": "Event Types", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the set of event types to register by the consumer.Multiple event can be se [...]
-    "bridgeErrorHandler": { "index": 6, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming  [...]
-    "exceptionHandler": { "index": 7, "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By def [...]
-    "exchangePattern": { "index": 8, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
-    "defaultValue": { "index": 9, "kind": "parameter", "displayName": "Default Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific default value for some producer operations" },
-    "key": { "index": 10, "kind": "parameter", "displayName": "Key", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific key for producer operations" },
-    "oldValue": { "index": 11, "kind": "parameter", "displayName": "Old Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific old value for some producer operations" },
-    "operation": { "index": 12, "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.InfinispanOperation", "enum": [ "PUT", "PUTASYNC", "PUTALL", "PUTALLASYNC", "PUTIFABSENT", "PUTIFABSENTASYNC", "GET", "GETORDEFAULT", "CONTAINSKEY", "CONTAINSVALUE", "REMOVE", "REMOVEASYNC", "REPLACE", "REPLACEASYNC", "SIZE", "CLEAR", "CLEARASYNC", "QUERY", "STATS", "COMPUTE", "CO [...]
-    "value": { "index": 13, "kind": "parameter", "displayName": "Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific value for producer operations" },
-    "lazyStartProducer": { "index": 14, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
-    "cacheContainer": { "index": 15, "kind": "parameter", "displayName": "Cache Container", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.RemoteCacheManager", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the cache Con [...]
-    "cacheContainerConfiguration": { "index": 16, "kind": "parameter", "displayName": "Cache Container Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.configuration.Configuration", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "de [...]
-    "configurationProperties": { "index": 17, "kind": "parameter", "displayName": "Configuration Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Implementation specific p [...]
-    "configurationUri": { "index": 18, "kind": "parameter", "displayName": "Configuration Uri", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "An implementation s [...]
-    "flags": { "index": 19, "kind": "parameter", "displayName": "Flags", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "A comma separated list of org.infinispan.client.hotrod.Flag to be applied by default on each ca [...]
-    "remappingFunction": { "index": 20, "kind": "parameter", "displayName": "Remapping Function", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.function.BiFunction", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific remappingFunction to use in a compute oper [...]
-    "resultHeader": { "index": 21, "kind": "parameter", "displayName": "Result Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Store the operation result in a header instead of the message body. By default,  [...]
-    "password": { "index": 22, "kind": "parameter", "displayName": "Password", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the password to access the infinispan instance" },
-    "saslMechanism": { "index": 23, "kind": "parameter", "displayName": "Sasl Mechanism", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the SASL Mechanism to access the infinispan instance" },
+    "customListener": { "index": 3, "kind": "parameter", "displayName": "Custom Listener", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.remote.InfinispanRemoteCustomListener", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Returns the custom [...]
+    "eventTypes": { "index": 4, "kind": "parameter", "displayName": "Event Types", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the set of event types to register by the consumer.Multiple event can be se [...]
+    "bridgeErrorHandler": { "index": 5, "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions (if possible) occurred while the Camel consumer is trying to pickup incoming  [...]
+    "exceptionHandler": { "index": 6, "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By def [...]
+    "exchangePattern": { "index": 7, "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
+    "defaultValue": { "index": 8, "kind": "parameter", "displayName": "Default Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific default value for some producer operations" },
+    "key": { "index": 9, "kind": "parameter", "displayName": "Key", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific key for producer operations" },
+    "oldValue": { "index": 10, "kind": "parameter", "displayName": "Old Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific old value for some producer operations" },
+    "operation": { "index": 11, "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.infinispan.InfinispanOperation", "enum": [ "PUT", "PUTASYNC", "PUTALL", "PUTALLASYNC", "PUTIFABSENT", "PUTIFABSENTASYNC", "GET", "GETORDEFAULT", "CONTAINSKEY", "CONTAINSVALUE", "REMOVE", "REMOVEASYNC", "REPLACE", "REPLACEASYNC", "SIZE", "CLEAR", "CLEARASYNC", "QUERY", "STATS", "COMPUTE", "CO [...]
+    "value": { "index": 12, "kind": "parameter", "displayName": "Value", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific value for producer operations" },
+    "lazyStartProducer": { "index": 13, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produ [...]
+    "cacheContainer": { "index": 14, "kind": "parameter", "displayName": "Cache Container", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.RemoteCacheManager", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Specifies the cache Con [...]
+    "cacheContainerConfiguration": { "index": 15, "kind": "parameter", "displayName": "Cache Container Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.infinispan.client.hotrod.configuration.Configuration", "deprecated": false, "deprecationNote": "", "autowired": true, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "de [...]
+    "configurationProperties": { "index": 16, "kind": "parameter", "displayName": "Configuration Properties", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Implementation specific p [...]
+    "configurationUri": { "index": 17, "kind": "parameter", "displayName": "Configuration Uri", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "supportFileReference": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "An implementation s [...]
+    "flags": { "index": 18, "kind": "parameter", "displayName": "Flags", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "A comma separated list of org.infinispan.client.hotrod.Flag to be applied by default on each ca [...]
+    "remappingFunction": { "index": 19, "kind": "parameter", "displayName": "Remapping Function", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.function.BiFunction", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Set a specific remappingFunction to use in a compute oper [...]
+    "resultHeader": { "index": 20, "kind": "parameter", "displayName": "Result Header", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Store the operation result in a header instead of the message body. By default,  [...]
+    "password": { "index": 21, "kind": "parameter", "displayName": "Password", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": true, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the password to access the infinispan instance" },
+    "saslMechanism": { "index": 22, "kind": "parameter", "displayName": "Sasl Mechanism", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the SASL Mechanism to access the infinispan instance" },
+    "secure": { "index": 23, "kind": "parameter", "displayName": "Secure", "group": "security", "label": "common,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define if we are connecting to a secured Infinispan instance" },
     "securityRealm": { "index": 24, "kind": "parameter", "displayName": "Security Realm", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the security realm to access the infinispan instance" },
     "securityServerName": { "index": 25, "kind": "parameter", "displayName": "Security Server Name", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the security server name to access the infinispan ins [...]
     "username": { "index": 26, "kind": "parameter", "displayName": "Username", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.infinispan.remote.InfinispanRemoteConfiguration", "configurationField": "configuration", "description": "Define the username to access the infinispan instance" }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 06180c1db97..dcc52dda298 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -9254,10 +9254,10 @@ public class StaticEndpointBuilders {
      * 
      * Syntax: <code>kudu:host:port/tableName</code>
      * 
-     * Path parameter: host
+     * Path parameter: host (required)
      * Host of the server to connect to
      * 
-     * Path parameter: port
+     * Path parameter: port (required)
      * Port of the server to connect to
      * 
      * Path parameter: tableName
@@ -9280,10 +9280,10 @@ public class StaticEndpointBuilders {
      * 
      * Syntax: <code>kudu:host:port/tableName</code>
      * 
-     * Path parameter: host
+     * Path parameter: host (required)
      * Host of the server to connect to
      * 
-     * Path parameter: port
+     * Path parameter: port (required)
      * Port of the server to connect to
      * 
      * Path parameter: tableName
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
index f1affef8e2c..7201ebf5791 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
@@ -58,38 +58,6 @@ public interface CassandraEndpointBuilderFactory {
             doSetProperty("clusterName", clusterName);
             return this;
         }
-        /**
-         * Consistency level to use.
-         * 
-         * The option is a:
-         * <code>com.datastax.oss.driver.api.core.DefaultConsistencyLevel</code>
-         * type.
-         * 
-         * Group: common
-         * 
-         * @param consistencyLevel the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointConsumerBuilder consistencyLevel(com.datastax.oss.driver.api.core.DefaultConsistencyLevel consistencyLevel) {
-            doSetProperty("consistencyLevel", consistencyLevel);
-            return this;
-        }
-        /**
-         * Consistency level to use.
-         * 
-         * The option will be converted to a
-         * <code>com.datastax.oss.driver.api.core.DefaultConsistencyLevel</code>
-         * type.
-         * 
-         * Group: common
-         * 
-         * @param consistencyLevel the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointConsumerBuilder consistencyLevel(String consistencyLevel) {
-            doSetProperty("consistencyLevel", consistencyLevel);
-            return this;
-        }
         /**
          * CQL query to perform. Can be overridden with the message header with
          * key CamelCqlQuery.
@@ -120,55 +88,6 @@ public interface CassandraEndpointBuilderFactory {
             doSetProperty("datacenter", datacenter);
             return this;
         }
-        /**
-         * To use a specific comma separated list of Extra Type codecs. Possible
-         * values are: BLOB_TO_ARRAY, BOOLEAN_LIST_TO_ARRAY, BYTE_LIST_TO_ARRAY,
-         * SHORT_LIST_TO_ARRAY, INT_LIST_TO_ARRAY, LONG_LIST_TO_ARRAY,
-         * FLOAT_LIST_TO_ARRAY, DOUBLE_LIST_TO_ARRAY, TIMESTAMP_UTC,
-         * TIMESTAMP_MILLIS_SYSTEM, TIMESTAMP_MILLIS_UTC,
-         * ZONED_TIMESTAMP_SYSTEM, ZONED_TIMESTAMP_UTC,
-         * ZONED_TIMESTAMP_PERSISTED, LOCAL_TIMESTAMP_SYSTEM and
-         * LOCAL_TIMESTAMP_UTC.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         * 
-         * @param extraTypeCodecs the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointConsumerBuilder extraTypeCodecs(String extraTypeCodecs) {
-            doSetProperty("extraTypeCodecs", extraTypeCodecs);
-            return this;
-        }
-        /**
-         * To use a specific LoadBalancingPolicyClass.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         * 
-         * @param loadBalancingPolicyClass the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointConsumerBuilder loadBalancingPolicyClass(String loadBalancingPolicyClass) {
-            doSetProperty("loadBalancingPolicyClass", loadBalancingPolicyClass);
-            return this;
-        }
-        /**
-         * Password for session authentication.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         * 
-         * @param password the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointConsumerBuilder password(String password) {
-            doSetProperty("password", password);
-            return this;
-        }
         /**
          * Whether to use PreparedStatements or regular Statements.
          * 
@@ -199,82 +118,6 @@ public interface CassandraEndpointBuilderFactory {
             doSetProperty("prepareStatements", prepareStatements);
             return this;
         }
-        /**
-         * To use a custom class that implements logic for converting ResultSet
-         * into message body ALL, ONE, LIMIT_10, LIMIT_100...
-         * 
-         * The option is a:
-         * <code>org.apache.camel.component.cassandra.ResultSetConversionStrategy</code> type.
-         * 
-         * Group: common
-         * 
-         * @param resultSetConversionStrategy the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointConsumerBuilder resultSetConversionStrategy(org.apache.camel.component.cassandra.ResultSetConversionStrategy resultSetConversionStrategy) {
-            doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
-            return this;
-        }
-        /**
-         * To use a custom class that implements logic for converting ResultSet
-         * into message body ALL, ONE, LIMIT_10, LIMIT_100...
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.component.cassandra.ResultSetConversionStrategy</code> type.
-         * 
-         * Group: common
-         * 
-         * @param resultSetConversionStrategy the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointConsumerBuilder resultSetConversionStrategy(String resultSetConversionStrategy) {
-            doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
-            return this;
-        }
-        /**
-         * To use the Session instance (you would normally not use this option).
-         * 
-         * The option is a:
-         * <code>com.datastax.oss.driver.api.core.CqlSession</code> type.
-         * 
-         * Group: common
-         * 
-         * @param session the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointConsumerBuilder session(com.datastax.oss.driver.api.core.CqlSession session) {
-            doSetProperty("session", session);
-            return this;
-        }
-        /**
-         * To use the Session instance (you would normally not use this option).
-         * 
-         * The option will be converted to a
-         * <code>com.datastax.oss.driver.api.core.CqlSession</code> type.
-         * 
-         * Group: common
-         * 
-         * @param session the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointConsumerBuilder session(String session) {
-            doSetProperty("session", session);
-            return this;
-        }
-        /**
-         * Username for session authentication.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         * 
-         * @param username the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointConsumerBuilder username(String username) {
-            doSetProperty("username", username);
-            return this;
-        }
         /**
          * If the polling consumer did not poll any files, you can enable this
          * option to send an empty message (no body) instead.
@@ -762,6 +605,34 @@ public interface CassandraEndpointBuilderFactory {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
+        /**
+         * Password for session authentication.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         * 
+         * @param password the value to set
+         * @return the dsl builder
+         */
+        default CassandraEndpointConsumerBuilder password(String password) {
+            doSetProperty("password", password);
+            return this;
+        }
+        /**
+         * Username for session authentication.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         * 
+         * @param username the value to set
+         * @return the dsl builder
+         */
+        default CassandraEndpointConsumerBuilder username(String username) {
+            doSetProperty("username", username);
+            return this;
+        }
     }
 
     /**
@@ -926,162 +797,163 @@ public interface CassandraEndpointBuilderFactory {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
         }
-    }
-
-    /**
-     * Builder for endpoint producers for the Cassandra CQL component.
-     */
-    public interface CassandraEndpointProducerBuilder
-            extends
-                EndpointProducerBuilder {
-        default AdvancedCassandraEndpointProducerBuilder advanced() {
-            return (AdvancedCassandraEndpointProducerBuilder) this;
-        }
-
         /**
-         * Cluster name.
+         * To use a specific comma separated list of Extra Type codecs. Possible
+         * values are: BLOB_TO_ARRAY, BOOLEAN_LIST_TO_ARRAY, BYTE_LIST_TO_ARRAY,
+         * SHORT_LIST_TO_ARRAY, INT_LIST_TO_ARRAY, LONG_LIST_TO_ARRAY,
+         * FLOAT_LIST_TO_ARRAY, DOUBLE_LIST_TO_ARRAY, TIMESTAMP_UTC,
+         * TIMESTAMP_MILLIS_SYSTEM, TIMESTAMP_MILLIS_UTC,
+         * ZONED_TIMESTAMP_SYSTEM, ZONED_TIMESTAMP_UTC,
+         * ZONED_TIMESTAMP_PERSISTED, LOCAL_TIMESTAMP_SYSTEM and
+         * LOCAL_TIMESTAMP_UTC.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: advanced
          * 
-         * @param clusterName the value to set
+         * @param extraTypeCodecs the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder clusterName(String clusterName) {
-            doSetProperty("clusterName", clusterName);
+        default AdvancedCassandraEndpointConsumerBuilder extraTypeCodecs(String extraTypeCodecs) {
+            doSetProperty("extraTypeCodecs", extraTypeCodecs);
             return this;
         }
         /**
-         * Consistency level to use.
+         * To use a specific LoadBalancingPolicyClass.
          * 
-         * The option is a:
-         * <code>com.datastax.oss.driver.api.core.DefaultConsistencyLevel</code>
-         * type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: advanced
          * 
-         * @param consistencyLevel the value to set
+         * @param loadBalancingPolicyClass the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder consistencyLevel(com.datastax.oss.driver.api.core.DefaultConsistencyLevel consistencyLevel) {
-            doSetProperty("consistencyLevel", consistencyLevel);
+        default AdvancedCassandraEndpointConsumerBuilder loadBalancingPolicyClass(String loadBalancingPolicyClass) {
+            doSetProperty("loadBalancingPolicyClass", loadBalancingPolicyClass);
             return this;
         }
         /**
-         * Consistency level to use.
+         * To use a custom class that implements logic for converting ResultSet
+         * into message body ALL, ONE, LIMIT_10, LIMIT_100...
          * 
-         * The option will be converted to a
-         * <code>com.datastax.oss.driver.api.core.DefaultConsistencyLevel</code>
-         * type.
+         * The option is a:
+         * <code>org.apache.camel.component.cassandra.ResultSetConversionStrategy</code> type.
          * 
-         * Group: common
+         * Group: advanced
          * 
-         * @param consistencyLevel the value to set
+         * @param resultSetConversionStrategy the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder consistencyLevel(String consistencyLevel) {
-            doSetProperty("consistencyLevel", consistencyLevel);
+        default AdvancedCassandraEndpointConsumerBuilder resultSetConversionStrategy(org.apache.camel.component.cassandra.ResultSetConversionStrategy resultSetConversionStrategy) {
+            doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
             return this;
         }
         /**
-         * CQL query to perform. Can be overridden with the message header with
-         * key CamelCqlQuery.
+         * To use a custom class that implements logic for converting ResultSet
+         * into message body ALL, ONE, LIMIT_10, LIMIT_100...
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option will be converted to a
+         * <code>org.apache.camel.component.cassandra.ResultSetConversionStrategy</code> type.
          * 
-         * Group: common
+         * Group: advanced
          * 
-         * @param cql the value to set
+         * @param resultSetConversionStrategy the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder cql(String cql) {
-            doSetProperty("cql", cql);
+        default AdvancedCassandraEndpointConsumerBuilder resultSetConversionStrategy(String resultSetConversionStrategy) {
+            doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
             return this;
         }
         /**
-         * Datacenter to use.
+         * To use the Session instance (you would normally not use this option).
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a:
+         * <code>com.datastax.oss.driver.api.core.CqlSession</code> type.
          * 
-         * Default: datacenter1
-         * Group: common
+         * Group: advanced
          * 
-         * @param datacenter the value to set
+         * @param session the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder datacenter(String datacenter) {
-            doSetProperty("datacenter", datacenter);
+        default AdvancedCassandraEndpointConsumerBuilder session(com.datastax.oss.driver.api.core.CqlSession session) {
+            doSetProperty("session", session);
             return this;
         }
         /**
-         * To use a specific comma separated list of Extra Type codecs. Possible
-         * values are: BLOB_TO_ARRAY, BOOLEAN_LIST_TO_ARRAY, BYTE_LIST_TO_ARRAY,
-         * SHORT_LIST_TO_ARRAY, INT_LIST_TO_ARRAY, LONG_LIST_TO_ARRAY,
-         * FLOAT_LIST_TO_ARRAY, DOUBLE_LIST_TO_ARRAY, TIMESTAMP_UTC,
-         * TIMESTAMP_MILLIS_SYSTEM, TIMESTAMP_MILLIS_UTC,
-         * ZONED_TIMESTAMP_SYSTEM, ZONED_TIMESTAMP_UTC,
-         * ZONED_TIMESTAMP_PERSISTED, LOCAL_TIMESTAMP_SYSTEM and
-         * LOCAL_TIMESTAMP_UTC.
+         * To use the Session instance (you would normally not use this option).
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option will be converted to a
+         * <code>com.datastax.oss.driver.api.core.CqlSession</code> type.
          * 
-         * Group: common
+         * Group: advanced
          * 
-         * @param extraTypeCodecs the value to set
+         * @param session the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder extraTypeCodecs(String extraTypeCodecs) {
-            doSetProperty("extraTypeCodecs", extraTypeCodecs);
+        default AdvancedCassandraEndpointConsumerBuilder session(String session) {
+            doSetProperty("session", session);
             return this;
         }
-        /**
-         * To use a specific LoadBalancingPolicyClass.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
+    }
+
+    /**
+     * Builder for endpoint producers for the Cassandra CQL component.
+     */
+    public interface CassandraEndpointProducerBuilder
+            extends
+                EndpointProducerBuilder {
+        default AdvancedCassandraEndpointProducerBuilder advanced() {
+            return (AdvancedCassandraEndpointProducerBuilder) this;
+        }
+
+        /**
+         * Cluster name.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: common
          * 
-         * @param loadBalancingPolicyClass the value to set
+         * @param clusterName the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder loadBalancingPolicyClass(String loadBalancingPolicyClass) {
-            doSetProperty("loadBalancingPolicyClass", loadBalancingPolicyClass);
+        default CassandraEndpointProducerBuilder clusterName(String clusterName) {
+            doSetProperty("clusterName", clusterName);
             return this;
         }
         /**
-         * Password for session authentication.
+         * CQL query to perform. Can be overridden with the message header with
+         * key CamelCqlQuery.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: common
          * 
-         * @param password the value to set
+         * @param cql the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder password(String password) {
-            doSetProperty("password", password);
+        default CassandraEndpointProducerBuilder cql(String cql) {
+            doSetProperty("cql", cql);
             return this;
         }
         /**
-         * Whether to use PreparedStatements or regular Statements.
+         * Datacenter to use.
          * 
-         * The option is a: <code>boolean</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Default: true
+         * Default: datacenter1
          * Group: common
          * 
-         * @param prepareStatements the value to set
+         * @param datacenter the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder prepareStatements(boolean prepareStatements) {
-            doSetProperty("prepareStatements", prepareStatements);
+        default CassandraEndpointProducerBuilder datacenter(String datacenter) {
+            doSetProperty("datacenter", datacenter);
             return this;
         }
         /**
          * Whether to use PreparedStatements or regular Statements.
          * 
-         * The option will be converted to a <code>boolean</code> type.
+         * The option is a: <code>boolean</code> type.
          * 
          * Default: true
          * Group: common
@@ -1089,70 +961,37 @@ public interface CassandraEndpointBuilderFactory {
          * @param prepareStatements the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder prepareStatements(String prepareStatements) {
+        default CassandraEndpointProducerBuilder prepareStatements(boolean prepareStatements) {
             doSetProperty("prepareStatements", prepareStatements);
             return this;
         }
         /**
-         * To use a custom class that implements logic for converting ResultSet
-         * into message body ALL, ONE, LIMIT_10, LIMIT_100...
-         * 
-         * The option is a:
-         * <code>org.apache.camel.component.cassandra.ResultSetConversionStrategy</code> type.
-         * 
-         * Group: common
-         * 
-         * @param resultSetConversionStrategy the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointProducerBuilder resultSetConversionStrategy(org.apache.camel.component.cassandra.ResultSetConversionStrategy resultSetConversionStrategy) {
-            doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
-            return this;
-        }
-        /**
-         * To use a custom class that implements logic for converting ResultSet
-         * into message body ALL, ONE, LIMIT_10, LIMIT_100...
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.component.cassandra.ResultSetConversionStrategy</code> type.
-         * 
-         * Group: common
-         * 
-         * @param resultSetConversionStrategy the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointProducerBuilder resultSetConversionStrategy(String resultSetConversionStrategy) {
-            doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
-            return this;
-        }
-        /**
-         * To use the Session instance (you would normally not use this option).
+         * Whether to use PreparedStatements or regular Statements.
          * 
-         * The option is a:
-         * <code>com.datastax.oss.driver.api.core.CqlSession</code> type.
+         * The option will be converted to a <code>boolean</code> type.
          * 
+         * Default: true
          * Group: common
          * 
-         * @param session the value to set
+         * @param prepareStatements the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder session(com.datastax.oss.driver.api.core.CqlSession session) {
-            doSetProperty("session", session);
+        default CassandraEndpointProducerBuilder prepareStatements(String prepareStatements) {
+            doSetProperty("prepareStatements", prepareStatements);
             return this;
         }
         /**
-         * To use the Session instance (you would normally not use this option).
+         * Password for session authentication.
          * 
-         * The option will be converted to a
-         * <code>com.datastax.oss.driver.api.core.CqlSession</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          * 
-         * @param session the value to set
+         * @param password the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder session(String session) {
-            doSetProperty("session", session);
+        default CassandraEndpointProducerBuilder password(String password) {
+            doSetProperty("password", password);
             return this;
         }
         /**
@@ -1160,7 +999,7 @@ public interface CassandraEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          * 
          * @param username the value to set
          * @return the dsl builder
@@ -1225,63 +1064,128 @@ public interface CassandraEndpointBuilderFactory {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
-    }
-
-    /**
-     * Builder for endpoint for the Cassandra CQL component.
-     */
-    public interface CassandraEndpointBuilder
-            extends
-                CassandraEndpointConsumerBuilder,
-                CassandraEndpointProducerBuilder {
-        default AdvancedCassandraEndpointBuilder advanced() {
-            return (AdvancedCassandraEndpointBuilder) this;
+        /**
+         * To use a specific comma separated list of Extra Type codecs. Possible
+         * values are: BLOB_TO_ARRAY, BOOLEAN_LIST_TO_ARRAY, BYTE_LIST_TO_ARRAY,
+         * SHORT_LIST_TO_ARRAY, INT_LIST_TO_ARRAY, LONG_LIST_TO_ARRAY,
+         * FLOAT_LIST_TO_ARRAY, DOUBLE_LIST_TO_ARRAY, TIMESTAMP_UTC,
+         * TIMESTAMP_MILLIS_SYSTEM, TIMESTAMP_MILLIS_UTC,
+         * ZONED_TIMESTAMP_SYSTEM, ZONED_TIMESTAMP_UTC,
+         * ZONED_TIMESTAMP_PERSISTED, LOCAL_TIMESTAMP_SYSTEM and
+         * LOCAL_TIMESTAMP_UTC.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: advanced
+         * 
+         * @param extraTypeCodecs the value to set
+         * @return the dsl builder
+         */
+        default AdvancedCassandraEndpointProducerBuilder extraTypeCodecs(String extraTypeCodecs) {
+            doSetProperty("extraTypeCodecs", extraTypeCodecs);
+            return this;
         }
-
         /**
-         * Cluster name.
+         * To use a specific LoadBalancingPolicyClass.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: advanced
          * 
-         * @param clusterName the value to set
+         * @param loadBalancingPolicyClass the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointBuilder clusterName(String clusterName) {
-            doSetProperty("clusterName", clusterName);
+        default AdvancedCassandraEndpointProducerBuilder loadBalancingPolicyClass(String loadBalancingPolicyClass) {
+            doSetProperty("loadBalancingPolicyClass", loadBalancingPolicyClass);
             return this;
         }
         /**
-         * Consistency level to use.
+         * To use a custom class that implements logic for converting ResultSet
+         * into message body ALL, ONE, LIMIT_10, LIMIT_100...
          * 
          * The option is a:
-         * <code>com.datastax.oss.driver.api.core.DefaultConsistencyLevel</code>
-         * type.
+         * <code>org.apache.camel.component.cassandra.ResultSetConversionStrategy</code> type.
          * 
-         * Group: common
+         * Group: advanced
          * 
-         * @param consistencyLevel the value to set
+         * @param resultSetConversionStrategy the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointBuilder consistencyLevel(com.datastax.oss.driver.api.core.DefaultConsistencyLevel consistencyLevel) {
-            doSetProperty("consistencyLevel", consistencyLevel);
+        default AdvancedCassandraEndpointProducerBuilder resultSetConversionStrategy(org.apache.camel.component.cassandra.ResultSetConversionStrategy resultSetConversionStrategy) {
+            doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
             return this;
         }
         /**
-         * Consistency level to use.
+         * To use a custom class that implements logic for converting ResultSet
+         * into message body ALL, ONE, LIMIT_10, LIMIT_100...
          * 
          * The option will be converted to a
-         * <code>com.datastax.oss.driver.api.core.DefaultConsistencyLevel</code>
-         * type.
+         * <code>org.apache.camel.component.cassandra.ResultSetConversionStrategy</code> type.
+         * 
+         * Group: advanced
+         * 
+         * @param resultSetConversionStrategy the value to set
+         * @return the dsl builder
+         */
+        default AdvancedCassandraEndpointProducerBuilder resultSetConversionStrategy(String resultSetConversionStrategy) {
+            doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
+            return this;
+        }
+        /**
+         * To use the Session instance (you would normally not use this option).
+         * 
+         * The option is a:
+         * <code>com.datastax.oss.driver.api.core.CqlSession</code> type.
+         * 
+         * Group: advanced
+         * 
+         * @param session the value to set
+         * @return the dsl builder
+         */
+        default AdvancedCassandraEndpointProducerBuilder session(com.datastax.oss.driver.api.core.CqlSession session) {
+            doSetProperty("session", session);
+            return this;
+        }
+        /**
+         * To use the Session instance (you would normally not use this option).
+         * 
+         * The option will be converted to a
+         * <code>com.datastax.oss.driver.api.core.CqlSession</code> type.
+         * 
+         * Group: advanced
+         * 
+         * @param session the value to set
+         * @return the dsl builder
+         */
+        default AdvancedCassandraEndpointProducerBuilder session(String session) {
+            doSetProperty("session", session);
+            return this;
+        }
+    }
+
+    /**
+     * Builder for endpoint for the Cassandra CQL component.
+     */
+    public interface CassandraEndpointBuilder
+            extends
+                CassandraEndpointConsumerBuilder,
+                CassandraEndpointProducerBuilder {
+        default AdvancedCassandraEndpointBuilder advanced() {
+            return (AdvancedCassandraEndpointBuilder) this;
+        }
+
+        /**
+         * Cluster name.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: common
          * 
-         * @param consistencyLevel the value to set
+         * @param clusterName the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointBuilder consistencyLevel(String consistencyLevel) {
-            doSetProperty("consistencyLevel", consistencyLevel);
+        default CassandraEndpointBuilder clusterName(String clusterName) {
+            doSetProperty("clusterName", clusterName);
             return this;
         }
         /**
@@ -1315,38 +1219,33 @@ public interface CassandraEndpointBuilderFactory {
             return this;
         }
         /**
-         * To use a specific comma separated list of Extra Type codecs. Possible
-         * values are: BLOB_TO_ARRAY, BOOLEAN_LIST_TO_ARRAY, BYTE_LIST_TO_ARRAY,
-         * SHORT_LIST_TO_ARRAY, INT_LIST_TO_ARRAY, LONG_LIST_TO_ARRAY,
-         * FLOAT_LIST_TO_ARRAY, DOUBLE_LIST_TO_ARRAY, TIMESTAMP_UTC,
-         * TIMESTAMP_MILLIS_SYSTEM, TIMESTAMP_MILLIS_UTC,
-         * ZONED_TIMESTAMP_SYSTEM, ZONED_TIMESTAMP_UTC,
-         * ZONED_TIMESTAMP_PERSISTED, LOCAL_TIMESTAMP_SYSTEM and
-         * LOCAL_TIMESTAMP_UTC.
+         * Whether to use PreparedStatements or regular Statements.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>boolean</code> type.
          * 
+         * Default: true
          * Group: common
          * 
-         * @param extraTypeCodecs the value to set
+         * @param prepareStatements the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointBuilder extraTypeCodecs(String extraTypeCodecs) {
-            doSetProperty("extraTypeCodecs", extraTypeCodecs);
+        default CassandraEndpointBuilder prepareStatements(boolean prepareStatements) {
+            doSetProperty("prepareStatements", prepareStatements);
             return this;
         }
         /**
-         * To use a specific LoadBalancingPolicyClass.
+         * Whether to use PreparedStatements or regular Statements.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option will be converted to a <code>boolean</code> type.
          * 
+         * Default: true
          * Group: common
          * 
-         * @param loadBalancingPolicyClass the value to set
+         * @param prepareStatements the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointBuilder loadBalancingPolicyClass(String loadBalancingPolicyClass) {
-            doSetProperty("loadBalancingPolicyClass", loadBalancingPolicyClass);
+        default CassandraEndpointBuilder prepareStatements(String prepareStatements) {
+            doSetProperty("prepareStatements", prepareStatements);
             return this;
         }
         /**
@@ -1354,7 +1253,7 @@ public interface CassandraEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          * 
          * @param password the value to set
          * @return the dsl builder
@@ -1364,33 +1263,65 @@ public interface CassandraEndpointBuilderFactory {
             return this;
         }
         /**
-         * Whether to use PreparedStatements or regular Statements.
+         * Username for session authentication.
          * 
-         * The option is a: <code>boolean</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Default: true
-         * Group: common
+         * Group: security
          * 
-         * @param prepareStatements the value to set
+         * @param username the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointBuilder prepareStatements(boolean prepareStatements) {
-            doSetProperty("prepareStatements", prepareStatements);
+        default CassandraEndpointBuilder username(String username) {
+            doSetProperty("username", username);
             return this;
         }
+    }
+
+    /**
+     * Advanced builder for endpoint for the Cassandra CQL component.
+     */
+    public interface AdvancedCassandraEndpointBuilder
+            extends
+                AdvancedCassandraEndpointConsumerBuilder,
+                AdvancedCassandraEndpointProducerBuilder {
+        default CassandraEndpointBuilder basic() {
+            return (CassandraEndpointBuilder) this;
+        }
+
         /**
-         * Whether to use PreparedStatements or regular Statements.
+         * To use a specific comma separated list of Extra Type codecs. Possible
+         * values are: BLOB_TO_ARRAY, BOOLEAN_LIST_TO_ARRAY, BYTE_LIST_TO_ARRAY,
+         * SHORT_LIST_TO_ARRAY, INT_LIST_TO_ARRAY, LONG_LIST_TO_ARRAY,
+         * FLOAT_LIST_TO_ARRAY, DOUBLE_LIST_TO_ARRAY, TIMESTAMP_UTC,
+         * TIMESTAMP_MILLIS_SYSTEM, TIMESTAMP_MILLIS_UTC,
+         * ZONED_TIMESTAMP_SYSTEM, ZONED_TIMESTAMP_UTC,
+         * ZONED_TIMESTAMP_PERSISTED, LOCAL_TIMESTAMP_SYSTEM and
+         * LOCAL_TIMESTAMP_UTC.
          * 
-         * The option will be converted to a <code>boolean</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Default: true
-         * Group: common
+         * Group: advanced
          * 
-         * @param prepareStatements the value to set
+         * @param extraTypeCodecs the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointBuilder prepareStatements(String prepareStatements) {
-            doSetProperty("prepareStatements", prepareStatements);
+        default AdvancedCassandraEndpointBuilder extraTypeCodecs(String extraTypeCodecs) {
+            doSetProperty("extraTypeCodecs", extraTypeCodecs);
+            return this;
+        }
+        /**
+         * To use a specific LoadBalancingPolicyClass.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: advanced
+         * 
+         * @param loadBalancingPolicyClass the value to set
+         * @return the dsl builder
+         */
+        default AdvancedCassandraEndpointBuilder loadBalancingPolicyClass(String loadBalancingPolicyClass) {
+            doSetProperty("loadBalancingPolicyClass", loadBalancingPolicyClass);
             return this;
         }
         /**
@@ -1400,12 +1331,12 @@ public interface CassandraEndpointBuilderFactory {
          * The option is a:
          * <code>org.apache.camel.component.cassandra.ResultSetConversionStrategy</code> type.
          * 
-         * Group: common
+         * Group: advanced
          * 
          * @param resultSetConversionStrategy the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointBuilder resultSetConversionStrategy(org.apache.camel.component.cassandra.ResultSetConversionStrategy resultSetConversionStrategy) {
+        default AdvancedCassandraEndpointBuilder resultSetConversionStrategy(org.apache.camel.component.cassandra.ResultSetConversionStrategy resultSetConversionStrategy) {
             doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
             return this;
         }
@@ -1416,12 +1347,12 @@ public interface CassandraEndpointBuilderFactory {
          * The option will be converted to a
          * <code>org.apache.camel.component.cassandra.ResultSetConversionStrategy</code> type.
          * 
-         * Group: common
+         * Group: advanced
          * 
          * @param resultSetConversionStrategy the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointBuilder resultSetConversionStrategy(String resultSetConversionStrategy) {
+        default AdvancedCassandraEndpointBuilder resultSetConversionStrategy(String resultSetConversionStrategy) {
             doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
             return this;
         }
@@ -1431,12 +1362,12 @@ public interface CassandraEndpointBuilderFactory {
          * The option is a:
          * <code>com.datastax.oss.driver.api.core.CqlSession</code> type.
          * 
-         * Group: common
+         * Group: advanced
          * 
          * @param session the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointBuilder session(com.datastax.oss.driver.api.core.CqlSession session) {
+        default AdvancedCassandraEndpointBuilder session(com.datastax.oss.driver.api.core.CqlSession session) {
             doSetProperty("session", session);
             return this;
         }
@@ -1446,42 +1377,15 @@ public interface CassandraEndpointBuilderFactory {
          * The option will be converted to a
          * <code>com.datastax.oss.driver.api.core.CqlSession</code> type.
          * 
-         * Group: common
+         * Group: advanced
          * 
          * @param session the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointBuilder session(String session) {
+        default AdvancedCassandraEndpointBuilder session(String session) {
             doSetProperty("session", session);
             return this;
         }
-        /**
-         * Username for session authentication.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         * 
-         * @param username the value to set
-         * @return the dsl builder
-         */
-        default CassandraEndpointBuilder username(String username) {
-            doSetProperty("username", username);
-            return this;
-        }
-    }
-
-    /**
-     * Advanced builder for endpoint for the Cassandra CQL component.
-     */
-    public interface AdvancedCassandraEndpointBuilder
-            extends
-                AdvancedCassandraEndpointConsumerBuilder,
-                AdvancedCassandraEndpointProducerBuilder {
-        default CassandraEndpointBuilder basic() {
-            return (CassandraEndpointBuilder) this;
-        }
-
     }
 
     public interface CassandraBuilders {
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanRemoteEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanRemoteEndpointBuilderFactory.java
index 53de3ca0191..50e94bec21f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanRemoteEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/InfinispanRemoteEndpointBuilderFactory.java
@@ -44,7 +44,8 @@ public interface InfinispanRemoteEndpointBuilderFactory {
             return (AdvancedInfinispanRemoteEndpointConsumerBuilder) this;
         }
         /**
-         * Specifies the host of the cache on Infinispan instance.
+         * Specifies the host of the cache on Infinispan instance. Multiple
+         * hosts can be separated by semicolon.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -87,36 +88,6 @@ public interface InfinispanRemoteEndpointBuilderFactory {
             doSetProperty("queryBuilder", queryBuilder);
             return this;
         }
-        /**
-         * Define if we are connecting to a secured Infinispan instance.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: common
-         * 
-         * @param secure the value to set
-         * @return the dsl builder
-         */
-        default InfinispanRemoteEndpointConsumerBuilder secure(boolean secure) {
-            doSetProperty("secure", secure);
-            return this;
-        }
-        /**
-         * Define if we are connecting to a secured Infinispan instance.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: common
-         * 
-         * @param secure the value to set
-         * @return the dsl builder
-         */
-        default InfinispanRemoteEndpointConsumerBuilder secure(String secure) {
-            doSetProperty("secure", secure);
-            return this;
-        }
         /**
          * Returns the custom listener in use, if provided.
          * 
@@ -193,6 +164,36 @@ public interface InfinispanRemoteEndpointBuilderFactory {
             doSetProperty("saslMechanism", saslMechanism);
             return this;
         }
+        /**
+         * Define if we are connecting to a secured Infinispan instance.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: security
+         * 
+         * @param secure the value to set
+         * @return the dsl builder
+         */
+        default InfinispanRemoteEndpointConsumerBuilder secure(boolean secure) {
+            doSetProperty("secure", secure);
+            return this;
+        }
+        /**
+         * Define if we are connecting to a secured Infinispan instance.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: security
+         * 
+         * @param secure the value to set
+         * @return the dsl builder
+         */
+        default InfinispanRemoteEndpointConsumerBuilder secure(String secure) {
+            doSetProperty("secure", secure);
+            return this;
+        }
         /**
          * Define the security realm to access the infinispan instance.
          * 
@@ -552,7 +553,8 @@ public interface InfinispanRemoteEndpointBuilderFactory {
         }
 
         /**
-         * Specifies the host of the cache on Infinispan instance.
+         * Specifies the host of the cache on Infinispan instance. Multiple
+         * hosts can be separated by semicolon.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -595,36 +597,6 @@ public interface InfinispanRemoteEndpointBuilderFactory {
             doSetProperty("queryBuilder", queryBuilder);
             return this;
         }
-        /**
-         * Define if we are connecting to a secured Infinispan instance.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: common
-         * 
-         * @param secure the value to set
-         * @return the dsl builder
-         */
-        default InfinispanRemoteEndpointProducerBuilder secure(boolean secure) {
-            doSetProperty("secure", secure);
-            return this;
-        }
-        /**
-         * Define if we are connecting to a secured Infinispan instance.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: common
-         * 
-         * @param secure the value to set
-         * @return the dsl builder
-         */
-        default InfinispanRemoteEndpointProducerBuilder secure(String secure) {
-            doSetProperty("secure", secure);
-            return this;
-        }
         /**
          * Set a specific default value for some producer operations.
          * 
@@ -797,6 +769,36 @@ public interface InfinispanRemoteEndpointBuilderFactory {
             doSetProperty("saslMechanism", saslMechanism);
             return this;
         }
+        /**
+         * Define if we are connecting to a secured Infinispan instance.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: security
+         * 
+         * @param secure the value to set
+         * @return the dsl builder
+         */
+        default InfinispanRemoteEndpointProducerBuilder secure(boolean secure) {
+            doSetProperty("secure", secure);
+            return this;
+        }
+        /**
+         * Define if we are connecting to a secured Infinispan instance.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: security
+         * 
+         * @param secure the value to set
+         * @return the dsl builder
+         */
+        default InfinispanRemoteEndpointProducerBuilder secure(String secure) {
+            doSetProperty("secure", secure);
+            return this;
+        }
         /**
          * Define the security realm to access the infinispan instance.
          * 
@@ -1085,7 +1087,8 @@ public interface InfinispanRemoteEndpointBuilderFactory {
         }
 
         /**
-         * Specifies the host of the cache on Infinispan instance.
+         * Specifies the host of the cache on Infinispan instance. Multiple
+         * hosts can be separated by semicolon.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -1129,61 +1132,61 @@ public interface InfinispanRemoteEndpointBuilderFactory {
             return this;
         }
         /**
-         * Define if we are connecting to a secured Infinispan instance.
+         * Define the password to access the infinispan instance.
          * 
-         * The option is a: <code>boolean</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Default: false
-         * Group: common
+         * Group: security
          * 
-         * @param secure the value to set
+         * @param password the value to set
          * @return the dsl builder
          */
-        default InfinispanRemoteEndpointBuilder secure(boolean secure) {
-            doSetProperty("secure", secure);
+        default InfinispanRemoteEndpointBuilder password(String password) {
+            doSetProperty("password", password);
             return this;
         }
         /**
-         * Define if we are connecting to a secured Infinispan instance.
+         * Define the SASL Mechanism to access the infinispan instance.
          * 
-         * The option will be converted to a <code>boolean</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Default: false
-         * Group: common
+         * Group: security
          * 
-         * @param secure the value to set
+         * @param saslMechanism the value to set
          * @return the dsl builder
          */
-        default InfinispanRemoteEndpointBuilder secure(String secure) {
-            doSetProperty("secure", secure);
+        default InfinispanRemoteEndpointBuilder saslMechanism(String saslMechanism) {
+            doSetProperty("saslMechanism", saslMechanism);
             return this;
         }
         /**
-         * Define the password to access the infinispan instance.
+         * Define if we are connecting to a secured Infinispan instance.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>boolean</code> type.
          * 
+         * Default: false
          * Group: security
          * 
-         * @param password the value to set
+         * @param secure the value to set
          * @return the dsl builder
          */
-        default InfinispanRemoteEndpointBuilder password(String password) {
-            doSetProperty("password", password);
+        default InfinispanRemoteEndpointBuilder secure(boolean secure) {
+            doSetProperty("secure", secure);
             return this;
         }
         /**
-         * Define the SASL Mechanism to access the infinispan instance.
+         * Define if we are connecting to a secured Infinispan instance.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option will be converted to a <code>boolean</code> type.
          * 
+         * Default: false
          * Group: security
          * 
-         * @param saslMechanism the value to set
+         * @param secure the value to set
          * @return the dsl builder
          */
-        default InfinispanRemoteEndpointBuilder saslMechanism(String saslMechanism) {
-            doSetProperty("saslMechanism", saslMechanism);
+        default InfinispanRemoteEndpointBuilder secure(String secure) {
+            doSetProperty("secure", secure);
             return this;
         }
         /**
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KuduEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KuduEndpointBuilderFactory.java
index a6d0b1326b5..8f3f127a6ae 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KuduEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KuduEndpointBuilderFactory.java
@@ -161,10 +161,10 @@ public interface KuduEndpointBuilderFactory {
          * 
          * Syntax: <code>kudu:host:port/tableName</code>
          * 
-         * Path parameter: host
+         * Path parameter: host (required)
          * Host of the server to connect to
          * 
-         * Path parameter: port
+         * Path parameter: port (required)
          * Port of the server to connect to
          * 
          * Path parameter: tableName
@@ -187,10 +187,10 @@ public interface KuduEndpointBuilderFactory {
          * 
          * Syntax: <code>kudu:host:port/tableName</code>
          * 
-         * Path parameter: host
+         * Path parameter: host (required)
          * Host of the server to connect to
          * 
-         * Path parameter: port
+         * Path parameter: port (required)
          * Port of the server to connect to
          * 
          * Path parameter: tableName
diff --git a/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/CqlUriDsl.kt b/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/CqlUriDsl.kt
index ba7ef5f01c0..3076704dca8 100644
--- a/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/CqlUriDsl.kt
+++ b/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/CqlUriDsl.kt
@@ -97,13 +97,6 @@ public class CqlUriDsl(
     it.property("clusterName", clusterName)
   }
 
-  /**
-   * Consistency level to use
-   */
-  public fun consistencyLevel(consistencyLevel: String) {
-    it.property("consistencyLevel", consistencyLevel)
-  }
-
   /**
    * CQL query to perform. Can be overridden with the message header with key CamelCqlQuery.
    */
@@ -118,31 +111,6 @@ public class CqlUriDsl(
     it.property("datacenter", datacenter)
   }
 
-  /**
-   * To use a specific comma separated list of Extra Type codecs. Possible values are:
-   * BLOB_TO_ARRAY, BOOLEAN_LIST_TO_ARRAY, BYTE_LIST_TO_ARRAY, SHORT_LIST_TO_ARRAY, INT_LIST_TO_ARRAY,
-   * LONG_LIST_TO_ARRAY, FLOAT_LIST_TO_ARRAY, DOUBLE_LIST_TO_ARRAY, TIMESTAMP_UTC,
-   * TIMESTAMP_MILLIS_SYSTEM, TIMESTAMP_MILLIS_UTC, ZONED_TIMESTAMP_SYSTEM, ZONED_TIMESTAMP_UTC,
-   * ZONED_TIMESTAMP_PERSISTED, LOCAL_TIMESTAMP_SYSTEM and LOCAL_TIMESTAMP_UTC
-   */
-  public fun extraTypeCodecs(extraTypeCodecs: String) {
-    it.property("extraTypeCodecs", extraTypeCodecs)
-  }
-
-  /**
-   * To use a specific LoadBalancingPolicyClass
-   */
-  public fun loadBalancingPolicyClass(loadBalancingPolicyClass: String) {
-    it.property("loadBalancingPolicyClass", loadBalancingPolicyClass)
-  }
-
-  /**
-   * Password for session authentication
-   */
-  public fun password(password: String) {
-    it.property("password", password)
-  }
-
   /**
    * Whether to use PreparedStatements or regular Statements
    */
@@ -157,28 +125,6 @@ public class CqlUriDsl(
     it.property("prepareStatements", prepareStatements.toString())
   }
 
-  /**
-   * To use a custom class that implements logic for converting ResultSet into message body ALL,
-   * ONE, LIMIT_10, LIMIT_100...
-   */
-  public fun resultSetConversionStrategy(resultSetConversionStrategy: String) {
-    it.property("resultSetConversionStrategy", resultSetConversionStrategy)
-  }
-
-  /**
-   * To use the Session instance (you would normally not use this option)
-   */
-  public fun session(session: String) {
-    it.property("session", session)
-  }
-
-  /**
-   * Username for session authentication
-   */
-  public fun username(username: String) {
-    it.property("username", username)
-  }
-
   /**
    * If the polling consumer did not poll any files, you can enable this option to send an empty
    * message (no body) instead.
@@ -274,6 +220,39 @@ public class CqlUriDsl(
     it.property("lazyStartProducer", lazyStartProducer.toString())
   }
 
+  /**
+   * To use a specific comma separated list of Extra Type codecs. Possible values are:
+   * BLOB_TO_ARRAY, BOOLEAN_LIST_TO_ARRAY, BYTE_LIST_TO_ARRAY, SHORT_LIST_TO_ARRAY, INT_LIST_TO_ARRAY,
+   * LONG_LIST_TO_ARRAY, FLOAT_LIST_TO_ARRAY, DOUBLE_LIST_TO_ARRAY, TIMESTAMP_UTC,
+   * TIMESTAMP_MILLIS_SYSTEM, TIMESTAMP_MILLIS_UTC, ZONED_TIMESTAMP_SYSTEM, ZONED_TIMESTAMP_UTC,
+   * ZONED_TIMESTAMP_PERSISTED, LOCAL_TIMESTAMP_SYSTEM and LOCAL_TIMESTAMP_UTC
+   */
+  public fun extraTypeCodecs(extraTypeCodecs: String) {
+    it.property("extraTypeCodecs", extraTypeCodecs)
+  }
+
+  /**
+   * To use a specific LoadBalancingPolicyClass
+   */
+  public fun loadBalancingPolicyClass(loadBalancingPolicyClass: String) {
+    it.property("loadBalancingPolicyClass", loadBalancingPolicyClass)
+  }
+
+  /**
+   * To use a custom class that implements logic for converting ResultSet into message body ALL,
+   * ONE, LIMIT_10, LIMIT_100...
+   */
+  public fun resultSetConversionStrategy(resultSetConversionStrategy: String) {
+    it.property("resultSetConversionStrategy", resultSetConversionStrategy)
+  }
+
+  /**
+   * To use the Session instance (you would normally not use this option)
+   */
+  public fun session(session: String) {
+    it.property("session", session)
+  }
+
   /**
    * The number of subsequent error polls (failed due some error) that should happen before the
    * backoffMultipler should kick-in.
@@ -454,4 +433,18 @@ public class CqlUriDsl(
   public fun useFixedDelay(useFixedDelay: Boolean) {
     it.property("useFixedDelay", useFixedDelay.toString())
   }
+
+  /**
+   * Password for session authentication
+   */
+  public fun password(password: String) {
+    it.property("password", password)
+  }
+
+  /**
+   * Username for session authentication
+   */
+  public fun username(username: String) {
+    it.property("username", username)
+  }
 }
diff --git a/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/InfinispanUriDsl.kt b/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/InfinispanUriDsl.kt
index 0f6260a2a46..5a271dad79e 100644
--- a/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/InfinispanUriDsl.kt
+++ b/dsl/camel-kotlin-api/src/generated/kotlin/org/apache/camel/kotlin/components/InfinispanUriDsl.kt
@@ -52,7 +52,8 @@ public class InfinispanUriDsl(
   }
 
   /**
-   * Specifies the host of the cache on Infinispan instance
+   * Specifies the host of the cache on Infinispan instance. Multiple hosts can be separated by
+   * semicolon.
    */
   public fun hosts(hosts: String) {
     it.property("hosts", hosts)
@@ -65,20 +66,6 @@ public class InfinispanUriDsl(
     it.property("queryBuilder", queryBuilder)
   }
 
-  /**
-   * Define if we are connecting to a secured Infinispan instance
-   */
-  public fun secure(secure: String) {
-    it.property("secure", secure)
-  }
-
-  /**
-   * Define if we are connecting to a secured Infinispan instance
-   */
-  public fun secure(secure: Boolean) {
-    it.property("secure", secure.toString())
-  }
-
   /**
    * Returns the custom listener in use, if provided
    */
@@ -268,6 +255,20 @@ public class InfinispanUriDsl(
     it.property("saslMechanism", saslMechanism)
   }
 
+  /**
+   * Define if we are connecting to a secured Infinispan instance
+   */
+  public fun secure(secure: String) {
+    it.property("secure", secure)
+  }
+
+  /**
+   * Define if we are connecting to a secured Infinispan instance
+   */
+  public fun secure(secure: Boolean) {
+    it.property("secure", secure.toString())
+  }
+
   /**
    * Define the security realm to access the infinispan instance
    */