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

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


The following commit(s) were added to refs/heads/main by this push:
     new 810ff9b  CAMEL-17701: camel-core-model - Add labels to EIP options
810ff9b is described below

commit 810ff9b5827ecddf72fe2fc93a5407e5d8253779
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Feb 28 13:58:42 2022 +0100

    CAMEL-17701: camel-core-model - Add labels to EIP options
---
 .../org/apache/camel/catalog/models/saga.json      |  6 +-
 .../org/apache/camel/catalog/models/sample.json    |  1 -
 .../camel/catalog/models/threadPoolProfile.json    |  8 +--
 .../org/apache/camel/catalog/models/threads.json   |  8 +--
 .../org/apache/camel/catalog/models/throttle.json  |  6 +-
 .../camel/catalog/models/throwException.json       |  2 +-
 .../org/apache/camel/catalog/models/to.json        |  2 +-
 .../org/apache/camel/catalog/models/toD.json       |  6 +-
 .../org/apache/camel/catalog/models/validate.json  |  2 +-
 .../org/apache/camel/catalog/models/wireTap.json   |  6 +-
 .../apache/camel/catalog/schemas/camel-spring.xsd  | 22 ++----
 .../resources/org/apache/camel/model/saga.json     |  6 +-
 .../resources/org/apache/camel/model/sample.json   |  1 -
 .../org/apache/camel/model/threadPoolProfile.json  |  8 +--
 .../resources/org/apache/camel/model/threads.json  |  8 +--
 .../resources/org/apache/camel/model/throttle.json |  6 +-
 .../org/apache/camel/model/throwException.json     |  2 +-
 .../resources/org/apache/camel/model/to.json       |  2 +-
 .../resources/org/apache/camel/model/toD.json      |  6 +-
 .../resources/org/apache/camel/model/validate.json |  2 +-
 .../resources/org/apache/camel/model/wireTap.json  |  6 +-
 .../org/apache/camel/model/PolicyDefinition.java   |  2 +-
 .../apache/camel/model/ProcessorDefinition.java    | 15 ++++
 .../apache/camel/model/PropertyDefinitions.java    |  3 -
 .../org/apache/camel/model/SagaDefinition.java     |  7 +-
 .../org/apache/camel/model/SamplingDefinition.java | 45 +++---------
 .../org/apache/camel/model/SendDefinition.java     |  8 ++-
 .../camel/model/SetExchangePatternDefinition.java  |  1 +
 .../apache/camel/model/SetHeaderDefinition.java    |  1 +
 .../apache/camel/model/SetPropertyDefinition.java  |  1 +
 .../org/apache/camel/model/SortDefinition.java     |  1 +
 .../org/apache/camel/model/SplitDefinition.java    |  1 -
 .../camel/model/TemplatedRouteDefinition.java      |  5 +-
 .../model/TemplatedRouteParameterDefinition.java   |  5 +-
 .../camel/model/TemplatedRoutesDefinition.java     |  6 +-
 .../camel/model/ThreadPoolProfileDefinition.java   |  9 +--
 .../org/apache/camel/model/ThreadsDefinition.java  |  8 +--
 .../org/apache/camel/model/ThrottleDefinition.java |  7 +-
 .../camel/model/ThrowExceptionDefinition.java      | 15 ++--
 .../java/org/apache/camel/model/ToDefinition.java  |  3 +-
 .../apache/camel/model/ToDynamicDefinition.java    |  7 +-
 .../apache/camel/model/TransactedDefinition.java   |  8 +--
 .../apache/camel/model/UnmarshalDefinition.java    | 80 +++++++++++-----------
 .../org/apache/camel/model/ValidateDefinition.java |  6 +-
 .../model/WhenSkipSendToEndpointDefinition.java    |  1 +
 .../org/apache/camel/reifier/SamplingReifier.java  |  5 +-
 .../camel/processor/SamplingThrottlerTest.java     |  7 +-
 .../java/org/apache/camel/xml/in/ModelParser.java  |  7 +-
 .../dsl/yaml/deserializers/ModelDeserializers.java | 14 ++--
 .../src/generated/resources/camel-yaml-dsl.json    | 41 +++++------
 .../src/generated/resources/camelYamlDsl.json      | 41 +++++------
 51 files changed, 234 insertions(+), 242 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/saga.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/saga.json
index bde2460..2c4907c 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/saga.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/saga.json
@@ -12,9 +12,9 @@
     "output": false
   },
   "properties": {
-    "sagaService": { "kind": "attribute", "displayName": "Saga Service", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.saga.CamelSagaService", "deprecated": false, "autowired": 
false, "secret": false, "description": "Refers to the id to lookup in the 
registry for the specific CamelSagaService to use." },
-    "propagation": { "kind": "attribute", "displayName": "Propagation", 
"required": false, "type": "enum", "javaType": 
"org.apache.camel.model.SagaPropagation", "enum": [ "REQUIRED", "REQUIRES_NEW", 
"MANDATORY", "SUPPORTS", "NOT_SUPPORTED", "NEVER" ], "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": "REQUIRED", "description": 
"Set the Saga propagation mode (REQUIRED, REQUIRES_NEW, MANDATORY, SUPPORTS, 
NOT_SUPPORTED, NEVER)." },
-    "completionMode": { "kind": "attribute", "displayName": "Completion Mode", 
"required": false, "type": "enum", "javaType": 
"org.apache.camel.model.SagaCompletionMode", "enum": [ "AUTO", "MANUAL" ], 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
"AUTO", "description": "Determine how the saga should be considered complete. 
When set to AUTO, the saga is completed when the exchange that initiates the 
saga is processed successfully, or compensated when it complet [...]
+    "sagaService": { "kind": "attribute", "displayName": "Saga Service", 
"label": "advanced", "required": false, "type": "object", "javaType": 
"org.apache.camel.saga.CamelSagaService", "deprecated": false, "autowired": 
false, "secret": false, "description": "Refers to the id to lookup in the 
registry for the specific CamelSagaService to use." },
+    "propagation": { "kind": "attribute", "displayName": "Propagation", 
"label": "advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.model.SagaPropagation", "enum": [ "REQUIRED", "REQUIRES_NEW", 
"MANDATORY", "SUPPORTS", "NOT_SUPPORTED", "NEVER" ], "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": "REQUIRED", "description": 
"Set the Saga propagation mode (REQUIRED, REQUIRES_NEW, MANDATORY, SUPPORTS, 
NOT_SUPPORTED, NEVER)." },
+    "completionMode": { "kind": "attribute", "displayName": "Completion Mode", 
"label": "advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.model.SagaCompletionMode", "enum": [ "AUTO", "MANUAL" ], 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
"AUTO", "description": "Determine how the saga should be considered complete. 
When set to AUTO, the saga is completed when the exchange that initiates the 
saga is processed successfully, or compen [...]
     "timeout": { "kind": "attribute", "displayName": "Timeout", "required": 
false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Set the maximum amount of 
time for the Saga. After the timeout is expired, the saga will be compensated 
automatically (unless a different decision has been taken in the meantime)." },
     "compensation": { "kind": "element", "displayName": "Compensation", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.SagaActionUriDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "The compensation endpoint 
URI that must be called to compensate all changes done in the route. The route 
corresponding to the compensation URI must perform compensation and complete 
without error. If errors occur during compensation, the saga serv [...]
     "completion": { "kind": "element", "displayName": "Completion", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.SagaActionUriDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "The completion endpoint 
URI that will be called when the Saga is completed successfully. The route 
corresponding to the completion URI must perform completion tasks and terminate 
without error. If errors occur during completion, the saga service may c [...]
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sample.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sample.json
index 42e9baa..39f418e 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sample.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/sample.json
@@ -14,7 +14,6 @@
   "properties": {
     "samplePeriod": { "kind": "attribute", "displayName": "Sample Period", 
"required": false, "type": "duration", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
"1000", "description": "Sets the sample period during which only a single 
Exchange will pass through." },
     "messageFrequency": { "kind": "attribute", "displayName": "Message 
Frequency", "required": false, "type": "integer", "javaType": "java.lang.Long", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the sample message count which only a single Exchange will pass through after 
this many received." },
-    "units": { "kind": "attribute", "displayName": "Units", "required": false, 
"type": "enum", "javaType": "java.util.concurrent.TimeUnit", "enum": [ 
"NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", 
"DAYS" ], "deprecated": true, "deprecationNote": "Use samplePeriod extended 
syntax instead", "autowired": false, "secret": false, "defaultValue": 
"SECONDS", "description": "Sets the time units for the sample period, 
defaulting to seconds." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/threadPoolProfile.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/threadPoolProfile.json
index 5008e80..bd15296 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/threadPoolProfile.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/threadPoolProfile.json
@@ -12,14 +12,14 @@
     "output": false
   },
   "properties": {
-    "defaultProfile": { "kind": "attribute", "displayName": "Default Profile", 
"required": false, "type": "boolean", "javaType": "java.lang.Boolean", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
false, "description": "Whether this profile is the default thread pool profile" 
},
+    "defaultProfile": { "kind": "attribute", "displayName": "Default Profile", 
"label": "advanced", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Whether this profile is the default 
thread pool profile" },
     "poolSize": { "kind": "attribute", "displayName": "Pool Size", "required": 
false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the core pool size" },
     "maxPoolSize": { "kind": "attribute", "displayName": "Max Pool Size", 
"required": false, "type": "integer", "javaType": "java.lang.Integer", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the maximum pool size" },
     "keepAliveTime": { "kind": "attribute", "displayName": "Keep Alive Time", 
"required": false, "type": "integer", "javaType": "java.lang.Long", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the keep alive time for idle threads in the pool" },
-    "timeUnit": { "kind": "attribute", "displayName": "Time Unit", "required": 
false, "type": "enum", "javaType": "java.util.concurrent.TimeUnit", "enum": [ 
"NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", 
"DAYS" ], "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the time unit to use for keep alive time By default 
SECONDS is used." },
+    "timeUnit": { "kind": "attribute", "displayName": "Time Unit", "label": 
"advanced", "required": false, "type": "enum", "javaType": 
"java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", 
"MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the time unit to use 
for keep alive time By default SECONDS is used." },
     "maxQueueSize": { "kind": "attribute", "displayName": "Max Queue Size", 
"required": false, "type": "integer", "javaType": "java.lang.Integer", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the maximum number of tasks in the work queue. Use -1 or Integer.MAX_VALUE for 
an unbounded queue" },
-    "allowCoreThreadTimeOut": { "kind": "attribute", "displayName": "Allow 
Core Thread Time Out", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Whether idle core threads is allowed to 
timeout and therefore can shrink the pool size below the core pool size Is by 
default true" },
-    "rejectedPolicy": { "kind": "attribute", "displayName": "Rejected Policy", 
"required": false, "type": "enum", "javaType": 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", "enum": [ "Abort", 
"CallerRuns", "DiscardOldest", "Discard" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the handler for tasks which cannot 
be executed by the thread pool." },
+    "allowCoreThreadTimeOut": { "kind": "attribute", "displayName": "Allow 
Core Thread Time Out", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": false, "description": "Whether idle 
core threads is allowed to timeout and therefore can shrink the pool size below 
the core pool size Is by default true" },
+    "rejectedPolicy": { "kind": "attribute", "displayName": "Rejected Policy", 
"label": "advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", "enum": [ "Abort", 
"CallerRuns", "DiscardOldest", "Discard" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the handler for tasks which cannot 
be executed by the thread pool." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/threads.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/threads.json
index 060892b..272d5c6 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/threads.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/threads.json
@@ -16,12 +16,12 @@
     "poolSize": { "kind": "attribute", "displayName": "Pool Size", "required": 
false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the core pool size" },
     "maxPoolSize": { "kind": "attribute", "displayName": "Max Pool Size", 
"required": false, "type": "integer", "javaType": "java.lang.Integer", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the maximum pool size" },
     "keepAliveTime": { "kind": "attribute", "displayName": "Keep Alive Time", 
"required": false, "type": "integer", "javaType": "java.lang.Long", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the keep alive time for idle threads" },
-    "timeUnit": { "kind": "attribute", "displayName": "Time Unit", "required": 
false, "type": "enum", "javaType": "java.util.concurrent.TimeUnit", "enum": [ 
"NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", 
"DAYS" ], "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the keep alive time unit. By default SECONDS is used." },
+    "timeUnit": { "kind": "attribute", "displayName": "Time Unit", "label": 
"advanced", "required": false, "type": "enum", "javaType": 
"java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", 
"MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the keep alive time 
unit. By default SECONDS is used." },
     "maxQueueSize": { "kind": "attribute", "displayName": "Max Queue Size", 
"required": false, "type": "integer", "javaType": "java.lang.Integer", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the maximum number of tasks in the work queue. Use -1 or Integer.MAX_VALUE for 
an unbounded queue" },
-    "allowCoreThreadTimeOut": { "kind": "attribute", "displayName": "Allow 
Core Thread Time Out", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Whether idle core threads are allowed to 
timeout and therefore can shrink the pool size below the core pool size Is by 
default false" },
+    "allowCoreThreadTimeOut": { "kind": "attribute", "displayName": "Allow 
Core Thread Time Out", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": false, "description": "Whether idle 
core threads are allowed to timeout and therefore can shrink the pool size 
below the core pool size Is by default false" },
     "threadName": { "kind": "attribute", "displayName": "Thread Name", 
"required": false, "type": "string", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
"Threads", "description": "Sets the thread name to use." },
-    "rejectedPolicy": { "kind": "attribute", "displayName": "Rejected Policy", 
"required": false, "type": "enum", "javaType": 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", "enum": [ "Abort", 
"CallerRuns", "DiscardOldest", "Discard" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the handler for tasks which cannot 
be executed by the thread pool." },
-    "callerRunsWhenRejected": { "kind": "attribute", "displayName": "Caller 
Runs When Rejected", "required": false, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": "true", "description": "Whether or not to use as caller runs as 
fallback when a task is rejected being added to the thread pool (when its 
full). This is only used as fallback if no rejectedPolicy has been configured, 
or the thread pool has no configure [...]
+    "rejectedPolicy": { "kind": "attribute", "displayName": "Rejected Policy", 
"label": "advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", "enum": [ "Abort", 
"CallerRuns", "DiscardOldest", "Discard" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the handler for tasks which cannot 
be executed by the thread pool." },
+    "callerRunsWhenRejected": { "kind": "attribute", "displayName": "Caller 
Runs When Rejected", "label": "advanced", "required": false, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": "true", "description": "Whether or not to use 
as caller runs as fallback when a task is rejected being added to the thread 
pool (when its full). This is only used as fallback if no rejectedPolicy has 
been configured, or the thread  [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/throttle.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/throttle.json
index 85e1e7f..928adfa 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/throttle.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/throttle.json
@@ -16,9 +16,9 @@
     "correlationExpression": { "kind": "expression", "displayName": 
"Correlation Expression", "required": false, "type": "object", "javaType": 
"org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", 
"csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser", 
"joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", 
"spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, 
"autowired": false, "secret": false, "des [...]
     "executorService": { "kind": "attribute", "displayName": "Executor 
Service", "label": "advanced", "required": false, "type": "object", "javaType": 
"java.util.concurrent.ExecutorService", "deprecated": false, "autowired": 
false, "secret": false, "description": "To use a custom thread pool 
(ScheduledExecutorService) by the throttler." },
     "timePeriodMillis": { "kind": "attribute", "displayName": "Time Period 
Millis", "required": false, "type": "duration", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
"1000", "description": "Sets the time period during which the maximum request 
count is valid for" },
-    "asyncDelayed": { "kind": "attribute", "displayName": "Async Delayed", 
"required": false, "type": "boolean", "javaType": "java.lang.Boolean", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
false, "description": "Enables asynchronous delay which means the thread will 
not block while delaying." },
-    "callerRunsWhenRejected": { "kind": "attribute", "displayName": "Caller 
Runs When Rejected", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": true, "description": "Whether or not the caller should run the 
task when it was rejected by the thread pool. Is by default true" },
-    "rejectExecution": { "kind": "attribute", "displayName": "Reject 
Execution", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Whether or not throttler throws the 
ThrottlerRejectedExecutionException when the exchange exceeds the request limit 
Is by default false" },
+    "asyncDelayed": { "kind": "attribute", "displayName": "Async Delayed", 
"label": "advanced", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Enables asynchronous delay which means 
the thread will not block while delaying." },
+    "callerRunsWhenRejected": { "kind": "attribute", "displayName": "Caller 
Runs When Rejected", "label": "advanced", "required": false, "type": "boolean", 
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": true, "description": "Whether or not the 
caller should run the task when it was rejected by the thread pool. Is by 
default true" },
+    "rejectExecution": { "kind": "attribute", "displayName": "Reject 
Execution", "label": "advanced", "required": false, "type": "boolean", 
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": false, "description": "Whether or not 
throttler throws the ThrottlerRejectedExecutionException when the exchange 
exceeds the request limit Is by default false" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/throwException.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/throwException.json
index 26c733e..c0b576e 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/throwException.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/throwException.json
@@ -12,9 +12,9 @@
     "output": false
   },
   "properties": {
-    "ref": { "kind": "attribute", "displayName": "Ref", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Reference to the exception 
instance to lookup from the registry to throw" },
     "message": { "kind": "attribute", "displayName": "Message", "required": 
false, "type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "To create a new exception 
instance and use the given message as caused message (supports simple 
language)" },
     "exceptionType": { "kind": "attribute", "displayName": "Exception Type", 
"required": false, "type": "string", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "description": "The 
class of the exception to create using the message." },
+    "ref": { "kind": "attribute", "displayName": "Ref", "label": "advanced", 
"required": false, "type": "string", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "description": 
"Reference to the exception instance to lookup from the registry to throw" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/to.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/to.json
index 764567e..e01edc5 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/to.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/to.json
@@ -13,7 +13,7 @@
   },
   "properties": {
     "uri": { "kind": "attribute", "displayName": "Uri", "required": true, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the uri of the 
endpoint to send to." },
-    "pattern": { "kind": "attribute", "displayName": "Pattern", "required": 
false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": 
[ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the optional ExchangePattern used 
to invoke this endpoint" },
+    "pattern": { "kind": "attribute", "displayName": "Pattern", "label": 
"advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", 
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the optional ExchangePattern used to invoke this endpoint" 
},
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/toD.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/toD.json
index d2cbe69..a656281 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/toD.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/toD.json
@@ -13,9 +13,9 @@
   },
   "properties": {
     "uri": { "kind": "attribute", "displayName": "Uri", "required": true, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "The uri of the endpoint to 
send to. The uri can be dynamic computed using the 
org.apache.camel.language.simple.SimpleLanguage expression." },
-    "pattern": { "kind": "attribute", "displayName": "Pattern", "required": 
false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": 
[ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the optional ExchangePattern used 
to invoke this endpoint" },
-    "cacheSize": { "kind": "attribute", "displayName": "Cache Size", 
"required": false, "type": "integer", "javaType": "java.lang.Integer", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the maximum size used by the org.apache.camel.spi.ProducerCache which is used 
to cache and reuse producers when using this recipient list, when uris are 
reused. Beware that when using dynamic endpoints then it affects how well the 
cache can be utilized. If each dynamic end [...]
-    "ignoreInvalidEndpoint": { "kind": "attribute", "displayName": "Ignore 
Invalid Endpoint", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Ignore the invalidate endpoint exception 
when try to create a producer with that endpoint" },
+    "pattern": { "kind": "attribute", "displayName": "Pattern", "label": 
"advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", 
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the optional ExchangePattern used to invoke this endpoint" 
},
+    "cacheSize": { "kind": "attribute", "displayName": "Cache Size", "label": 
"advanced", "required": false, "type": "integer", "javaType": 
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the maximum size used by the 
org.apache.camel.spi.ProducerCache which is used to cache and reuse producers 
when using this recipient list, when uris are reused. Beware that when using 
dynamic endpoints then it affects how well the cache can be utilized [...]
+    "ignoreInvalidEndpoint": { "kind": "attribute", "displayName": "Ignore 
Invalid Endpoint", "label": "advanced", "required": false, "type": "boolean", 
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": false, "description": "Ignore the invalidate 
endpoint exception when try to create a producer with that endpoint" },
     "allowOptimisedComponents": { "kind": "attribute", "displayName": "Allow 
Optimised Components", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": true, "description": "Whether to allow 
components to optimise toD if they are org.apache.camel.spi.SendDynamicAware ." 
},
     "autoStartComponents": { "kind": "attribute", "displayName": "Auto Start 
Components", "label": "advanced", "required": false, "type": "boolean", 
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": true, "description": "Whether to auto startup 
components when toD is starting up." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/validate.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/validate.json
index 1a4dffd..c5c0556 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/validate.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/validate.json
@@ -13,7 +13,7 @@
   },
   "properties": {
     "expression": { "kind": "expression", "displayName": "Expression", 
"required": true, "type": "object", "javaType": 
"org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", 
"csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser", 
"joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", 
"spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, 
"autowired": false, "secret": false, "asPredicate": true, "descrip [...]
-    "predicateExceptionFactory": { "kind": "attribute", "displayName": 
"Predicate Exception Factory", "required": false, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "autowired": false, "secret": false, 
"description": "The bean id of custom PredicateExceptionFactory to use for 
creating the exception when the validation fails. By default, Camel will throw 
PredicateValidationException. By using a custom factory you can control which 
exception to throw instead." },
+    "predicateExceptionFactory": { "kind": "attribute", "displayName": 
"Predicate Exception Factory", "label": "advanced", "required": false, "type": 
"object", "javaType": "org.apache.camel.spi.PredicateExceptionFactory", 
"deprecated": false, "autowired": false, "secret": false, "description": "The 
bean id of custom PredicateExceptionFactory to use for creating the exception 
when the validation fails. By default, Camel will throw 
PredicateValidationException. By using a custom factory yo [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/wireTap.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/wireTap.json
index 72c98fb..a8cbee9 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/wireTap.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/wireTap.json
@@ -17,9 +17,9 @@
     "onPrepare": { "kind": "attribute", "displayName": "On Prepare", "label": 
"advanced", "required": false, "type": "object", "javaType": 
"org.apache.camel.Processor", "deprecated": false, "autowired": false, 
"secret": false, "description": "Uses the Processor when preparing the 
org.apache.camel.Exchange to be sent. This can be used to deep-clone messages 
that should be sent, or any custom logic needed before the exchange is sent." },
     "executorService": { "kind": "attribute", "displayName": "Executor 
Service", "label": "advanced", "required": false, "type": "object", "javaType": 
"java.util.concurrent.ExecutorService", "deprecated": false, "autowired": 
false, "secret": false, "description": "Uses a custom thread pool" },
     "uri": { "kind": "attribute", "displayName": "Uri", "required": true, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "The uri of the endpoint to 
send to. The uri can be dynamic computed using the 
org.apache.camel.language.simple.SimpleLanguage expression." },
-    "pattern": { "kind": "attribute", "displayName": "Pattern", "required": 
false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": 
[ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the optional ExchangePattern used 
to invoke this endpoint" },
-    "cacheSize": { "kind": "attribute", "displayName": "Cache Size", 
"required": false, "type": "integer", "javaType": "java.lang.Integer", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the maximum size used by the org.apache.camel.spi.ProducerCache which is used 
to cache and reuse producers when using this recipient list, when uris are 
reused. Beware that when using dynamic endpoints then it affects how well the 
cache can be utilized. If each dynamic end [...]
-    "ignoreInvalidEndpoint": { "kind": "attribute", "displayName": "Ignore 
Invalid Endpoint", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Ignore the invalidate endpoint exception 
when try to create a producer with that endpoint" },
+    "pattern": { "kind": "attribute", "displayName": "Pattern", "label": 
"advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", 
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the optional ExchangePattern used to invoke this endpoint" 
},
+    "cacheSize": { "kind": "attribute", "displayName": "Cache Size", "label": 
"advanced", "required": false, "type": "integer", "javaType": 
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the maximum size used by the 
org.apache.camel.spi.ProducerCache which is used to cache and reuse producers 
when using this recipient list, when uris are reused. Beware that when using 
dynamic endpoints then it affects how well the cache can be utilized [...]
+    "ignoreInvalidEndpoint": { "kind": "attribute", "displayName": "Ignore 
Invalid Endpoint", "label": "advanced", "required": false, "type": "boolean", 
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": false, "description": "Ignore the invalidate 
endpoint exception when try to create a producer with that endpoint" },
     "allowOptimisedComponents": { "kind": "attribute", "displayName": "Allow 
Optimised Components", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": true, "description": "Whether to allow 
components to optimise toD if they are org.apache.camel.spi.SendDynamicAware ." 
},
     "autoStartComponents": { "kind": "attribute", "displayName": "Auto Start 
Components", "label": "advanced", "required": false, "type": "boolean", 
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": true, "description": "Whether to auto startup 
components when toD is starting up." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 0eed2a3..8a46dca 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -11083,14 +11083,6 @@ after this many received.
             ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="units" type="xs:string">
-          <xs:annotation>
-            <xs:documentation xml:lang="en"><![CDATA[
-Deprecated: Sets the time units for the sample period, defaulting to seconds.
-Default value: SECONDS
-            ]]></xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
@@ -11912,13 +11904,6 @@ exchange exceeds the request limit Is by default 
false. Default value: false
     <xs:complexContent>
       <xs:extension base="tns:noOutputDefinition">
         <xs:sequence/>
-        <xs:attribute name="ref" type="xs:string">
-          <xs:annotation>
-            <xs:documentation xml:lang="en"><![CDATA[
-Reference to the exception instance to lookup from the registry to throw.
-            ]]></xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
         <xs:attribute name="message" type="xs:string">
           <xs:annotation>
             <xs:documentation xml:lang="en"><![CDATA[
@@ -11934,6 +11919,13 @@ The class of the exception to create using the message.
             ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
+        <xs:attribute name="ref" type="xs:string">
+          <xs:annotation>
+            <xs:documentation xml:lang="en"><![CDATA[
+Reference to the exception instance to lookup from the registry to throw.
+            ]]></xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json
 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json
index bde2460..2c4907c 100644
--- 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/saga.json
@@ -12,9 +12,9 @@
     "output": false
   },
   "properties": {
-    "sagaService": { "kind": "attribute", "displayName": "Saga Service", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.saga.CamelSagaService", "deprecated": false, "autowired": 
false, "secret": false, "description": "Refers to the id to lookup in the 
registry for the specific CamelSagaService to use." },
-    "propagation": { "kind": "attribute", "displayName": "Propagation", 
"required": false, "type": "enum", "javaType": 
"org.apache.camel.model.SagaPropagation", "enum": [ "REQUIRED", "REQUIRES_NEW", 
"MANDATORY", "SUPPORTS", "NOT_SUPPORTED", "NEVER" ], "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": "REQUIRED", "description": 
"Set the Saga propagation mode (REQUIRED, REQUIRES_NEW, MANDATORY, SUPPORTS, 
NOT_SUPPORTED, NEVER)." },
-    "completionMode": { "kind": "attribute", "displayName": "Completion Mode", 
"required": false, "type": "enum", "javaType": 
"org.apache.camel.model.SagaCompletionMode", "enum": [ "AUTO", "MANUAL" ], 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
"AUTO", "description": "Determine how the saga should be considered complete. 
When set to AUTO, the saga is completed when the exchange that initiates the 
saga is processed successfully, or compensated when it complet [...]
+    "sagaService": { "kind": "attribute", "displayName": "Saga Service", 
"label": "advanced", "required": false, "type": "object", "javaType": 
"org.apache.camel.saga.CamelSagaService", "deprecated": false, "autowired": 
false, "secret": false, "description": "Refers to the id to lookup in the 
registry for the specific CamelSagaService to use." },
+    "propagation": { "kind": "attribute", "displayName": "Propagation", 
"label": "advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.model.SagaPropagation", "enum": [ "REQUIRED", "REQUIRES_NEW", 
"MANDATORY", "SUPPORTS", "NOT_SUPPORTED", "NEVER" ], "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": "REQUIRED", "description": 
"Set the Saga propagation mode (REQUIRED, REQUIRES_NEW, MANDATORY, SUPPORTS, 
NOT_SUPPORTED, NEVER)." },
+    "completionMode": { "kind": "attribute", "displayName": "Completion Mode", 
"label": "advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.model.SagaCompletionMode", "enum": [ "AUTO", "MANUAL" ], 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
"AUTO", "description": "Determine how the saga should be considered complete. 
When set to AUTO, the saga is completed when the exchange that initiates the 
saga is processed successfully, or compen [...]
     "timeout": { "kind": "attribute", "displayName": "Timeout", "required": 
false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Set the maximum amount of 
time for the Saga. After the timeout is expired, the saga will be compensated 
automatically (unless a different decision has been taken in the meantime)." },
     "compensation": { "kind": "element", "displayName": "Compensation", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.SagaActionUriDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "The compensation endpoint 
URI that must be called to compensate all changes done in the route. The route 
corresponding to the compensation URI must perform compensation and complete 
without error. If errors occur during compensation, the saga serv [...]
     "completion": { "kind": "element", "displayName": "Completion", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.SagaActionUriDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "The completion endpoint 
URI that will be called when the Saga is completed successfully. The route 
corresponding to the completion URI must perform completion tasks and terminate 
without error. If errors occur during completion, the saga service may c [...]
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/sample.json
 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/sample.json
index 42e9baa..39f418e 100644
--- 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/sample.json
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/sample.json
@@ -14,7 +14,6 @@
   "properties": {
     "samplePeriod": { "kind": "attribute", "displayName": "Sample Period", 
"required": false, "type": "duration", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
"1000", "description": "Sets the sample period during which only a single 
Exchange will pass through." },
     "messageFrequency": { "kind": "attribute", "displayName": "Message 
Frequency", "required": false, "type": "integer", "javaType": "java.lang.Long", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the sample message count which only a single Exchange will pass through after 
this many received." },
-    "units": { "kind": "attribute", "displayName": "Units", "required": false, 
"type": "enum", "javaType": "java.util.concurrent.TimeUnit", "enum": [ 
"NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", 
"DAYS" ], "deprecated": true, "deprecationNote": "Use samplePeriod extended 
syntax instead", "autowired": false, "secret": false, "defaultValue": 
"SECONDS", "description": "Sets the time units for the sample period, 
defaulting to seconds." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/threadPoolProfile.json
 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/threadPoolProfile.json
index 5008e80..bd15296 100644
--- 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/threadPoolProfile.json
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/threadPoolProfile.json
@@ -12,14 +12,14 @@
     "output": false
   },
   "properties": {
-    "defaultProfile": { "kind": "attribute", "displayName": "Default Profile", 
"required": false, "type": "boolean", "javaType": "java.lang.Boolean", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
false, "description": "Whether this profile is the default thread pool profile" 
},
+    "defaultProfile": { "kind": "attribute", "displayName": "Default Profile", 
"label": "advanced", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Whether this profile is the default 
thread pool profile" },
     "poolSize": { "kind": "attribute", "displayName": "Pool Size", "required": 
false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the core pool size" },
     "maxPoolSize": { "kind": "attribute", "displayName": "Max Pool Size", 
"required": false, "type": "integer", "javaType": "java.lang.Integer", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the maximum pool size" },
     "keepAliveTime": { "kind": "attribute", "displayName": "Keep Alive Time", 
"required": false, "type": "integer", "javaType": "java.lang.Long", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the keep alive time for idle threads in the pool" },
-    "timeUnit": { "kind": "attribute", "displayName": "Time Unit", "required": 
false, "type": "enum", "javaType": "java.util.concurrent.TimeUnit", "enum": [ 
"NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", 
"DAYS" ], "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the time unit to use for keep alive time By default 
SECONDS is used." },
+    "timeUnit": { "kind": "attribute", "displayName": "Time Unit", "label": 
"advanced", "required": false, "type": "enum", "javaType": 
"java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", 
"MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the time unit to use 
for keep alive time By default SECONDS is used." },
     "maxQueueSize": { "kind": "attribute", "displayName": "Max Queue Size", 
"required": false, "type": "integer", "javaType": "java.lang.Integer", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the maximum number of tasks in the work queue. Use -1 or Integer.MAX_VALUE for 
an unbounded queue" },
-    "allowCoreThreadTimeOut": { "kind": "attribute", "displayName": "Allow 
Core Thread Time Out", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Whether idle core threads is allowed to 
timeout and therefore can shrink the pool size below the core pool size Is by 
default true" },
-    "rejectedPolicy": { "kind": "attribute", "displayName": "Rejected Policy", 
"required": false, "type": "enum", "javaType": 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", "enum": [ "Abort", 
"CallerRuns", "DiscardOldest", "Discard" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the handler for tasks which cannot 
be executed by the thread pool." },
+    "allowCoreThreadTimeOut": { "kind": "attribute", "displayName": "Allow 
Core Thread Time Out", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": false, "description": "Whether idle 
core threads is allowed to timeout and therefore can shrink the pool size below 
the core pool size Is by default true" },
+    "rejectedPolicy": { "kind": "attribute", "displayName": "Rejected Policy", 
"label": "advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", "enum": [ "Abort", 
"CallerRuns", "DiscardOldest", "Discard" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the handler for tasks which cannot 
be executed by the thread pool." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/threads.json
 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/threads.json
index 060892b..272d5c6 100644
--- 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/threads.json
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/threads.json
@@ -16,12 +16,12 @@
     "poolSize": { "kind": "attribute", "displayName": "Pool Size", "required": 
false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the core pool size" },
     "maxPoolSize": { "kind": "attribute", "displayName": "Max Pool Size", 
"required": false, "type": "integer", "javaType": "java.lang.Integer", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the maximum pool size" },
     "keepAliveTime": { "kind": "attribute", "displayName": "Keep Alive Time", 
"required": false, "type": "integer", "javaType": "java.lang.Long", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the keep alive time for idle threads" },
-    "timeUnit": { "kind": "attribute", "displayName": "Time Unit", "required": 
false, "type": "enum", "javaType": "java.util.concurrent.TimeUnit", "enum": [ 
"NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", 
"DAYS" ], "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the keep alive time unit. By default SECONDS is used." },
+    "timeUnit": { "kind": "attribute", "displayName": "Time Unit", "label": 
"advanced", "required": false, "type": "enum", "javaType": 
"java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", 
"MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the keep alive time 
unit. By default SECONDS is used." },
     "maxQueueSize": { "kind": "attribute", "displayName": "Max Queue Size", 
"required": false, "type": "integer", "javaType": "java.lang.Integer", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the maximum number of tasks in the work queue. Use -1 or Integer.MAX_VALUE for 
an unbounded queue" },
-    "allowCoreThreadTimeOut": { "kind": "attribute", "displayName": "Allow 
Core Thread Time Out", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Whether idle core threads are allowed to 
timeout and therefore can shrink the pool size below the core pool size Is by 
default false" },
+    "allowCoreThreadTimeOut": { "kind": "attribute", "displayName": "Allow 
Core Thread Time Out", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": false, "description": "Whether idle 
core threads are allowed to timeout and therefore can shrink the pool size 
below the core pool size Is by default false" },
     "threadName": { "kind": "attribute", "displayName": "Thread Name", 
"required": false, "type": "string", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
"Threads", "description": "Sets the thread name to use." },
-    "rejectedPolicy": { "kind": "attribute", "displayName": "Rejected Policy", 
"required": false, "type": "enum", "javaType": 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", "enum": [ "Abort", 
"CallerRuns", "DiscardOldest", "Discard" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the handler for tasks which cannot 
be executed by the thread pool." },
-    "callerRunsWhenRejected": { "kind": "attribute", "displayName": "Caller 
Runs When Rejected", "required": false, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": "true", "description": "Whether or not to use as caller runs as 
fallback when a task is rejected being added to the thread pool (when its 
full). This is only used as fallback if no rejectedPolicy has been configured, 
or the thread pool has no configure [...]
+    "rejectedPolicy": { "kind": "attribute", "displayName": "Rejected Policy", 
"label": "advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy", "enum": [ "Abort", 
"CallerRuns", "DiscardOldest", "Discard" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the handler for tasks which cannot 
be executed by the thread pool." },
+    "callerRunsWhenRejected": { "kind": "attribute", "displayName": "Caller 
Runs When Rejected", "label": "advanced", "required": false, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": "true", "description": "Whether or not to use 
as caller runs as fallback when a task is rejected being added to the thread 
pool (when its full). This is only used as fallback if no rejectedPolicy has 
been configured, or the thread  [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/throttle.json
 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/throttle.json
index 85e1e7f..928adfa 100644
--- 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/throttle.json
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/throttle.json
@@ -16,9 +16,9 @@
     "correlationExpression": { "kind": "expression", "displayName": 
"Correlation Expression", "required": false, "type": "object", "javaType": 
"org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", 
"csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser", 
"joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", 
"spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, 
"autowired": false, "secret": false, "des [...]
     "executorService": { "kind": "attribute", "displayName": "Executor 
Service", "label": "advanced", "required": false, "type": "object", "javaType": 
"java.util.concurrent.ExecutorService", "deprecated": false, "autowired": 
false, "secret": false, "description": "To use a custom thread pool 
(ScheduledExecutorService) by the throttler." },
     "timePeriodMillis": { "kind": "attribute", "displayName": "Time Period 
Millis", "required": false, "type": "duration", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
"1000", "description": "Sets the time period during which the maximum request 
count is valid for" },
-    "asyncDelayed": { "kind": "attribute", "displayName": "Async Delayed", 
"required": false, "type": "boolean", "javaType": "java.lang.Boolean", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
false, "description": "Enables asynchronous delay which means the thread will 
not block while delaying." },
-    "callerRunsWhenRejected": { "kind": "attribute", "displayName": "Caller 
Runs When Rejected", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": true, "description": "Whether or not the caller should run the 
task when it was rejected by the thread pool. Is by default true" },
-    "rejectExecution": { "kind": "attribute", "displayName": "Reject 
Execution", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Whether or not throttler throws the 
ThrottlerRejectedExecutionException when the exchange exceeds the request limit 
Is by default false" },
+    "asyncDelayed": { "kind": "attribute", "displayName": "Async Delayed", 
"label": "advanced", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Enables asynchronous delay which means 
the thread will not block while delaying." },
+    "callerRunsWhenRejected": { "kind": "attribute", "displayName": "Caller 
Runs When Rejected", "label": "advanced", "required": false, "type": "boolean", 
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": true, "description": "Whether or not the 
caller should run the task when it was rejected by the thread pool. Is by 
default true" },
+    "rejectExecution": { "kind": "attribute", "displayName": "Reject 
Execution", "label": "advanced", "required": false, "type": "boolean", 
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": false, "description": "Whether or not 
throttler throws the ThrottlerRejectedExecutionException when the exchange 
exceeds the request limit Is by default false" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/throwException.json
 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/throwException.json
index 26c733e..c0b576e 100644
--- 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/throwException.json
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/throwException.json
@@ -12,9 +12,9 @@
     "output": false
   },
   "properties": {
-    "ref": { "kind": "attribute", "displayName": "Ref", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Reference to the exception 
instance to lookup from the registry to throw" },
     "message": { "kind": "attribute", "displayName": "Message", "required": 
false, "type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "To create a new exception 
instance and use the given message as caused message (supports simple 
language)" },
     "exceptionType": { "kind": "attribute", "displayName": "Exception Type", 
"required": false, "type": "string", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "description": "The 
class of the exception to create using the message." },
+    "ref": { "kind": "attribute", "displayName": "Ref", "label": "advanced", 
"required": false, "type": "string", "javaType": "java.lang.String", 
"deprecated": false, "autowired": false, "secret": false, "description": 
"Reference to the exception instance to lookup from the registry to throw" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/to.json 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/to.json
index 764567e..e01edc5 100644
--- 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/to.json
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/to.json
@@ -13,7 +13,7 @@
   },
   "properties": {
     "uri": { "kind": "attribute", "displayName": "Uri", "required": true, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the uri of the 
endpoint to send to." },
-    "pattern": { "kind": "attribute", "displayName": "Pattern", "required": 
false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": 
[ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the optional ExchangePattern used 
to invoke this endpoint" },
+    "pattern": { "kind": "attribute", "displayName": "Pattern", "label": 
"advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", 
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the optional ExchangePattern used to invoke this endpoint" 
},
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/toD.json 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/toD.json
index d2cbe69..a656281 100644
--- 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/toD.json
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/toD.json
@@ -13,9 +13,9 @@
   },
   "properties": {
     "uri": { "kind": "attribute", "displayName": "Uri", "required": true, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "The uri of the endpoint to 
send to. The uri can be dynamic computed using the 
org.apache.camel.language.simple.SimpleLanguage expression." },
-    "pattern": { "kind": "attribute", "displayName": "Pattern", "required": 
false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": 
[ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the optional ExchangePattern used 
to invoke this endpoint" },
-    "cacheSize": { "kind": "attribute", "displayName": "Cache Size", 
"required": false, "type": "integer", "javaType": "java.lang.Integer", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the maximum size used by the org.apache.camel.spi.ProducerCache which is used 
to cache and reuse producers when using this recipient list, when uris are 
reused. Beware that when using dynamic endpoints then it affects how well the 
cache can be utilized. If each dynamic end [...]
-    "ignoreInvalidEndpoint": { "kind": "attribute", "displayName": "Ignore 
Invalid Endpoint", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Ignore the invalidate endpoint exception 
when try to create a producer with that endpoint" },
+    "pattern": { "kind": "attribute", "displayName": "Pattern", "label": 
"advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", 
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the optional ExchangePattern used to invoke this endpoint" 
},
+    "cacheSize": { "kind": "attribute", "displayName": "Cache Size", "label": 
"advanced", "required": false, "type": "integer", "javaType": 
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the maximum size used by the 
org.apache.camel.spi.ProducerCache which is used to cache and reuse producers 
when using this recipient list, when uris are reused. Beware that when using 
dynamic endpoints then it affects how well the cache can be utilized [...]
+    "ignoreInvalidEndpoint": { "kind": "attribute", "displayName": "Ignore 
Invalid Endpoint", "label": "advanced", "required": false, "type": "boolean", 
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": false, "description": "Ignore the invalidate 
endpoint exception when try to create a producer with that endpoint" },
     "allowOptimisedComponents": { "kind": "attribute", "displayName": "Allow 
Optimised Components", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": true, "description": "Whether to allow 
components to optimise toD if they are org.apache.camel.spi.SendDynamicAware ." 
},
     "autoStartComponents": { "kind": "attribute", "displayName": "Auto Start 
Components", "label": "advanced", "required": false, "type": "boolean", 
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": true, "description": "Whether to auto startup 
components when toD is starting up." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/validate.json
 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/validate.json
index 1a4dffd..c5c0556 100644
--- 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/validate.json
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/validate.json
@@ -13,7 +13,7 @@
   },
   "properties": {
     "expression": { "kind": "expression", "displayName": "Expression", 
"required": true, "type": "object", "javaType": 
"org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant", 
"csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser", 
"joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", 
"spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, 
"autowired": false, "secret": false, "asPredicate": true, "descrip [...]
-    "predicateExceptionFactory": { "kind": "attribute", "displayName": 
"Predicate Exception Factory", "required": false, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "autowired": false, "secret": false, 
"description": "The bean id of custom PredicateExceptionFactory to use for 
creating the exception when the validation fails. By default, Camel will throw 
PredicateValidationException. By using a custom factory you can control which 
exception to throw instead." },
+    "predicateExceptionFactory": { "kind": "attribute", "displayName": 
"Predicate Exception Factory", "label": "advanced", "required": false, "type": 
"object", "javaType": "org.apache.camel.spi.PredicateExceptionFactory", 
"deprecated": false, "autowired": false, "secret": false, "description": "The 
bean id of custom PredicateExceptionFactory to use for creating the exception 
when the validation fails. By default, Camel will throw 
PredicateValidationException. By using a custom factory yo [...]
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
     "description": { "kind": "element", "displayName": "Description", 
"required": false, "type": "object", "javaType": 
"org.apache.camel.model.DescriptionDefinition", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the description of 
this node" }
   }
diff --git 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/wireTap.json
 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/wireTap.json
index 72c98fb..a8cbee9 100644
--- 
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/wireTap.json
+++ 
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/wireTap.json
@@ -17,9 +17,9 @@
     "onPrepare": { "kind": "attribute", "displayName": "On Prepare", "label": 
"advanced", "required": false, "type": "object", "javaType": 
"org.apache.camel.Processor", "deprecated": false, "autowired": false, 
"secret": false, "description": "Uses the Processor when preparing the 
org.apache.camel.Exchange to be sent. This can be used to deep-clone messages 
that should be sent, or any custom logic needed before the exchange is sent." },
     "executorService": { "kind": "attribute", "displayName": "Executor 
Service", "label": "advanced", "required": false, "type": "object", "javaType": 
"java.util.concurrent.ExecutorService", "deprecated": false, "autowired": 
false, "secret": false, "description": "Uses a custom thread pool" },
     "uri": { "kind": "attribute", "displayName": "Uri", "required": true, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "The uri of the endpoint to 
send to. The uri can be dynamic computed using the 
org.apache.camel.language.simple.SimpleLanguage expression." },
-    "pattern": { "kind": "attribute", "displayName": "Pattern", "required": 
false, "type": "enum", "javaType": "org.apache.camel.ExchangePattern", "enum": 
[ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": 
false, "secret": false, "description": "Sets the optional ExchangePattern used 
to invoke this endpoint" },
-    "cacheSize": { "kind": "attribute", "displayName": "Cache Size", 
"required": false, "type": "integer", "javaType": "java.lang.Integer", 
"deprecated": false, "autowired": false, "secret": false, "description": "Sets 
the maximum size used by the org.apache.camel.spi.ProducerCache which is used 
to cache and reuse producers when using this recipient list, when uris are 
reused. Beware that when using dynamic endpoints then it affects how well the 
cache can be utilized. If each dynamic end [...]
-    "ignoreInvalidEndpoint": { "kind": "attribute", "displayName": "Ignore 
Invalid Endpoint", "required": false, "type": "boolean", "javaType": 
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": false, "description": "Ignore the invalidate endpoint exception 
when try to create a producer with that endpoint" },
+    "pattern": { "kind": "attribute", "displayName": "Pattern", "label": 
"advanced", "required": false, "type": "enum", "javaType": 
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", 
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the optional ExchangePattern used to invoke this endpoint" 
},
+    "cacheSize": { "kind": "attribute", "displayName": "Cache Size", "label": 
"advanced", "required": false, "type": "integer", "javaType": 
"java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the maximum size used by the 
org.apache.camel.spi.ProducerCache which is used to cache and reuse producers 
when using this recipient list, when uris are reused. Beware that when using 
dynamic endpoints then it affects how well the cache can be utilized [...]
+    "ignoreInvalidEndpoint": { "kind": "attribute", "displayName": "Ignore 
Invalid Endpoint", "label": "advanced", "required": false, "type": "boolean", 
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": false, "description": "Ignore the invalidate 
endpoint exception when try to create a producer with that endpoint" },
     "allowOptimisedComponents": { "kind": "attribute", "displayName": "Allow 
Optimised Components", "label": "advanced", "required": false, "type": 
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": true, "description": "Whether to allow 
components to optimise toD if they are org.apache.camel.spi.SendDynamicAware ." 
},
     "autoStartComponents": { "kind": "attribute", "displayName": "Auto Start 
Components", "label": "advanced", "required": false, "type": "boolean", 
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": true, "description": "Whether to auto startup 
components when toD is starting up." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the id of this node" 
},
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/PolicyDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/PolicyDefinition.java
index dae5337..291a6df 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/PolicyDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/PolicyDefinition.java
@@ -43,7 +43,7 @@ public class PolicyDefinition extends 
OutputDefinition<PolicyDefinition> {
     private Policy policy;
 
     @XmlAttribute(required = true)
-    protected String ref;
+    private String ref;
 
     public PolicyDefinition() {
     }
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
index 3b416a1..a5831df 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ProcessorDefinition.java
@@ -1653,9 +1653,24 @@ public abstract class ProcessorDefinition<Type extends 
ProcessorDefinition<Type>
      * which only a single exchange is allowed to pass through. All other 
exchanges will be stopped.
      *
      * @param  samplePeriod this is the sample interval, only one exchange is 
allowed through in this interval
+     * @return              the builder
+     */
+    public SamplingDefinition sample(String samplePeriod) {
+        SamplingDefinition answer = new SamplingDefinition(samplePeriod);
+        addOutput(answer);
+        return answer;
+    }
+
+    /**
+     * <a href="http://camel.apache.org/sampling.html";>Sampling Throttler</a> 
Creates a sampling throttler allowing you
+     * to extract a sample of exchanges from the traffic through a route. It 
is configured with a sampling period during
+     * which only a single exchange is allowed to pass through. All other 
exchanges will be stopped.
+     *
+     * @param  samplePeriod this is the sample interval, only one exchange is 
allowed through in this interval
      * @param  unit         this is the units for the samplePeriod e.g. Seconds
      * @return              the builder
      */
+    @Deprecated
     public SamplingDefinition sample(long samplePeriod, TimeUnit unit) {
         SamplingDefinition answer = new SamplingDefinition(samplePeriod, unit);
         addOutput(answer);
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinitions.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinitions.java
index e589430..797e78c 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinitions.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinitions.java
@@ -19,14 +19,11 @@ package org.apache.camel.model;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 @XmlType
-@XmlAccessorType(XmlAccessType.PROPERTY)
 public class PropertyDefinitions {
 
     @XmlTransient
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
index 3131415..fb7cdea8 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SagaDefinition.java
@@ -46,14 +46,15 @@ public class SagaDefinition extends 
OutputDefinition<SagaDefinition> {
     @XmlTransient
     private CamelSagaService sagaServiceBean;
     @XmlAttribute
-    @Metadata(javaType = "org.apache.camel.saga.CamelSagaService")
+    @Metadata(label = "advanced", javaType = 
"org.apache.camel.saga.CamelSagaService")
     private String sagaService;
     @XmlAttribute
-    @Metadata(javaType = "org.apache.camel.model.SagaPropagation", 
defaultValue = "REQUIRED",
+    @Metadata(label = "advanced", javaType = 
"org.apache.camel.model.SagaPropagation", defaultValue = "REQUIRED",
               enums = 
"REQUIRED,REQUIRES_NEW,MANDATORY,SUPPORTS,NOT_SUPPORTED,NEVER")
     private String propagation;
     @XmlAttribute
-    @Metadata(javaType = "org.apache.camel.model.SagaCompletionMode", 
defaultValue = "AUTO", enums = "AUTO,MANUAL")
+    @Metadata(label = "advanced", javaType = 
"org.apache.camel.model.SagaCompletionMode", defaultValue = "AUTO",
+              enums = "AUTO,MANUAL")
     private String completionMode;
     @XmlAttribute
     @Metadata(javaType = "java.time.Duration")
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java
index 4304f12..fbfe9e5 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SamplingDefinition.java
@@ -41,18 +41,16 @@ public class SamplingDefinition extends 
NoOutputDefinition<SamplingDefinition> {
     @XmlAttribute
     @Metadata(javaType = "java.lang.Long")
     private String messageFrequency;
-    @XmlAttribute
-    @Metadata(defaultValue = "SECONDS", enums = 
"NANOSECONDS,MICROSECONDS,MILLISECONDS,SECONDS,MINUTES,HOURS,DAYS",
-              javaType = "java.util.concurrent.TimeUnit", deprecationNote = 
"Use samplePeriod extended syntax instead")
-    @Deprecated
-    private String units;
 
     public SamplingDefinition() {
     }
 
+    public SamplingDefinition(String samplePeriod) {
+        this.samplePeriod = samplePeriod;
+    }
+
     public SamplingDefinition(Duration period) {
         this.samplePeriod = TimeUtils.printDuration(period);
-        this.units = TimeUnit.MILLISECONDS.name();
     }
 
     public SamplingDefinition(long samplePeriod, TimeUnit units) {
@@ -93,7 +91,7 @@ public class SamplingDefinition extends 
NoOutputDefinition<SamplingDefinition> {
      * Sets the sample message count which only a single {@link 
org.apache.camel.Exchange} will pass through after this
      * many received.
      *
-     * @param  messageFrequency
+     * @param  messageFrequency the message frequency
      * @return                  the builder
      */
     public SamplingDefinition sampleMessageFrequency(long messageFrequency) {
@@ -118,20 +116,19 @@ public class SamplingDefinition extends 
NoOutputDefinition<SamplingDefinition> {
      * @param  samplePeriod the period
      * @return              the builder
      */
-    public SamplingDefinition samplePeriod(long samplePeriod) {
+    public SamplingDefinition samplePeriod(String samplePeriod) {
         setSamplePeriod(samplePeriod);
         return this;
     }
 
     /**
-     * Sets the time units for the sample period, defaulting to seconds.
+     * Sets the sample period during which only a single {@link 
org.apache.camel.Exchange} will pass through.
      *
-     * @param  units the time unit of the sample period.
-     * @return       the builder
+     * @param  samplePeriod the period
+     * @return              the builder
      */
-    @Deprecated
-    public SamplingDefinition timeUnits(TimeUnit units) {
-        setUnits(units);
+    public SamplingDefinition samplePeriod(long samplePeriod) {
+        setSamplePeriod(samplePeriod);
         return this;
     }
 
@@ -172,24 +169,4 @@ public class SamplingDefinition extends 
NoOutputDefinition<SamplingDefinition> {
         this.messageFrequency = Long.toString(messageFrequency);
     }
 
-    /**
-     * Sets the time units for the sample period, defaulting to seconds.
-     */
-    @Deprecated
-    public void setUnits(String units) {
-        this.units = units;
-    }
-
-    /**
-     * Sets the time units for the sample period, defaulting to seconds.
-     */
-    @Deprecated
-    public void setUnits(TimeUnit units) {
-        this.units = units.name();
-    }
-
-    @Deprecated
-    public String getUnits() {
-        return units;
-    }
 }
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SendDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SendDefinition.java
index 0a90a06..66657f8 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SendDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SendDefinition.java
@@ -31,14 +31,16 @@ import org.apache.camel.spi.Metadata;
 @XmlAccessorType(XmlAccessType.FIELD)
 public abstract class SendDefinition<Type extends ProcessorDefinition<Type>> 
extends NoOutputDefinition<Type>
         implements EndpointRequiredDefinition {
-    @XmlAttribute
-    @Metadata(required = true)
-    protected String uri;
+
     @XmlTransient
     protected Endpoint endpoint;
     @XmlTransient
     protected EndpointProducerBuilder endpointProducerBuilder;
 
+    @XmlAttribute
+    @Metadata(required = true)
+    protected String uri;
+
     public SendDefinition() {
     }
 
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
index ee24072..4e5fa3a 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SetExchangePatternDefinition.java
@@ -31,6 +31,7 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "setExchangePattern")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class SetExchangePatternDefinition extends 
NoOutputDefinition<SetExchangePatternDefinition> {
+
     @XmlAttribute(required = true)
     @Metadata(required = true, javaType = "org.apache.camel.ExchangePattern", 
enums = "InOnly,InOut,InOptionalOut")
     private String pattern;
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
index a0e3ee5..149ab4b 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SetHeaderDefinition.java
@@ -33,6 +33,7 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "setHeader")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class SetHeaderDefinition extends ExpressionNode {
+
     @XmlAttribute(required = true)
     private String name;
 
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
index 02b54de..496fd91 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SetPropertyDefinition.java
@@ -33,6 +33,7 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "setProperty")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class SetPropertyDefinition extends ExpressionNode {
+
     @XmlAttribute(required = true)
     private String name;
 
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SortDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SortDefinition.java
index 154b065..c2e4859 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SortDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SortDefinition.java
@@ -35,6 +35,7 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "sort")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class SortDefinition<T> extends ExpressionNode {
+
     @XmlTransient
     private Comparator<? super T> comparatorBean;
     @XmlAttribute
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
index fc97ab7..8eaf0f5 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/SplitDefinition.java
@@ -48,7 +48,6 @@ public class SplitDefinition extends OutputExpressionNode 
implements ExecutorSer
     @XmlAttribute
     @Metadata(defaultValue = ",")
     private String delimiter;
-
     @XmlAttribute
     @Metadata(javaType = "org.apache.camel.AggregationStrategy")
     private String aggregationStrategy;
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRouteDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRouteDefinition.java
index e0e6e4a..98da50a 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRouteDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRouteDefinition.java
@@ -43,6 +43,9 @@ import org.apache.camel.spi.Metadata;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class TemplatedRouteDefinition implements CamelContextAware {
 
+    @XmlTransient
+    private CamelContext camelContext;
+
     @XmlAttribute(required = true)
     private String routeTemplateRef;
     @XmlAttribute
@@ -53,8 +56,6 @@ public class TemplatedRouteDefinition implements 
CamelContextAware {
     @XmlElement(name = "bean")
     @Metadata(description = "Adds a local bean as input of the template to 
build the route")
     private List<TemplatedRouteBeanDefinition> beans;
-    @XmlTransient
-    private CamelContext camelContext;
 
     public String getRouteTemplateRef() {
         return routeTemplateRef;
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRouteParameterDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRouteParameterDefinition.java
index e7a02f0..4852742 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRouteParameterDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRouteParameterDefinition.java
@@ -30,10 +30,11 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "templatedRouteParameter")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class TemplatedRouteParameterDefinition {
+
     @XmlAttribute(required = true)
-    String name;
+    private String name;
     @XmlAttribute(required = true)
-    String value;
+    private String value;
 
     public TemplatedRouteParameterDefinition() {
     }
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRoutesDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRoutesDefinition.java
index f26a033..372d9f3 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRoutesDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRoutesDefinition.java
@@ -37,11 +37,13 @@ import org.apache.camel.spi.Metadata;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class TemplatedRoutesDefinition extends 
OptionalIdentifiedDefinition<TemplatedRoutesDefinition>
         implements TemplatedRouteContainer, CamelContextAware {
-    @XmlElementRef
-    private List<TemplatedRouteDefinition> templatedRoutes = new ArrayList<>();
+
     @XmlTransient
     private CamelContext camelContext;
 
+    @XmlElementRef
+    private List<TemplatedRouteDefinition> templatedRoutes = new ArrayList<>();
+
     public TemplatedRoutesDefinition() {
     }
 
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
index cfc5a2a..f373d1d 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ThreadPoolProfileDefinition.java
@@ -33,8 +33,9 @@ import 
org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
 @XmlRootElement(name = "threadPoolProfile")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ThreadPoolProfileDefinition extends 
OptionalIdentifiedDefinition<ThreadPoolProfileDefinition> {
+
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String defaultProfile;
     @XmlAttribute
     @Metadata(javaType = "java.lang.Integer")
@@ -46,17 +47,17 @@ public class ThreadPoolProfileDefinition extends 
OptionalIdentifiedDefinition<Th
     @Metadata(javaType = "java.lang.Long")
     private String keepAliveTime;
     @XmlAttribute
-    @Metadata(javaType = "java.util.concurrent.TimeUnit",
+    @Metadata(label = "advanced", javaType = "java.util.concurrent.TimeUnit",
               enums = 
"NANOSECONDS,MICROSECONDS,MILLISECONDS,SECONDS,MINUTES,HOURS,DAYS")
     private String timeUnit;
     @XmlAttribute
     @Metadata(javaType = "java.lang.Integer")
     private String maxQueueSize;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String allowCoreThreadTimeOut;
     @XmlAttribute
-    @Metadata(javaType = 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy",
+    @Metadata(label = "advanced", javaType = 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy",
               enums = "Abort,CallerRuns,DiscardOldest,Discard")
     private String rejectedPolicy;
 
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ThreadsDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ThreadsDefinition.java
index 8d3d8b0..00e4a82 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ThreadsDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ThreadsDefinition.java
@@ -53,24 +53,24 @@ public class ThreadsDefinition extends 
NoOutputDefinition<ThreadsDefinition>
     @Metadata(javaType = "java.lang.Long")
     private String keepAliveTime;
     @XmlAttribute
-    @Metadata(javaType = "java.util.concurrent.TimeUnit",
+    @Metadata(label = "advanced", javaType = "java.util.concurrent.TimeUnit",
               enums = 
"NANOSECONDS,MICROSECONDS,MILLISECONDS,SECONDS,MINUTES,HOURS,DAYS")
     private String timeUnit;
     @XmlAttribute
     @Metadata(javaType = "java.lang.Integer")
     private String maxQueueSize;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String allowCoreThreadTimeOut;
     @XmlAttribute
     @Metadata(defaultValue = "Threads")
     private String threadName;
     @XmlAttribute
-    @Metadata(javaType = 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy",
+    @Metadata(label = "advanced", javaType = 
"org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy",
               enums = "Abort,CallerRuns,DiscardOldest,Discard")
     private String rejectedPolicy;
     @XmlAttribute
-    @Metadata(defaultValue = "true")
+    @Metadata(label = "advanced", defaultValue = "true")
     private String callerRunsWhenRejected;
 
     public ThreadsDefinition() {
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ThrottleDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ThrottleDefinition.java
index ccdd0fe..68ac6bf 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ThrottleDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ThrottleDefinition.java
@@ -45,7 +45,6 @@ public class ThrottleDefinition extends ExpressionNode 
implements ExecutorServic
 
     @XmlElement(name = "correlationExpression")
     private ExpressionSubElementDefinition correlationExpression;
-
     @XmlAttribute
     @Metadata(label = "advanced", javaType = 
"java.util.concurrent.ExecutorService")
     private String executorService;
@@ -53,13 +52,13 @@ public class ThrottleDefinition extends ExpressionNode 
implements ExecutorServic
     @Metadata(defaultValue = "1000", javaType = "java.time.Duration")
     private String timePeriodMillis;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String asyncDelayed;
     @XmlAttribute
-    @Metadata(defaultValue = "true", javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", defaultValue = "true", javaType = 
"java.lang.Boolean")
     private String callerRunsWhenRejected;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String rejectExecution;
 
     public ThrottleDefinition() {
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
index 014040b..a8de0cf 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ThrowExceptionDefinition.java
@@ -31,17 +31,20 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "throwException")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ThrowExceptionDefinition extends 
NoOutputDefinition<ThrowExceptionDefinition> {
-    @XmlAttribute
-    private String ref;
-    @XmlAttribute
-    private String message;
+
     @XmlTransient
     private Exception exception;
-    @XmlAttribute
-    private String exceptionType;
     @XmlTransient
     private Class<? extends Exception> exceptionClass;
 
+    @XmlAttribute
+    private String message;
+    @XmlAttribute
+    private String exceptionType;
+    @XmlAttribute
+    @Metadata(label = "advanced")
+    private String ref;
+
     public ThrowExceptionDefinition() {
     }
 
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ToDefinition.java 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ToDefinition.java
index d330174..5800cca 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ToDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ToDefinition.java
@@ -33,8 +33,9 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "to")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ToDefinition extends SendDefinition<ToDefinition> {
+
     @XmlAttribute
-    @Metadata(javaType = "org.apache.camel.ExchangePattern", enums = 
"InOnly,InOut,InOptionalOut")
+    @Metadata(label = "advanced", javaType = 
"org.apache.camel.ExchangePattern", enums = "InOnly,InOut,InOptionalOut")
     private String pattern;
 
     public ToDefinition() {
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
index 15625cf..4ffdf88 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ToDynamicDefinition.java
@@ -37,17 +37,18 @@ public class ToDynamicDefinition extends 
NoOutputDefinition<ToDynamicDefinition>
 
     @XmlTransient
     protected EndpointProducerBuilder endpointProducerBuilder;
+
     @XmlAttribute
     @Metadata(required = true)
     private String uri;
     @XmlAttribute
-    @Metadata(javaType = "org.apache.camel.ExchangePattern", enums = 
"InOnly,InOut,InOptionalOut")
+    @Metadata(label = "advanced", javaType = 
"org.apache.camel.ExchangePattern", enums = "InOnly,InOut,InOptionalOut")
     private String pattern;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Integer")
+    @Metadata(label = "advanced", javaType = "java.lang.Integer")
     private String cacheSize;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String ignoreInvalidEndpoint;
     @XmlAttribute
     @Metadata(label = "advanced", defaultValue = "true", javaType = 
"java.lang.Boolean")
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/TransactedDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/TransactedDefinition.java
index edcac22..427f6cf 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/TransactedDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/TransactedDefinition.java
@@ -42,14 +42,14 @@ public class TransactedDefinition extends 
OutputDefinition<TransactedDefinition>
     // if we extend PolicyDefinition so we must make a copy of the class
     @XmlTransient
     public static final String PROPAGATION_REQUIRED = "PROPAGATION_REQUIRED";
-
     @XmlTransient
-    protected Class<? extends Policy> type = TransactedPolicy.class;
-    @XmlAttribute
-    protected String ref;
+    private Class<? extends Policy> type = TransactedPolicy.class;
     @XmlTransient
     private Policy policy;
 
+    @XmlAttribute
+    private String ref;
+
     public TransactedDefinition() {
     }
 
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
index 7dbe3e7..738b26a 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
@@ -73,46 +73,46 @@ import org.apache.camel.spi.Metadata;
 public class UnmarshalDefinition extends 
NoOutputDefinition<UnmarshalDefinition> implements DataFormatDefinitionAware {
 
     @XmlElements({
-            @XmlElement(required = false, name = "any23", type = 
Any23DataFormat.class),
-            @XmlElement(required = false, name = "asn1", type = 
ASN1DataFormat.class),
-            @XmlElement(required = false, name = "avro", type = 
AvroDataFormat.class),
-            @XmlElement(required = false, name = "barcode", type = 
BarcodeDataFormat.class),
-            @XmlElement(required = false, name = "base64", type = 
Base64DataFormat.class),
-            @XmlElement(required = false, name = "beanio", type = 
BeanioDataFormat.class),
-            @XmlElement(required = false, name = "bindy", type = 
BindyDataFormat.class),
-            @XmlElement(required = false, name = "cbor", type = 
CBORDataFormat.class),
-            @XmlElement(required = false, name = "crypto", type = 
CryptoDataFormat.class),
-            @XmlElement(required = false, name = "csv", type = 
CsvDataFormat.class),
-            @XmlElement(required = false, name = "custom", type = 
CustomDataFormat.class),
-            @XmlElement(required = false, name = "fhirJson", type = 
FhirJsonDataFormat.class),
-            @XmlElement(required = false, name = "fhirXml", type = 
FhirXmlDataFormat.class),
-            @XmlElement(required = false, name = "flatpack", type = 
FlatpackDataFormat.class),
-            @XmlElement(required = false, name = "grok", type = 
GrokDataFormat.class),
-            @XmlElement(required = false, name = "gzipDeflater", type = 
GzipDeflaterDataFormat.class),
-            @XmlElement(required = false, name = "hl7", type = 
HL7DataFormat.class),
-            @XmlElement(required = false, name = "ical", type = 
IcalDataFormat.class),
-            @XmlElement(required = false, name = "jacksonXml", type = 
JacksonXMLDataFormat.class),
-            @XmlElement(required = false, name = "jaxb", type = 
JaxbDataFormat.class),
-            @XmlElement(required = false, name = "json", type = 
JsonDataFormat.class),
-            @XmlElement(required = false, name = "jsonApi", type = 
JsonApiDataFormat.class),
-            @XmlElement(required = false, name = "lzf", type = 
LZFDataFormat.class),
-            @XmlElement(required = false, name = "mimeMultipart", type = 
MimeMultipartDataFormat.class),
-            @XmlElement(required = false, name = "protobuf", type = 
ProtobufDataFormat.class),
-            @XmlElement(required = false, name = "rss", type = 
RssDataFormat.class),
-            @XmlElement(required = false, name = "soap", type = 
SoapDataFormat.class),
-            @XmlElement(required = false, name = "syslog", type = 
SyslogDataFormat.class),
-            @XmlElement(required = false, name = "tarFile", type = 
TarFileDataFormat.class),
-            @XmlElement(required = false, name = "thrift", type = 
ThriftDataFormat.class),
-            @XmlElement(required = false, name = "tidyMarkup", type = 
TidyMarkupDataFormat.class),
-            @XmlElement(required = false, name = "univocityCsv", type = 
UniVocityCsvDataFormat.class),
-            @XmlElement(required = false, name = "univocityFixed", type = 
UniVocityFixedDataFormat.class),
-            @XmlElement(required = false, name = "univocityTsv", type = 
UniVocityTsvDataFormat.class),
-            @XmlElement(required = false, name = "xmlSecurity", type = 
XMLSecurityDataFormat.class),
-            @XmlElement(required = false, name = "xstream", type = 
XStreamDataFormat.class),
-            @XmlElement(required = false, name = "pgp", type = 
PGPDataFormat.class),
-            @XmlElement(required = false, name = "yaml", type = 
YAMLDataFormat.class),
-            @XmlElement(required = false, name = "zipDeflater", type = 
ZipDeflaterDataFormat.class),
-            @XmlElement(required = false, name = "zipFile", type = 
ZipFileDataFormat.class) })
+            @XmlElement(name = "any23", type = Any23DataFormat.class),
+            @XmlElement(name = "asn1", type = ASN1DataFormat.class),
+            @XmlElement(name = "avro", type = AvroDataFormat.class),
+            @XmlElement(name = "barcode", type = BarcodeDataFormat.class),
+            @XmlElement(name = "base64", type = Base64DataFormat.class),
+            @XmlElement(name = "beanio", type = BeanioDataFormat.class),
+            @XmlElement(name = "bindy", type = BindyDataFormat.class),
+            @XmlElement(name = "cbor", type = CBORDataFormat.class),
+            @XmlElement(name = "crypto", type = CryptoDataFormat.class),
+            @XmlElement(name = "csv", type = CsvDataFormat.class),
+            @XmlElement(name = "custom", type = CustomDataFormat.class),
+            @XmlElement(name = "fhirJson", type = FhirJsonDataFormat.class),
+            @XmlElement(name = "fhirXml", type = FhirXmlDataFormat.class),
+            @XmlElement(name = "flatpack", type = FlatpackDataFormat.class),
+            @XmlElement(name = "grok", type = GrokDataFormat.class),
+            @XmlElement(name = "gzipDeflater", type = 
GzipDeflaterDataFormat.class),
+            @XmlElement(name = "hl7", type = HL7DataFormat.class),
+            @XmlElement(name = "ical", type = IcalDataFormat.class),
+            @XmlElement(name = "jacksonXml", type = 
JacksonXMLDataFormat.class),
+            @XmlElement(name = "jaxb", type = JaxbDataFormat.class),
+            @XmlElement(name = "json", type = JsonDataFormat.class),
+            @XmlElement(name = "jsonApi", type = JsonApiDataFormat.class),
+            @XmlElement(name = "lzf", type = LZFDataFormat.class),
+            @XmlElement(name = "mimeMultipart", type = 
MimeMultipartDataFormat.class),
+            @XmlElement(name = "protobuf", type = ProtobufDataFormat.class),
+            @XmlElement(name = "rss", type = RssDataFormat.class),
+            @XmlElement(name = "soap", type = SoapDataFormat.class),
+            @XmlElement(name = "syslog", type = SyslogDataFormat.class),
+            @XmlElement(name = "tarFile", type = TarFileDataFormat.class),
+            @XmlElement(name = "thrift", type = ThriftDataFormat.class),
+            @XmlElement(name = "tidyMarkup", type = 
TidyMarkupDataFormat.class),
+            @XmlElement(name = "univocityCsv", type = 
UniVocityCsvDataFormat.class),
+            @XmlElement(name = "univocityFixed", type = 
UniVocityFixedDataFormat.class),
+            @XmlElement(name = "univocityTsv", type = 
UniVocityTsvDataFormat.class),
+            @XmlElement(name = "xmlSecurity", type = 
XMLSecurityDataFormat.class),
+            @XmlElement(name = "xstream", type = XStreamDataFormat.class),
+            @XmlElement(name = "pgp", type = PGPDataFormat.class),
+            @XmlElement(name = "yaml", type = YAMLDataFormat.class),
+            @XmlElement(name = "zipDeflater", type = 
ZipDeflaterDataFormat.class),
+            @XmlElement(name = "zipFile", type = ZipFileDataFormat.class) })
     private DataFormatDefinition dataFormatType;
 
     public UnmarshalDefinition() {
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ValidateDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ValidateDefinition.java
index 5a7c3ea..c017310 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/ValidateDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/ValidateDefinition.java
@@ -38,11 +38,13 @@ import org.apache.camel.spi.PredicateExceptionFactory;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class ValidateDefinition extends ExpressionNode {
 
-    @XmlAttribute
-    private String predicateExceptionFactory;
     @XmlTransient
     private PredicateExceptionFactory factory;
 
+    @XmlAttribute
+    @Metadata(label = "advanced", javaType = 
"org.apache.camel.spi.PredicateExceptionFactory")
+    private String predicateExceptionFactory;
+
     public ValidateDefinition() {
     }
 
diff --git 
a/core/camel-core-model/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
 
b/core/camel-core-model/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
index 6e242e9..0c0244c 100644
--- 
a/core/camel-core-model/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
+++ 
b/core/camel-core-model/src/main/java/org/apache/camel/model/WhenSkipSendToEndpointDefinition.java
@@ -31,6 +31,7 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "whenSkipSendToEndpoint")
 @XmlTransient // do not output in XSD as this is only used in a special "hack" 
for intercept
 public class WhenSkipSendToEndpointDefinition extends WhenDefinition {
+
     @Override
     public String getShortName() {
         return "whenSkipSendToEndpoint";
diff --git 
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SamplingReifier.java
 
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SamplingReifier.java
index a07273b..fc4b786 100644
--- 
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SamplingReifier.java
+++ 
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/SamplingReifier.java
@@ -36,11 +36,8 @@ public class SamplingReifier extends 
ProcessorReifier<SamplingDefinition> {
         if (freq != null) {
             return new SamplingThrottler(freq);
         } else {
-            // should default be 1 sample period
             long time = parseDuration(definition.getSamplePeriod(), 1);
-            // should default be in seconds
-            TimeUnit tu = definition.getUnits() != null ? 
parse(TimeUnit.class, definition.getUnits()) : TimeUnit.SECONDS;
-            return new SamplingThrottler(time, tu);
+            return new SamplingThrottler(time, TimeUnit.MILLISECONDS);
         }
     }
 }
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java
index e29debd..f22eefe 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java
@@ -16,12 +16,13 @@
  */
 package org.apache.camel.processor;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.Exchange;
@@ -163,9 +164,9 @@ public class SamplingThrottlerTest extends 
ContextTestSupport {
                 // START SNIPPET: e1
                 from("direct:sample").sample().to("mock:result");
 
-                from("direct:sample-configured").sample(1, 
TimeUnit.SECONDS).to("mock:result");
+                
from("direct:sample-configured").sample("1000").to("mock:result");
 
-                from("direct:sample-configured-via-dsl").sample(1, 
TimeUnit.SECONDS).to("mock:result");
+                from("direct:sample-configured-via-dsl").sample(Duration.of(1, 
ChronoUnit.SECONDS)).to("mock:result");
 
                 
from("direct:sample-messageFrequency").sample(10).to("mock:result");
 
diff --git 
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java 
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 2c9d79a..c6df265 100644
--- 
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++ 
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -575,9 +575,9 @@ public class ModelParser extends BaseParser {
         return doParse(new LoadBalanceDefinition(),
             processorDefinitionAttributeHandler(), (def, key) -> {
             switch (key) {
+                case "customLoadBalancer": 
def.setLoadBalancerType(doParseCustomLoadBalancerDefinition()); break;
                 case "failover": 
def.setLoadBalancerType(doParseFailoverLoadBalancerDefinition()); break;
                 case "random": 
def.setLoadBalancerType(doParseRandomLoadBalancerDefinition()); break;
-                case "customLoadBalancer": 
def.setLoadBalancerType(doParseCustomLoadBalancerDefinition()); break;
                 case "roundRobin": 
def.setLoadBalancerType(doParseRoundRobinLoadBalancerDefinition()); break;
                 case "sticky": 
def.setLoadBalancerType(doParseStickyLoadBalancerDefinition()); break;
                 case "topic": 
def.setLoadBalancerType(doParseTopicLoadBalancerDefinition()); break;
@@ -587,10 +587,6 @@ public class ModelParser extends BaseParser {
             return true;
         }, noValueHandler());
     }
-    protected LoadBalancerDefinition doParseLoadBalancerDefinition() throws 
IOException, XmlPullParserException {
-        return doParse(new LoadBalancerDefinition(), 
-            identifiedTypeAttributeHandler(),  noElementHandler(), 
noValueHandler());
-    }
     protected LogDefinition doParseLogDefinition() throws IOException, 
XmlPullParserException {
         return doParse(new LogDefinition(), (def, key, val) -> {
             switch (key) {
@@ -1277,7 +1273,6 @@ public class ModelParser extends BaseParser {
             switch (key) {
                 case "messageFrequency": def.setMessageFrequency(val); break;
                 case "samplePeriod": def.setSamplePeriod(val); break;
-                case "units": def.setUnits(val); break;
                 default: return 
processorDefinitionAttributeHandler().accept(def, key, val);
             }
             return true;
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
 
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 8fe6e58..52b5972 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -13229,6 +13229,7 @@ public final class ModelDeserializers extends 
YamlDeserializerSupport {
     }
 
     @YamlType(
+            inline = true,
             types = org.apache.camel.model.SamplingDefinition.class,
             order = 
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
             nodes = "sample",
@@ -13237,8 +13238,7 @@ public final class ModelDeserializers extends 
YamlDeserializerSupport {
                     @YamlProperty(name = "id", type = "string"),
                     @YamlProperty(name = "inherit-error-handler", type = 
"boolean"),
                     @YamlProperty(name = "message-frequency", type = "number"),
-                    @YamlProperty(name = "sample-period", type = "string"),
-                    @YamlProperty(name = "units", type = "string", deprecated 
= true)
+                    @YamlProperty(name = "sample-period", type = "string")
             }
     )
     public static class SamplingDefinitionDeserializer extends 
YamlDeserializerBase<SamplingDefinition> {
@@ -13252,6 +13252,11 @@ public final class ModelDeserializers extends 
YamlDeserializerSupport {
         }
 
         @Override
+        protected SamplingDefinition newInstance(String value) {
+            return new SamplingDefinition(value);
+        }
+
+        @Override
         protected boolean setProperty(SamplingDefinition target, String 
propertyKey,
                 String propertyName, Node node) {
             switch(propertyKey) {
@@ -13270,11 +13275,6 @@ public final class ModelDeserializers extends 
YamlDeserializerSupport {
                     target.setSamplePeriod(val);
                     break;
                 }
-                case "units": {
-                    String val = asText(node);
-                    target.setUnits(val);
-                    break;
-                }
                 case "id": {
                     String val = asText(node);
                     target.setId(val);
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index b7dc375..ccabf7d 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -2671,27 +2671,28 @@
         }
       },
       "org.apache.camel.model.SamplingDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inherit-error-handler" : {
-            "type" : "boolean"
-          },
-          "message-frequency" : {
-            "type" : "number"
-          },
-          "sample-period" : {
-            "type" : "string"
-          },
-          "units" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inherit-error-handler" : {
+              "type" : "boolean"
+            },
+            "message-frequency" : {
+              "type" : "number"
+            },
+            "sample-period" : {
+              "type" : "string"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.ScriptDefinition" : {
         "type" : "object",
diff --git 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
index 6a9d85b..db28585 100644
--- 
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
+++ 
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
@@ -2572,27 +2572,28 @@
         }
       },
       "org.apache.camel.model.SamplingDefinition" : {
-        "type" : "object",
-        "properties" : {
-          "description" : {
-            "type" : "string"
-          },
-          "id" : {
-            "type" : "string"
-          },
-          "inheritErrorHandler" : {
-            "type" : "boolean"
-          },
-          "messageFrequency" : {
-            "type" : "number"
-          },
-          "samplePeriod" : {
-            "type" : "string"
-          },
-          "units" : {
-            "type" : "string"
+        "oneOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "description" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "inheritErrorHandler" : {
+              "type" : "boolean"
+            },
+            "messageFrequency" : {
+              "type" : "number"
+            },
+            "samplePeriod" : {
+              "type" : "string"
+            }
           }
-        }
+        } ]
       },
       "org.apache.camel.model.ScriptDefinition" : {
         "type" : "object",

Reply via email to