You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/11/06 13:36:38 UTC

[camel] branch master updated (a9390ff -> 27dbd74)

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

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


    from a9390ff  Sync deps
     new a1311f2  CAMEL-15824: camel-core - Optimize configurer to have getOptionType and clear big map after bootstrap. Only api components need to retrain.
     new 16c1802  CAMEL-15826: camel-main - Remove autowire by type
     new 27dbd74  Regen

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../activemq/ActiveMQComponentConfigurer.java      |  18 +-
 .../activemq/ActiveMQEndpointConfigurer.java       |   2 +-
 .../component/ahc/ws/WsComponentConfigurer.java    |  12 +-
 .../component/ahc/ws/WsEndpointConfigurer.java     |  20 +-
 .../component/ahc/AhcComponentConfigurer.java      |  26 +-
 .../camel/component/ahc/AhcEndpointConfigurer.java |  38 +-
 .../component/amqp/AMQPComponentConfigurer.java    |  12 +-
 .../component/amqp/AMQPEndpointConfigurer.java     |   2 +-
 .../component/apns/ApnsComponentConfigurer.java    |  18 +-
 .../component/apns/ApnsEndpointConfigurer.java     |  51 +-
 .../arangodb/ArangoDbComponentConfigurer.java      |  27 +-
 .../arangodb/ArangoDbEndpointConfigurer.java       |  27 +-
 .../as2/AS2ClientManagerEndpointConfiguration.java |   2 +-
 ...ientManagerEndpointConfigurationConfigurer.java |  68 ++-
 .../component/as2/AS2ComponentConfigurer.java      |  17 +-
 .../component/as2/AS2ConfigurationConfigurer.java  |  64 ++-
 .../camel/component/as2/AS2EndpointConfigurer.java |  70 ++-
 .../as2/AS2ServerManagerEndpointConfiguration.java |   2 +-
 ...rverManagerEndpointConfigurationConfigurer.java |  66 ++-
 .../camel/component/as2/AS2Configuration.java      |   2 +-
 .../asterisk/AsteriskComponentConfigurer.java      |  16 +-
 .../asterisk/AsteriskEndpointConfigurer.java       |  25 +-
 .../atlasmap/AtlasMapComponentConfigurer.java      |  16 +-
 .../atlasmap/AtlasMapEndpointConfigurer.java       |  27 +-
 .../component/atmos/AtmosComponentConfigurer.java  |  23 +-
 .../component/atmos/AtmosEndpointConfigurer.java   |  35 +-
 .../websocket/WebsocketComponentConfigurer.java    |  12 +-
 .../websocket/WebsocketEndpointConfigurer.java     |  18 +-
 .../component/atom/AtomComponentConfigurer.java    |  14 +-
 .../component/atom/AtomEndpointConfigurer.java     |  61 +-
 .../client/map/AtomixMapComponentConfigurer.java   |  40 +-
 .../client/map/AtomixMapEndpointConfigurer.java    |  44 +-
 .../AtomixMessagingComponentConfigurer.java        |  44 +-
 .../AtomixMessagingEndpointConfigurer.java         |  48 +-
 .../AtomixMultiMapComponentConfigurer.java         |  38 +-
 .../multimap/AtomixMultiMapEndpointConfigurer.java |  38 +-
 .../queue/AtomixQueueComponentConfigurer.java      |  38 +-
 .../queue/AtomixQueueEndpointConfigurer.java       |  42 +-
 .../client/set/AtomixSetComponentConfigurer.java   |  39 +-
 .../client/set/AtomixSetEndpointConfigurer.java    |  43 +-
 .../value/AtomixValueComponentConfigurer.java      |  39 +-
 .../value/AtomixValueEndpointConfigurer.java       |  43 +-
 .../component/avro/AvroComponentConfigurer.java    |  28 +-
 .../component/avro/AvroEndpointConfigurer.java     |  32 +-
 .../component/aws/cw/CwComponentConfigurer.java    |  34 +-
 .../component/aws/cw/CwEndpointConfigurer.java     |  34 +-
 .../component/aws/ddb/DdbComponentConfigurer.java  |  41 +-
 .../component/aws/ddb/DdbEndpointConfigurer.java   |  41 +-
 .../ddbstream/DdbStreamComponentConfigurer.java    |  36 +-
 .../aws/ddbstream/DdbStreamEndpointConfigurer.java |  69 ++-
 .../component/aws/ec2/EC2ComponentConfigurer.java  |  31 +-
 .../component/aws/ec2/EC2EndpointConfigurer.java   |  31 +-
 .../component/aws/ecs/ECSComponentConfigurer.java  |  31 +-
 .../component/aws/ecs/ECSEndpointConfigurer.java   |  31 +-
 .../component/aws/eks/EKSComponentConfigurer.java  |  31 +-
 .../component/aws/eks/EKSEndpointConfigurer.java   |  31 +-
 .../component/aws/iam/IAMComponentConfigurer.java  |  31 +-
 .../component/aws/iam/IAMEndpointConfigurer.java   |  31 +-
 .../KinesisFirehoseComponentConfigurer.java        |  30 +-
 .../KinesisFirehoseEndpointConfigurer.java         |  30 +-
 .../aws/kinesis/KinesisComponentConfigurer.java    |  42 +-
 .../aws/kinesis/KinesisEndpointConfigurer.java     |  75 ++-
 .../component/aws/kms/KMSComponentConfigurer.java  |  31 +-
 .../component/aws/kms/KMSEndpointConfigurer.java   |  31 +-
 .../aws/lambda/LambdaComponentConfigurer.java      |  31 +-
 .../aws/lambda/LambdaEndpointConfigurer.java       |  31 +-
 .../component/aws/mq/MQComponentConfigurer.java    |  31 +-
 .../component/aws/mq/MQEndpointConfigurer.java     |  31 +-
 .../component/aws/msk/MSKComponentConfigurer.java  |  31 +-
 .../component/aws/msk/MSKEndpointConfigurer.java   |  31 +-
 .../component/aws/s3/S3ComponentConfigurer.java    |  82 ++-
 .../component/aws/s3/S3EndpointConfigurer.java     | 119 +++-
 .../component/aws/sdb/SdbComponentConfigurer.java  |  14 +-
 .../component/aws/sdb/SdbEndpointConfigurer.java   |  33 +-
 .../component/aws/ses/SesComponentConfigurer.java  |  36 +-
 .../component/aws/ses/SesEndpointConfigurer.java   |  36 +-
 .../component/aws/sns/SnsComponentConfigurer.java  |  46 +-
 .../component/aws/sns/SnsEndpointConfigurer.java   |  48 +-
 .../component/aws/sqs/SqsComponentConfigurer.java  |  83 ++-
 .../component/aws/sqs/SqsEndpointConfigurer.java   | 120 +++-
 .../component/aws/swf/SWFComponentConfigurer.java  |  66 ++-
 .../component/aws/swf/SWFEndpointConfigurer.java   |  70 ++-
 .../translate/TranslateComponentConfigurer.java    |  37 +-
 .../aws/translate/TranslateEndpointConfigurer.java |  37 +-
 .../aws2/athena/Athena2ComponentConfigurer.java    |  64 ++-
 .../aws2/athena/Athena2EndpointConfigurer.java     |  64 ++-
 .../component/aws2/cw/Cw2ComponentConfigurer.java  |  36 +-
 .../component/aws2/cw/Cw2EndpointConfigurer.java   |  36 +-
 .../aws2/ddb/Ddb2ComponentConfigurer.java          |  43 +-
 .../component/aws2/ddb/Ddb2EndpointConfigurer.java |  43 +-
 .../ddbstream/Ddb2StreamComponentConfigurer.java   |  38 +-
 .../ddbstream/Ddb2StreamEndpointConfigurer.java    |  71 ++-
 .../aws2/ec2/AWS2EC2ComponentConfigurer.java       |  35 +-
 .../aws2/ec2/AWS2EC2EndpointConfigurer.java        |  35 +-
 .../aws2/ecs/ECS2ComponentConfigurer.java          |  35 +-
 .../component/aws2/ecs/ECS2EndpointConfigurer.java |  35 +-
 .../aws2/eks/EKS2ComponentConfigurer.java          |  35 +-
 .../component/aws2/eks/EKS2EndpointConfigurer.java |  35 +-
 .../EventbridgeComponentConfigurer.java            |  37 +-
 .../eventbridge/EventbridgeEndpointConfigurer.java |  37 +-
 .../aws2/iam/IAM2ComponentConfigurer.java          |  35 +-
 .../component/aws2/iam/IAM2EndpointConfigurer.java |  35 +-
 .../KinesisFirehose2ComponentConfigurer.java       |  35 +-
 .../KinesisFirehose2EndpointConfigurer.java        |  35 +-
 .../aws2/kinesis/Kinesis2ComponentConfigurer.java  |  46 +-
 .../aws2/kinesis/Kinesis2EndpointConfigurer.java   |  79 ++-
 .../aws2/kms/KMS2ComponentConfigurer.java          |  35 +-
 .../component/aws2/kms/KMS2EndpointConfigurer.java |  35 +-
 .../aws2/lambda/Lambda2ComponentConfigurer.java    |  35 +-
 .../aws2/lambda/Lambda2EndpointConfigurer.java     |  35 +-
 .../component/aws2/mq/MQ2ComponentConfigurer.java  |  35 +-
 .../component/aws2/mq/MQ2EndpointConfigurer.java   |  35 +-
 .../aws2/msk/MSK2ComponentConfigurer.java          |  35 +-
 .../component/aws2/msk/MSK2EndpointConfigurer.java |  35 +-
 .../aws2/s3/AWS2S3ComponentConfigurer.java         |  88 ++-
 .../aws2/s3/AWS2S3EndpointConfigurer.java          | 125 ++++-
 .../aws2/ses/Ses2ComponentConfigurer.java          |  38 +-
 .../component/aws2/ses/Ses2EndpointConfigurer.java |  38 +-
 .../aws2/sns/Sns2ComponentConfigurer.java          |  46 +-
 .../component/aws2/sns/Sns2EndpointConfigurer.java |  48 +-
 .../aws2/sqs/Sqs2ComponentConfigurer.java          |  87 ++-
 .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 124 ++++-
 .../aws2/sts/STS2ComponentConfigurer.java          |  35 +-
 .../component/aws2/sts/STS2EndpointConfigurer.java |  35 +-
 .../translate/Translate2ComponentConfigurer.java   |  41 +-
 .../translate/Translate2EndpointConfigurer.java    |  41 +-
 .../eventhubs/EventHubsComponentConfigurer.java    |  51 +-
 .../eventhubs/EventHubsEndpointConfigurer.java     |  55 +-
 .../storage/blob/BlobComponentConfigurer.java      |  60 +-
 .../azure/storage/blob/BlobEndpointConfigurer.java |  66 ++-
 .../storage/queue/QueueComponentConfigurer.java    |  38 +-
 .../storage/queue/QueueEndpointConfigurer.java     |  42 +-
 .../azure/blob/BlobServiceComponentConfigurer.java |  51 +-
 .../azure/blob/BlobServiceEndpointConfigurer.java  |  55 +-
 .../queue/QueueServiceComponentConfigurer.java     |  33 +-
 .../queue/QueueServiceEndpointConfigurer.java      |  37 +-
 .../BeanValidatorComponentConfigurer.java          |  26 +-
 .../validator/BeanValidatorEndpointConfigurer.java |  28 +-
 .../component/bean/BeanComponentConfigurer.java    |  16 +-
 .../component/bean/BeanEndpointConfigurer.java     |  19 +-
 .../beanclass/ClassComponentConfigurer.java        |   2 +-
 .../beanclass/ClassEndpointConfigurer.java         |   2 +-
 .../beanstalk/BeanstalkComponentConfigurer.java    |  18 +-
 .../beanstalk/BeanstalkEndpointConfigurer.java     |  63 ++-
 .../bonita/BonitaComponentConfigurer.java          |  14 +-
 .../component/bonita/BonitaEndpointConfigurer.java |  21 +-
 ...CollaborationsManagerEndpointConfiguration.java |   2 +-
 ...ionsManagerEndpointConfigurationConfigurer.java |  54 +-
 .../BoxCommentsManagerEndpointConfiguration.java   |   2 +-
 ...entsManagerEndpointConfigurationConfigurer.java |  48 +-
 .../component/box/BoxComponentConfigurer.java      |  47 +-
 .../component/box/BoxConfigurationConfigurer.java  |  42 +-
 .../camel/component/box/BoxEndpointConfigurer.java |  51 +-
 .../BoxEventLogsManagerEndpointConfiguration.java  |   2 +-
 ...LogsManagerEndpointConfigurationConfigurer.java |  50 +-
 .../box/BoxEventsManagerEndpointConfiguration.java |   2 +-
 ...entsManagerEndpointConfigurationConfigurer.java |  44 +-
 .../box/BoxFilesManagerEndpointConfiguration.java  |   2 +-
 ...ilesManagerEndpointConfigurationConfigurer.java | 102 +++-
 .../BoxFoldersManagerEndpointConfiguration.java    |   2 +-
 ...dersManagerEndpointConfigurationConfigurer.java |  70 ++-
 .../box/BoxGroupsManagerEndpointConfiguration.java |   2 +-
 ...oupsManagerEndpointConfigurationConfigurer.java |  64 ++-
 .../box/BoxSearchManagerEndpointConfiguration.java |   2 +-
 ...archManagerEndpointConfigurationConfigurer.java |  46 +-
 .../box/BoxTasksManagerEndpointConfiguration.java  |   2 +-
 ...asksManagerEndpointConfigurationConfigurer.java |  58 +-
 .../box/BoxUsersManagerEndpointConfiguration.java  |   2 +-
 ...sersManagerEndpointConfigurationConfigurer.java |  64 ++-
 .../camel/component/box/BoxConfiguration.java      |   2 +-
 .../AddOnGatewayEndpointConfiguration.java         |   2 +-
 ...ddOnGatewayEndpointConfigurationConfigurer.java |  34 +-
 .../AddressGatewayEndpointConfiguration.java       |   2 +-
 ...ressGatewayEndpointConfigurationConfigurer.java |  40 +-
 .../braintree/BraintreeComponentConfigurer.java    |  15 +-
 .../BraintreeConfigurationConfigurer.java          |  34 +-
 .../braintree/BraintreeEndpointConfigurer.java     |  38 +-
 .../ClientTokenGatewayEndpointConfiguration.java   |   2 +-
 ...okenGatewayEndpointConfigurationConfigurer.java |  36 +-
 ...rdVerificationGatewayEndpointConfiguration.java |   2 +-
 ...tionGatewayEndpointConfigurationConfigurer.java |  40 +-
 .../CustomerGatewayEndpointConfiguration.java      |   2 +-
 ...omerGatewayEndpointConfigurationConfigurer.java |  42 +-
 .../DiscountGatewayEndpointConfiguration.java      |   2 +-
 ...ountGatewayEndpointConfigurationConfigurer.java |  34 +-
 .../DisputeGatewayEndpointConfiguration.java       |   2 +-
 ...puteGatewayEndpointConfigurationConfigurer.java |  50 +-
 ...DocumentUploadGatewayEndpointConfiguration.java |   2 +-
 ...loadGatewayEndpointConfigurationConfigurer.java |  36 +-
 ...erchantAccountGatewayEndpointConfiguration.java |   2 +-
 ...ountGatewayEndpointConfigurationConfigurer.java |  42 +-
 .../PaymentMethodGatewayEndpointConfiguration.java |   2 +-
 ...thodGatewayEndpointConfigurationConfigurer.java |  42 +-
 ...entMethodNonceGatewayEndpointConfiguration.java |   2 +-
 ...onceGatewayEndpointConfigurationConfigurer.java |  40 +-
 .../PlanGatewayEndpointConfiguration.java          |   2 +-
 ...PlanGatewayEndpointConfigurationConfigurer.java |  34 +-
 .../ReportGatewayEndpointConfiguration.java        |   2 +-
 ...portGatewayEndpointConfigurationConfigurer.java |  36 +-
 ...ntBatchSummaryGatewayEndpointConfiguration.java |   2 +-
 ...maryGatewayEndpointConfigurationConfigurer.java |  38 +-
 .../SubscriptionGatewayEndpointConfiguration.java  |   2 +-
 ...tionGatewayEndpointConfigurationConfigurer.java |  48 +-
 .../TransactionGatewayEndpointConfiguration.java   |   2 +-
 ...tionGatewayEndpointConfigurationConfigurer.java |  46 +-
 ...okNotificationGatewayEndpointConfiguration.java |   2 +-
 ...tionGatewayEndpointConfigurationConfigurer.java |  40 +-
 .../braintree/BraintreeConfiguration.java          |   2 +-
 .../browse/BrowseComponentConfigurer.java          |  16 +-
 .../component/browse/BrowseEndpointConfigurer.java |  21 +-
 .../cache/CaffeineCacheComponentConfigurer.java    |  41 +-
 .../cache/CaffeineCacheEndpointConfigurer.java     |  41 +-
 .../load/CaffeineLoadCacheComponentConfigurer.java |  41 +-
 .../load/CaffeineLoadCacheEndpointConfigurer.java  |  41 +-
 .../cassandra/CassandraComponentConfigurer.java    |  16 +-
 .../cassandra/CassandraEndpointConfigurer.java     |  65 ++-
 .../chatscript/ChatScriptComponentConfigurer.java  |  14 +-
 .../chatscript/ChatScriptEndpointConfigurer.java   |  19 +-
 .../component/chunk/ChunkComponentConfigurer.java  |  18 +-
 .../component/chunk/ChunkEndpointConfigurer.java   |  29 +-
 .../camel/component/cm/CMComponentConfigurer.java  |  14 +-
 .../camel/component/cm/CMEndpointConfigurer.java   |  23 +-
 .../component/cmis/CMISComponentConfigurer.java    |  18 +-
 .../component/cmis/CMISEndpointConfigurer.java     |  36 +-
 .../apache/camel/coap/CoAPComponentConfigurer.java |  16 +-
 .../apache/camel/coap/CoAPEndpointConfigurer.java  |  40 +-
 .../cometd/CometdComponentConfigurer.java          |  29 +-
 .../component/cometd/CometdEndpointConfigurer.java |  43 +-
 .../consul/ConsulComponentConfigurer.java          |  60 +-
 .../component/consul/ConsulEndpointConfigurer.java |  62 ++-
 .../controlbus/ControlBusComponentConfigurer.java  |  14 +-
 .../controlbus/ControlBusEndpointConfigurer.java   |  23 +-
 .../component/corda/CordaComponentConfigurer.java  |  33 +-
 .../component/corda/CordaEndpointConfigurer.java   |  37 +-
 .../couchbase/CouchbaseComponentConfigurer.java    |  16 +-
 .../couchbase/CouchbaseEndpointConfigurer.java     |  86 ++-
 .../couchdb/CouchDbComponentConfigurer.java        |  16 +-
 .../couchdb/CouchDbEndpointConfigurer.java         |  30 +-
 .../component/cron/CronComponentConfigurer.java    |  16 +-
 .../component/cron/CronEndpointConfigurer.java     |  20 +-
 .../crypto/cms/CryptoCmsComponentConfigurer.java   |  18 +-
 .../crypto/cms/CryptoCmsEndpointConfigurer.java    |  40 +-
 .../DigitalSignatureComponentConfigurer.java       |  45 +-
 .../crypto/DigitalSignatureEndpointConfigurer.java |  45 +-
 .../component/cxf/CxfComponentConfigurer.java      |  22 +-
 .../camel/component/cxf/CxfEndpointConfigurer.java |  76 ++-
 .../cxf/jaxrs/CxfRsComponentConfigurer.java        |  20 +-
 .../cxf/jaxrs/CxfRsEndpointConfigurer.java         |  69 ++-
 .../dataformat/DataFormatComponentConfigurer.java  |  14 +-
 .../dataformat/DataFormatEndpointConfigurer.java   |  15 +-
 .../dataset/DataSetComponentConfigurer.java        |  16 +-
 .../dataset/DataSetEndpointConfigurer.java         |  28 +-
 .../dataset/DataSetTestComponentConfigurer.java    |  14 +-
 .../dataset/DataSetTestEndpointConfigurer.java     |  15 +-
 .../DebeziumMongodbComponentConfigurer.java        | 116 +++-
 .../DebeziumMongodbEndpointConfigurer.java         | 120 +++-
 .../debezium/DebeziumMySqlComponentConfigurer.java | 167 +++++-
 .../debezium/DebeziumMySqlEndpointConfigurer.java  | 171 +++++-
 .../DebeziumPostgresComponentConfigurer.java       | 176 +++++-
 .../DebeziumPostgresEndpointConfigurer.java        | 180 +++++-
 .../DebeziumSqlserverComponentConfigurer.java      | 136 ++++-
 .../DebeziumSqlserverEndpointConfigurer.java       | 140 ++++-
 .../DigitalOceanComponentConfigurer.java           |  14 +-
 .../DigitalOceanEndpointConfigurer.java            |  31 +-
 .../direct/DirectComponentConfigurer.java          |  18 +-
 .../component/direct/DirectEndpointConfigurer.java |  25 +-
 .../directvm/DirectVmComponentConfigurer.java      |  22 +-
 .../directvm/DirectVmEndpointConfigurer.java       |  29 +-
 .../disruptor/DisruptorComponentConfigurer.java    |  28 +-
 .../disruptor/DisruptorEndpointConfigurer.java     |  35 +-
 .../component/djl/DJLComponentConfigurer.java      |  14 +-
 .../camel/component/djl/DJLEndpointConfigurer.java |  19 +-
 .../component/dns/DnsComponentConfigurer.java      |  14 +-
 .../camel/component/dns/DnsEndpointConfigurer.java |  15 +-
 .../docker/DockerComponentConfigurer.java          |  43 +-
 .../component/docker/DockerEndpointConfigurer.java |  47 +-
 .../component/dozer/DozerComponentConfigurer.java  |  14 +-
 .../component/dozer/DozerEndpointConfigurer.java   |  27 +-
 .../component/drill/DrillComponentConfigurer.java  |  14 +-
 .../component/drill/DrillEndpointConfigurer.java   |  20 +-
 .../dropbox/DropboxComponentConfigurer.java        |  16 +-
 .../dropbox/DropboxEndpointConfigurer.java         |  35 +-
 .../ehcache/EhcacheComponentConfigurer.java        |  38 +-
 .../ehcache/EhcacheEndpointConfigurer.java         |  43 +-
 .../ElasticsearchComponentConfigurer.java          |  33 +-
 .../ElasticsearchEndpointConfigurer.java           |  43 +-
 .../component/elsql/ElsqlComponentConfigurer.java  |  24 +-
 .../component/elsql/ElsqlEndpointConfigurer.java   | 101 +++-
 .../etcd/EtcdKeysComponentConfigurer.java          |  29 +-
 .../component/etcd/EtcdKeysEndpointConfigurer.java |  27 +-
 .../etcd/EtcdStatsComponentConfigurer.java         |  35 +-
 .../etcd/EtcdStatsEndpointConfigurer.java          |  66 ++-
 .../etcd/EtcdWatchComponentConfigurer.java         |  31 +-
 .../etcd/EtcdWatchEndpointConfigurer.java          |  33 +-
 .../component/exec/ExecComponentConfigurer.java    |  14 +-
 .../component/exec/ExecEndpointConfigurer.java     |  28 +-
 .../facebook/FacebookComponentConfigurer.java      |  71 ++-
 .../facebook/FacebookEndpointConfigurer.java       | 200 ++++++-
 .../FhirCapabilitiesEndpointConfiguration.java     |   2 +-
 ...apabilitiesEndpointConfigurationConfigurer.java |  62 ++-
 .../component/fhir/FhirComponentConfigurer.java    |  56 +-
 .../fhir/FhirConfigurationConfigurer.java          |  58 +-
 .../fhir/FhirCreateEndpointConfiguration.java      |   2 +-
 .../FhirCreateEndpointConfigurationConfigurer.java |  68 ++-
 .../fhir/FhirDeleteEndpointConfiguration.java      |   2 +-
 .../FhirDeleteEndpointConfigurationConfigurer.java |  70 ++-
 .../component/fhir/FhirEndpointConfigurer.java     |  91 ++-
 .../fhir/FhirHistoryEndpointConfiguration.java     |   2 +-
 ...FhirHistoryEndpointConfigurationConfigurer.java |  72 ++-
 .../fhir/FhirLoadPageEndpointConfiguration.java    |   2 +-
 ...hirLoadPageEndpointConfigurationConfigurer.java |  66 ++-
 .../fhir/FhirMetaEndpointConfiguration.java        |   2 +-
 .../FhirMetaEndpointConfigurationConfigurer.java   |  68 ++-
 .../fhir/FhirOperationEndpointConfiguration.java   |   2 +-
 ...irOperationEndpointConfigurationConfigurer.java |  82 ++-
 .../fhir/FhirPatchEndpointConfiguration.java       |   2 +-
 .../FhirPatchEndpointConfigurationConfigurer.java  |  70 ++-
 .../fhir/FhirReadEndpointConfiguration.java        |   2 +-
 .../FhirReadEndpointConfigurationConfigurer.java   |  84 ++-
 .../fhir/FhirSearchEndpointConfiguration.java      |   2 +-
 .../FhirSearchEndpointConfigurationConfigurer.java |  62 ++-
 .../fhir/FhirTransactionEndpointConfiguration.java |   2 +-
 ...TransactionEndpointConfigurationConfigurer.java |  66 ++-
 .../fhir/FhirUpdateEndpointConfiguration.java      |   2 +-
 .../FhirUpdateEndpointConfigurationConfigurer.java |  72 ++-
 .../fhir/FhirValidateEndpointConfiguration.java    |   2 +-
 ...hirValidateEndpointConfigurationConfigurer.java |  64 ++-
 .../camel/component/fhir/FhirConfiguration.java    |   2 +-
 .../file/watch/FileWatchComponentConfigurer.java   |  24 +-
 .../file/watch/FileWatchEndpointConfigurer.java    |  35 +-
 .../component/file/FileComponentConfigurer.java    |  16 +-
 .../component/file/FileEndpointConfigurer.java     | 177 +++++-
 .../flatpack/FlatpackComponentConfigurer.java      |  16 +-
 .../flatpack/FlatpackEndpointConfigurer.java       |  61 +-
 .../component/flink/FlinkComponentConfigurer.java  |  20 +-
 .../component/flink/FlinkEndpointConfigurer.java   |  24 +-
 .../component/fop/FopComponentConfigurer.java      |  14 +-
 .../camel/component/fop/FopEndpointConfigurer.java |  19 +-
 .../freemarker/FreemarkerComponentConfigurer.java  |  19 +-
 .../freemarker/FreemarkerEndpointConfigurer.java   |  25 +-
 .../file/remote/FtpComponentConfigurer.java        |  16 +-
 .../file/remote/FtpEndpointConfigurer.java         | 204 ++++++-
 .../file/remote/FtpsComponentConfigurer.java       |  12 +-
 .../file/remote/FtpsEndpointConfigurer.java        | 615 ++++++++++++++++++++-
 .../file/remote/SftpComponentConfigurer.java       |  16 +-
 .../file/remote/SftpEndpointConfigurer.java        | 224 +++++++-
 .../ganglia/GangliaComponentConfigurer.java        |  31 +-
 .../ganglia/GangliaEndpointConfigurer.java         |  31 +-
 .../geocoder/GeoCoderComponentConfigurer.java      |  16 +-
 .../geocoder/GeoCoderEndpointConfigurer.java       |  41 +-
 .../component/git/GitComponentConfigurer.java      |  16 +-
 .../camel/component/git/GitEndpointConfigurer.java |  35 +-
 .../github/GitHubComponentConfigurer.java          |  16 +-
 .../component/github/GitHubEndpointConfigurer.java |  33 +-
 .../GoogleBigQueryComponentConfigurer.java         |  20 +-
 .../bigquery/GoogleBigQueryEndpointConfigurer.java |  19 +-
 .../sql/GoogleBigQuerySQLComponentConfigurer.java  |  18 +-
 .../sql/GoogleBigQuerySQLEndpointConfigurer.java   |  17 +-
 .../calendar/CalendarAclEndpointConfiguration.java |   2 +-
 ...CalendarAclEndpointConfigurationConfigurer.java |  38 +-
 .../CalendarCalendarListEndpointConfiguration.java |   2 +-
 ...alendarListEndpointConfigurationConfigurer.java |  36 +-
 .../CalendarCalendarsEndpointConfiguration.java    |   2 +-
 ...arCalendarsEndpointConfigurationConfigurer.java |  34 +-
 .../CalendarChannelsEndpointConfiguration.java     |   2 +-
 ...darChannelsEndpointConfigurationConfigurer.java |  32 +-
 .../CalendarColorsEndpointConfiguration.java       |   2 +-
 ...endarColorsEndpointConfigurationConfigurer.java |  30 +-
 .../CalendarEventsEndpointConfiguration.java       |   2 +-
 ...endarEventsEndpointConfigurationConfigurer.java |  42 +-
 .../CalendarFreebusyEndpointConfiguration.java     |   2 +-
 ...darFreebusyEndpointConfigurationConfigurer.java |  32 +-
 .../CalendarSettingsEndpointConfiguration.java     |   2 +-
 ...darSettingsEndpointConfigurationConfigurer.java |  34 +-
 .../GoogleCalendarComponentConfigurer.java         |  35 +-
 .../GoogleCalendarConfigurationConfigurer.java     |  30 +-
 .../calendar/GoogleCalendarEndpointConfigurer.java |  68 ++-
 .../GoogleCalendarStreamComponentConfigurer.java   |  37 +-
 .../GoogleCalendarStreamEndpointConfigurer.java    |  68 ++-
 .../calendar/GoogleCalendarConfiguration.java      |   2 +-
 .../drive/DriveAboutEndpointConfiguration.java     |   2 +-
 .../DriveAboutEndpointConfigurationConfigurer.java |  24 +-
 .../drive/DriveAppsEndpointConfiguration.java      |   2 +-
 .../DriveAppsEndpointConfigurationConfigurer.java  |  26 +-
 .../drive/DriveChangesEndpointConfiguration.java   |   2 +-
 ...riveChangesEndpointConfigurationConfigurer.java |  28 +-
 .../drive/DriveChannelsEndpointConfiguration.java  |   2 +-
 ...iveChannelsEndpointConfigurationConfigurer.java |  26 +-
 .../drive/DriveChildrenEndpointConfiguration.java  |   2 +-
 ...iveChildrenEndpointConfigurationConfigurer.java |  30 +-
 .../drive/DriveCommentsEndpointConfiguration.java  |   2 +-
 ...iveCommentsEndpointConfigurationConfigurer.java |  30 +-
 .../drive/DriveFilesEndpointConfiguration.java     |   2 +-
 .../DriveFilesEndpointConfigurationConfigurer.java |  34 +-
 .../drive/DriveParentsEndpointConfiguration.java   |   2 +-
 ...riveParentsEndpointConfigurationConfigurer.java |  30 +-
 .../DrivePermissionsEndpointConfiguration.java     |   2 +-
 ...PermissionsEndpointConfigurationConfigurer.java |  32 +-
 .../DrivePropertiesEndpointConfiguration.java      |   2 +-
 ...ePropertiesEndpointConfigurationConfigurer.java |  30 +-
 .../drive/DriveRealtimeEndpointConfiguration.java  |   2 +-
 ...iveRealtimeEndpointConfigurationConfigurer.java |  28 +-
 .../drive/DriveRepliesEndpointConfiguration.java   |   2 +-
 ...riveRepliesEndpointConfigurationConfigurer.java |  32 +-
 .../drive/DriveRevisionsEndpointConfiguration.java |   2 +-
 ...veRevisionsEndpointConfigurationConfigurer.java |  30 +-
 .../drive/GoogleDriveComponentConfigurer.java      |  30 +-
 .../drive/GoogleDriveConfigurationConfigurer.java  |  24 +-
 .../drive/GoogleDriveEndpointConfigurer.java       |  65 ++-
 .../google/drive/GoogleDriveConfiguration.java     |   2 +-
 .../GmailUsersDraftsEndpointConfiguration.java     |   2 +-
 ...UsersDraftsEndpointConfigurationConfigurer.java |  30 +-
 .../mail/GmailUsersEndpointConfiguration.java      |   2 +-
 .../GmailUsersEndpointConfigurationConfigurer.java |  26 +-
 .../GmailUsersHistoryEndpointConfiguration.java    |   2 +-
 ...sersHistoryEndpointConfigurationConfigurer.java |  24 +-
 .../GmailUsersLabelsEndpointConfiguration.java     |   2 +-
 ...UsersLabelsEndpointConfigurationConfigurer.java |  28 +-
 ...rsMessagesAttachmentsEndpointConfiguration.java |   2 +-
 ...AttachmentsEndpointConfigurationConfigurer.java |  28 +-
 .../GmailUsersMessagesEndpointConfiguration.java   |   2 +-
 ...ersMessagesEndpointConfigurationConfigurer.java |  36 +-
 .../GmailUsersThreadsEndpointConfiguration.java    |   2 +-
 ...sersThreadsEndpointConfigurationConfigurer.java |  28 +-
 .../google/mail/GoogleMailComponentConfigurer.java |  29 +-
 .../mail/GoogleMailConfigurationConfigurer.java    |  22 +-
 .../google/mail/GoogleMailEndpointConfigurer.java  |  62 ++-
 .../GoogleMailStreamComponentConfigurer.java       |  33 +-
 .../stream/GoogleMailStreamEndpointConfigurer.java |  64 ++-
 .../google/mail/GoogleMailConfiguration.java       |   2 +-
 .../pubsub/GooglePubsubComponentConfigurer.java    |  23 +-
 .../pubsub/GooglePubsubEndpointConfigurer.java     |  31 +-
 .../sheets/GoogleSheetsComponentConfigurer.java    |  31 +-
 .../GoogleSheetsConfigurationConfigurer.java       |  24 +-
 .../sheets/GoogleSheetsEndpointConfigurer.java     |  64 ++-
 .../SheetsSpreadsheetsEndpointConfiguration.java   |   2 +-
 ...preadsheetsEndpointConfigurationConfigurer.java |  32 +-
 ...etsSpreadsheetsValuesEndpointConfiguration.java |   2 +-
 ...heetsValuesEndpointConfigurationConfigurer.java |  42 +-
 .../GoogleSheetsStreamComponentConfigurer.java     |  41 +-
 .../GoogleSheetsStreamEndpointConfigurer.java      |  72 ++-
 .../google/sheets/GoogleSheetsConfiguration.java   |   2 +-
 .../component/gora/GoraComponentConfigurer.java    |  16 +-
 .../component/gora/GoraEndpointConfigurer.java     |  52 +-
 .../component/grape/GrapeComponentConfigurer.java  |  16 +-
 .../component/grape/GrapeEndpointConfigurer.java   |  15 +-
 .../graphql/GraphqlComponentConfigurer.java        |  14 +-
 .../graphql/GraphqlEndpointConfigurer.java         |  27 +-
 .../component/grpc/GrpcComponentConfigurer.java    |  16 +-
 .../component/grpc/GrpcEndpointConfigurer.java     |  66 ++-
 .../eventbus/GuavaEventBusComponentConfigurer.java |  20 +-
 .../eventbus/GuavaEventBusEndpointConfigurer.java  |  25 +-
 .../HazelcastAtomicnumberComponentConfigurer.java  |  18 +-
 .../HazelcastAtomicnumberEndpointConfigurer.java   |  21 +-
 .../HazelcastInstanceComponentConfigurer.java      |  18 +-
 .../HazelcastInstanceEndpointConfigurer.java       |  25 +-
 .../list/HazelcastListComponentConfigurer.java     |  20 +-
 .../list/HazelcastListEndpointConfigurer.java      |  27 +-
 .../map/HazelcastMapComponentConfigurer.java       |  20 +-
 .../map/HazelcastMapEndpointConfigurer.java        |  27 +-
 .../HazelcastMultimapComponentConfigurer.java      |  20 +-
 .../HazelcastMultimapEndpointConfigurer.java       |  27 +-
 .../queue/HazelcastQueueComponentConfigurer.java   |  20 +-
 .../queue/HazelcastQueueEndpointConfigurer.java    |  33 +-
 .../HazelcastReplicatedmapComponentConfigurer.java |  20 +-
 .../HazelcastReplicatedmapEndpointConfigurer.java  |  27 +-
 .../HazelcastRingbufferComponentConfigurer.java    |  18 +-
 .../HazelcastRingbufferEndpointConfigurer.java     |  21 +-
 .../seda/HazelcastSedaComponentConfigurer.java     |  20 +-
 .../seda/HazelcastSedaEndpointConfigurer.java      |  36 +-
 .../set/HazelcastSetComponentConfigurer.java       |  20 +-
 .../set/HazelcastSetEndpointConfigurer.java        |  27 +-
 .../topic/HazelcastTopicComponentConfigurer.java   |  20 +-
 .../topic/HazelcastTopicEndpointConfigurer.java    |  28 +-
 .../component/hbase/HBaseComponentConfigurer.java  |  19 +-
 .../component/hbase/HBaseEndpointConfigurer.java   |  42 +-
 .../component/hdfs/HdfsComponentConfigurer.java    |  20 +-
 .../component/hdfs/HdfsEndpointConfigurer.java     |  95 +++-
 .../component/http/HttpComponentConfigurer.java    |  62 ++-
 .../component/http/HttpEndpointConfigurer.java     | 114 +++-
 .../iec60870/client/ClientComponentConfigurer.java |  18 +-
 .../iec60870/client/ClientEndpointConfigurer.java  |  50 +-
 .../iec60870/server/ServerComponentConfigurer.java |  18 +-
 .../iec60870/server/ServerEndpointConfigurer.java  |  52 +-
 .../infinispan/InfinispanComponentConfigurer.java  |  57 +-
 .../infinispan/InfinispanEndpointConfigurer.java   |  61 +-
 .../influxdb/InfluxDbComponentConfigurer.java      |  16 +-
 .../influxdb/InfluxDbEndpointConfigurer.java       |  22 +-
 .../component/iota/IOTAComponentConfigurer.java    |  14 +-
 .../component/iota/IOTAEndpointConfigurer.java     |  23 +-
 .../component/ipfs/IPFSComponentConfigurer.java    |  18 +-
 .../component/ipfs/IPFSEndpointConfigurer.java     |  16 +-
 .../component/irc/IrcComponentConfigurer.java      |  18 +-
 .../camel/component/irc/IrcEndpointConfigurer.java |  59 +-
 .../ironmq/IronMQComponentConfigurer.java          |  16 +-
 .../component/ironmq/IronMQEndpointConfigurer.java |  68 ++-
 .../component/jbpm/JBPMComponentConfigurer.java    |  16 +-
 .../component/jbpm/JBPMEndpointConfigurer.java     |  62 ++-
 .../jcache/JCacheComponentConfigurer.java          |  26 +-
 .../component/jcache/JCacheEndpointConfigurer.java |  56 +-
 .../jclouds/JcloudsComponentConfigurer.java        |  20 +-
 .../jclouds/JcloudsEndpointConfigurer.java         |  38 +-
 .../component/jcr/JcrComponentConfigurer.java      |  16 +-
 .../camel/component/jcr/JcrEndpointConfigurer.java |  37 +-
 .../component/jdbc/JdbcComponentConfigurer.java    |  16 +-
 .../component/jdbc/JdbcEndpointConfigurer.java     |  37 +-
 .../jetty9/JettyHttpComponent9Configurer.java      |  73 ++-
 .../jetty9/JettyHttpEndpoint9Configurer.java       |  73 ++-
 .../raft/JGroupsRaftComponentConfigurer.java       |  24 +-
 .../raft/JGroupsRaftEndpointConfigurer.java        |  23 +-
 .../jgroups/JGroupsComponentConfigurer.java        |  21 +-
 .../jgroups/JGroupsEndpointConfigurer.java         |  25 +-
 .../validator/jing/JingComponentConfigurer.java    |  14 +-
 .../validator/jing/JingEndpointConfigurer.java     |  17 +-
 .../component/jira/JiraComponentConfigurer.java    |  30 +-
 .../component/jira/JiraEndpointConfigurer.java     |  41 +-
 .../component/jms/JmsComponentConfigurer.java      | 196 ++++++-
 .../camel/component/jms/JmsEndpointConfigurer.java | 194 ++++++-
 .../component/jmx/JMXComponentConfigurer.java      |  14 +-
 .../camel/component/jmx/JMXEndpointConfigurer.java |  65 ++-
 .../component/jolt/JoltComponentConfigurer.java    |  17 +-
 .../component/jolt/JoltEndpointConfigurer.java     |  27 +-
 .../component/jooq/JooqComponentConfigurer.java    |  23 +-
 .../component/jooq/JooqEndpointConfigurer.java     |  56 +-
 .../component/jpa/JpaComponentConfigurer.java      |  24 +-
 .../camel/component/jpa/JpaEndpointConfigurer.java |  94 +++-
 .../component/scp/ScpComponentConfigurer.java      |  16 +-
 .../camel/component/scp/ScpEndpointConfigurer.java |  50 +-
 .../component/jslt/JsltComponentConfigurer.java    |  19 +-
 .../component/jslt/JsltEndpointConfigurer.java     |  23 +-
 .../JsonValidatorComponentConfigurer.java          |  14 +-
 .../JsonValidatorEndpointConfigurer.java           |  29 +-
 .../jsonata/JsonataComponentConfigurer.java        |  14 +-
 .../jsonata/JsonataEndpointConfigurer.java         |  23 +-
 .../component/jt400/Jt400ComponentConfigurer.java  |  18 +-
 .../component/jt400/Jt400EndpointConfigurer.java   |  70 ++-
 .../component/kafka/KafkaComponentConfigurer.java  | 199 ++++++-
 .../component/kafka/KafkaEndpointConfigurer.java   | 199 ++++++-
 .../KubernetesConfigMapsComponentConfigurer.java   |  14 +-
 .../KubernetesConfigMapsEndpointConfigurer.java    |  50 +-
 ...bernetesCustomResourcesComponentConfigurer.java |  16 +-
 ...ubernetesCustomResourcesEndpointConfigurer.java |  75 ++-
 .../KubernetesDeploymentsComponentConfigurer.java  |  16 +-
 .../KubernetesDeploymentsEndpointConfigurer.java   |  75 ++-
 .../hpa/KubernetesHPAComponentConfigurer.java      |  16 +-
 .../hpa/KubernetesHPAEndpointConfigurer.java       |  75 ++-
 .../job/KubernetesJobComponentConfigurer.java      |  16 +-
 .../job/KubernetesJobEndpointConfigurer.java       |  75 ++-
 .../KubernetesNamespacesComponentConfigurer.java   |  16 +-
 .../KubernetesNamespacesEndpointConfigurer.java    |  75 ++-
 .../nodes/KubernetesNodesComponentConfigurer.java  |  16 +-
 .../nodes/KubernetesNodesEndpointConfigurer.java   |  75 ++-
 ...rnetesPersistentVolumesComponentConfigurer.java |  14 +-
 ...ernetesPersistentVolumesEndpointConfigurer.java |  50 +-
 ...PersistentVolumesClaimsComponentConfigurer.java |  14 +-
 ...sPersistentVolumesClaimsEndpointConfigurer.java |  50 +-
 .../pods/KubernetesPodsComponentConfigurer.java    |  16 +-
 .../pods/KubernetesPodsEndpointConfigurer.java     |  75 ++-
 ...sReplicationControllersComponentConfigurer.java |  16 +-
 ...esReplicationControllersEndpointConfigurer.java |  75 ++-
 ...ubernetesResourcesQuotaComponentConfigurer.java |  14 +-
 ...KubernetesResourcesQuotaEndpointConfigurer.java |  50 +-
 .../KubernetesSecretsComponentConfigurer.java      |  14 +-
 .../KubernetesSecretsEndpointConfigurer.java       |  50 +-
 ...bernetesServiceAccountsComponentConfigurer.java |  14 +-
 ...ubernetesServiceAccountsEndpointConfigurer.java |  50 +-
 .../KubernetesServicesComponentConfigurer.java     |  16 +-
 .../KubernetesServicesEndpointConfigurer.java      |  75 ++-
 .../OpenshiftBuildConfigsComponentConfigurer.java  |  14 +-
 .../OpenshiftBuildConfigsEndpointConfigurer.java   |  50 +-
 .../builds/OpenshiftBuildsComponentConfigurer.java |  14 +-
 .../builds/OpenshiftBuildsEndpointConfigurer.java  |  50 +-
 .../component/kudu/KuduComponentConfigurer.java    |  14 +-
 .../component/kudu/KuduEndpointConfigurer.java     |  16 +-
 .../language/LanguageComponentConfigurer.java      |  14 +-
 .../language/LanguageEndpointConfigurer.java       |  24 +-
 .../component/ldap/LdapComponentConfigurer.java    |  14 +-
 .../component/ldap/LdapEndpointConfigurer.java     |  21 +-
 .../component/ldif/LdifComponentConfigurer.java    |  14 +-
 .../component/ldif/LdifEndpointConfigurer.java     |  15 +-
 .../component/log/LogComponentConfigurer.java      |  16 +-
 .../camel/component/log/LogEndpointConfigurer.java |  61 +-
 .../service/lra/LRASagaServiceConfigurer.java      |  20 +-
 .../lucene/LuceneComponentConfigurer.java          |  22 +-
 .../component/lucene/LuceneEndpointConfigurer.java |  22 +-
 .../lumberjack/LumberjackComponentConfigurer.java  |  18 +-
 .../lumberjack/LumberjackEndpointConfigurer.java   |  21 +-
 .../component/mail/MailComponentConfigurer.java    |  80 ++-
 .../component/mail/MailEndpointConfigurer.java     | 126 ++++-
 .../master/MasterComponentConfigurer.java          |  17 +-
 .../component/master/MasterEndpointConfigurer.java |  19 +-
 .../metrics/MetricsComponentConfigurer.java        |  16 +-
 .../metrics/MetricsEndpointConfigurer.java         |  21 +-
 .../micrometer/MicrometerComponentConfigurer.java  |  16 +-
 .../micrometer/MicrometerEndpointConfigurer.java   |  19 +-
 .../MicroProfileMetricsComponentConfigurer.java    |  16 +-
 .../MicroProfileMetricsEndpointConfigurer.java     |  32 +-
 .../milo/client/MiloClientComponentConfigurer.java |  57 +-
 .../milo/client/MiloClientEndpointConfigurer.java  |  67 ++-
 .../milo/server/MiloServerComponentConfigurer.java |  47 +-
 .../milo/server/MiloServerEndpointConfigurer.java  |  21 +-
 .../component/mina/MinaComponentConfigurer.java    |  58 +-
 .../component/mina/MinaEndpointConfigurer.java     |  60 +-
 .../component/minio/MinioComponentConfigurer.java  |  93 +++-
 .../component/minio/MinioEndpointConfigurer.java   | 126 ++++-
 .../component/mock/MockComponentConfigurer.java    |  14 +-
 .../component/mock/MockEndpointConfigurer.java     |  35 +-
 .../mongodb/gridfs/GridFsComponentConfigurer.java  |  16 +-
 .../mongodb/gridfs/GridFsEndpointConfigurer.java   |  40 +-
 .../mongodb/MongoDbComponentConfigurer.java        |  18 +-
 .../mongodb/MongoDbEndpointConfigurer.java         |  57 +-
 .../validator/msv/MsvComponentConfigurer.java      |  12 +-
 .../validator/msv/MsvEndpointConfigurer.java       |   2 +-
 .../mustache/MustacheComponentConfigurer.java      |  20 +-
 .../mustache/MustacheEndpointConfigurer.java       |  26 +-
 .../component/mvel/MvelComponentConfigurer.java    |  18 +-
 .../component/mvel/MvelEndpointConfigurer.java     |  22 +-
 .../mybatis/MyBatisBeanComponentConfigurer.java    |  18 +-
 .../mybatis/MyBatisBeanEndpointConfigurer.java     |  21 +-
 .../mybatis/MyBatisComponentConfigurer.java        |  20 +-
 .../mybatis/MyBatisEndpointConfigurer.java         |  69 ++-
 .../nagios/NagiosComponentConfigurer.java          |  20 +-
 .../component/nagios/NagiosEndpointConfigurer.java |  22 +-
 .../component/nats/NatsComponentConfigurer.java    |  20 +-
 .../component/nats/NatsEndpointConfigurer.java     |  59 +-
 .../netty/http/NettyHttpComponentConfigurer.java   |  16 +-
 .../netty/http/NettyHttpEndpointConfigurer.java    |  56 +-
 .../component/netty/NettyComponentConfigurer.java  | 140 ++++-
 .../component/netty/NettyEndpointConfigurer.java   | 138 ++++-
 .../nitrite/NitriteComponentConfigurer.java        |  16 +-
 .../nitrite/NitriteEndpointConfigurer.java         |  28 +-
 .../component/nsq/NsqComponentConfigurer.java      |  19 +-
 .../camel/component/nsq/NsqEndpointConfigurer.java |  43 +-
 .../component/OAIPMHComponentConfigurer.java       |  16 +-
 .../oaipmh/component/OAIPMHEndpointConfigurer.java |  62 ++-
 .../olingo2/Olingo2AppEndpointConfiguration.java   |   2 +-
 .../Olingo2AppEndpointConfigurationConfigurer.java |  52 +-
 .../olingo2/Olingo2ComponentConfigurer.java        |  44 +-
 .../olingo2/Olingo2ConfigurationConfigurer.java    |  38 +-
 .../olingo2/Olingo2EndpointConfigurer.java         |  77 ++-
 .../component/olingo2/Olingo2Configuration.java    |   2 +-
 .../olingo4/Olingo4AppEndpointConfiguration.java   |   2 +-
 .../Olingo4AppEndpointConfigurationConfigurer.java |  48 +-
 .../olingo4/Olingo4ComponentConfigurer.java        |  40 +-
 .../olingo4/Olingo4ConfigurationConfigurer.java    |  34 +-
 .../olingo4/Olingo4EndpointConfigurer.java         |  73 ++-
 .../component/olingo4/Olingo4Configuration.java    |   2 +-
 .../cinder/CinderComponentConfigurer.java          |  14 +-
 .../openstack/cinder/CinderEndpointConfigurer.java |  24 +-
 .../glance/GlanceComponentConfigurer.java          |  14 +-
 .../openstack/glance/GlanceEndpointConfigurer.java |  23 +-
 .../keystone/KeystoneComponentConfigurer.java      |  14 +-
 .../keystone/KeystoneEndpointConfigurer.java       |  22 +-
 .../neutron/NeutronComponentConfigurer.java        |  14 +-
 .../neutron/NeutronEndpointConfigurer.java         |  24 +-
 .../openstack/nova/NovaComponentConfigurer.java    |  14 +-
 .../openstack/nova/NovaEndpointConfigurer.java     |  24 +-
 .../openstack/swift/SwiftComponentConfigurer.java  |  14 +-
 .../openstack/swift/SwiftEndpointConfigurer.java   |  24 +-
 .../OptaPlannerComponentConfigurer.java            |  16 +-
 .../optaplanner/OptaPlannerEndpointConfigurer.java |  30 +-
 .../component/paho/PahoComponentConfigurer.java    |  66 ++-
 .../component/paho/PahoEndpointConfigurer.java     |  70 ++-
 .../component/pdf/PdfComponentConfigurer.java      |  14 +-
 .../camel/component/pdf/PdfEndpointConfigurer.java |  30 +-
 .../slot/PgReplicationSlotComponentConfigurer.java |  14 +-
 .../slot/PgReplicationSlotEndpointConfigurer.java  |  56 +-
 .../pgevent/PgEventComponentConfigurer.java        |  16 +-
 .../pgevent/PgEventEndpointConfigurer.java         |  24 +-
 .../http/PlatformHttpComponentConfigurer.java      |  15 +-
 .../http/PlatformHttpEndpointConfigurer.java       |  31 +-
 .../printer/PrinterComponentConfigurer.java        |  14 +-
 .../printer/PrinterEndpointConfigurer.java         |  31 +-
 .../pubnub/PubNubComponentConfigurer.java          |  16 +-
 .../component/pubnub/PubNubEndpointConfigurer.java |  37 +-
 .../pulsar/PulsarComponentConfigurer.java          |  81 ++-
 .../component/pulsar/PulsarEndpointConfigurer.java |  79 ++-
 .../quartz/QuartzComponentConfigurer.java          |  34 +-
 .../component/quartz/QuartzEndpointConfigurer.java |  47 +-
 .../quickfixj/QuickfixjComponentConfigurer.java    |  24 +-
 .../quickfixj/QuickfixjEndpointConfigurer.java     |  25 +-
 .../rabbitmq/RabbitMQComponentConfigurer.java      | 108 +++-
 .../rabbitmq/RabbitMQEndpointConfigurer.java       | 130 ++++-
 .../ReactiveStreamsComponentConfigurer.java        |  28 +-
 .../streams/ReactiveStreamsEndpointConfigurer.java |  33 +-
 .../component/ref/RefComponentConfigurer.java      |  16 +-
 .../camel/component/ref/RefEndpointConfigurer.java |  21 +-
 .../openapi/RestOpenApiComponentConfigurer.java    |  27 +-
 .../openapi/RestOpenApiEndpointConfigurer.java     |  22 +-
 .../swagger/RestSwaggerComponentConfigurer.java    |  27 +-
 .../swagger/RestSwaggerEndpointConfigurer.java     |  24 +-
 .../component/rest/RestApiComponentConfigurer.java |  14 +-
 .../component/rest/RestApiEndpointConfigurer.java  |  23 +-
 .../component/rest/RestComponentConfigurer.java    |  25 +-
 .../component/rest/RestEndpointConfigurer.java     |  41 +-
 .../resteasy/ResteasyComponentConfigurer.java      |  14 +-
 .../resteasy/ResteasyEndpointConfigurer.java       |  43 +-
 .../RobotFrameworkComponentConfigurer.java         |  95 +++-
 .../RobotFrameworkEndpointConfigurer.java          | 130 ++++-
 .../component/rss/RssComponentConfigurer.java      |  14 +-
 .../camel/component/rss/RssEndpointConfigurer.java |  61 +-
 .../component/saga/SagaComponentConfigurer.java    |  14 +-
 .../component/saga/SagaEndpointConfigurer.java     |  15 +-
 .../salesforce/SalesforceComponentConfigurer.java  | 148 ++++-
 .../salesforce/SalesforceEndpointConfigurer.java   |  97 +++-
 .../netweaver/NetWeaverComponentConfigurer.java    |  14 +-
 .../sap/netweaver/NetWeaverEndpointConfigurer.java |  22 +-
 .../xquery/XQueryComponentConfigurer.java          |  21 +-
 .../component/xquery/XQueryEndpointConfigurer.java |  71 ++-
 .../scheduler/SchedulerComponentConfigurer.java    |  16 +-
 .../scheduler/SchedulerEndpointConfigurer.java     |  50 +-
 .../schematron/SchematronComponentConfigurer.java  |  14 +-
 .../schematron/SchematronEndpointConfigurer.java   |  19 +-
 .../component/seda/SedaComponentConfigurer.java    |  28 +-
 .../component/seda/SedaEndpointConfigurer.java     |  46 +-
 .../service/ServiceComponentConfigurer.java        |  17 +-
 .../service/ServiceEndpointConfigurer.java         |  19 +-
 .../servicenow/ServiceNowComponentConfigurer.java  |  95 +++-
 .../servicenow/ServiceNowEndpointConfigurer.java   |  91 ++-
 .../servlet/ServletComponentConfigurer.java        |  30 +-
 .../servlet/ServletEndpointConfigurer.java         |  55 +-
 .../component/sip/SipComponentConfigurer.java      |  16 +-
 .../camel/component/sip/SipEndpointConfigurer.java |  99 +++-
 .../component/sjms/SjmsComponentConfigurer.java    |  48 +-
 .../component/sjms/SjmsEndpointConfigurer.java     |  82 ++-
 .../sjms/batch/SjmsBatchComponentConfigurer.java   |  22 +-
 .../sjms/batch/SjmsBatchEndpointConfigurer.java    |  57 +-
 .../component/sjms2/Sjms2ComponentConfigurer.java  |   2 +-
 .../component/sjms2/Sjms2EndpointConfigurer.java   |  14 +-
 .../component/slack/SlackComponentConfigurer.java  |  18 +-
 .../component/slack/SlackEndpointConfigurer.java   |  62 ++-
 .../component/smpp/SmppComponentConfigurer.java    |  82 ++-
 .../component/smpp/SmppEndpointConfigurer.java     |  86 ++-
 .../component/snmp/SnmpComponentConfigurer.java    |  16 +-
 .../component/snmp/SnmpEndpointConfigurer.java     |  77 ++-
 .../component/solr/SolrComponentConfigurer.java    |  14 +-
 .../component/solr/SolrEndpointConfigurer.java     |  40 +-
 .../component/SoroushBotComponentConfigurer.java   |  18 +-
 .../component/SoroushBotEndpointConfigurer.java    |  53 +-
 .../component/spark/SparkComponentConfigurer.java  |  17 +-
 .../component/spark/SparkEndpointConfigurer.java   |  23 +-
 .../splunkhec/SplunkHECComponentConfigurer.java    |  14 +-
 .../splunkhec/SplunkHECEndpointConfigurer.java     |  23 +-
 .../splunk/SplunkComponentConfigurer.java          |  18 +-
 .../component/splunk/SplunkEndpointConfigurer.java |  83 ++-
 .../batch/SpringBatchComponentConfigurer.java      |  18 +-
 .../batch/SpringBatchEndpointConfigurer.java       |  21 +-
 .../SpringIntegrationComponentConfigurer.java      |  16 +-
 .../SpringIntegrationEndpointConfigurer.java       |  27 +-
 .../springldap/SpringLdapComponentConfigurer.java  |  14 +-
 .../springldap/SpringLdapEndpointConfigurer.java   |  17 +-
 .../component/redis/RedisComponentConfigurer.java  |  16 +-
 .../component/redis/RedisEndpointConfigurer.java   |  30 +-
 .../ws/SpringWebserviceComponentConfigurer.java    |  18 +-
 .../ws/SpringWebserviceEndpointConfigurer.java     |  54 +-
 .../component/event/EventComponentConfigurer.java  |  16 +-
 .../component/event/EventEndpointConfigurer.java   |  21 +-
 .../component/sql/SqlComponentConfigurer.java      |  20 +-
 .../camel/component/sql/SqlEndpointConfigurer.java |  97 +++-
 .../sql/stored/SqlStoredComponentConfigurer.java   |  16 +-
 .../sql/stored/SqlStoredEndpointConfigurer.java    |  24 +-
 .../component/ssh/SshComponentConfigurer.java      |  40 +-
 .../camel/component/ssh/SshEndpointConfigurer.java |  73 ++-
 .../component/stax/StAXComponentConfigurer.java    |  14 +-
 .../component/stax/StAXEndpointConfigurer.java     |  15 +-
 .../component/stomp/StompComponentConfigurer.java  |  31 +-
 .../component/stomp/StompEndpointConfigurer.java   |  33 +-
 .../stream/StreamComponentConfigurer.java          |  16 +-
 .../component/stream/StreamEndpointConfigurer.java |  48 +-
 .../StringTemplateComponentConfigurer.java         |  18 +-
 .../StringTemplateEndpointConfigurer.java          |  25 +-
 .../component/stub/StubComponentConfigurer.java    |   2 +-
 .../component/stub/StubEndpointConfigurer.java     |   2 +-
 .../telegram/TelegramComponentConfigurer.java      |  23 +-
 .../telegram/TelegramEndpointConfigurer.java       |  68 ++-
 .../thrift/ThriftComponentConfigurer.java          |  18 +-
 .../component/thrift/ThriftEndpointConfigurer.java |  36 +-
 .../component/tika/TikaComponentConfigurer.java    |  14 +-
 .../component/tika/TikaEndpointConfigurer.java     |  23 +-
 .../component/timer/TimerComponentConfigurer.java  |  14 +-
 .../component/timer/TimerEndpointConfigurer.java   |  31 +-
 .../twilio/AccountEndpointConfiguration.java       |   2 +-
 .../AccountEndpointConfigurationConfigurer.java    |  14 +-
 ...sDependentPhoneNumberEndpointConfiguration.java |   2 +-
 ...PhoneNumberEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/AddressEndpointConfiguration.java       |   2 +-
 .../AddressEndpointConfigurationConfigurer.java    |  28 +-
 .../twilio/ApplicationEndpointConfiguration.java   |   2 +-
 ...ApplicationEndpointConfigurationConfigurer.java |  16 +-
 ...blePhoneNumberCountryEndpointConfiguration.java |   2 +-
 ...mberCountryEndpointConfigurationConfigurer.java |  16 +-
 ...oneNumberCountryLocalEndpointConfiguration.java |   2 +-
 ...ountryLocalEndpointConfigurationConfigurer.java |  16 +-
 ...neNumberCountryMobileEndpointConfiguration.java |   2 +-
 ...untryMobileEndpointConfigurationConfigurer.java |  16 +-
 ...NumberCountryTollFreeEndpointConfiguration.java |   2 +-
 ...tryTollFreeEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/CallEndpointConfiguration.java          |   2 +-
 .../CallEndpointConfigurationConfigurer.java       |  26 +-
 .../twilio/CallFeedbackEndpointConfiguration.java  |   2 +-
 ...allFeedbackEndpointConfigurationConfigurer.java |  18 +-
 .../CallFeedbackSummaryEndpointConfiguration.java  |   2 +-
 ...backSummaryEndpointConfigurationConfigurer.java |  20 +-
 .../CallNotificationEndpointConfiguration.java     |   2 +-
 ...otificationEndpointConfigurationConfigurer.java |  18 +-
 .../twilio/CallRecordingEndpointConfiguration.java |   2 +-
 ...llRecordingEndpointConfigurationConfigurer.java |  20 +-
 .../twilio/ConferenceEndpointConfiguration.java    |   2 +-
 .../ConferenceEndpointConfigurationConfigurer.java |  16 +-
 ...ConferenceParticipantEndpointConfiguration.java |   2 +-
 ...ParticipantEndpointConfigurationConfigurer.java |  22 +-
 .../twilio/ConnectAppEndpointConfiguration.java    |   2 +-
 .../ConnectAppEndpointConfigurationConfigurer.java |  16 +-
 .../IncomingPhoneNumberEndpointConfiguration.java  |   2 +-
 ...PhoneNumberEndpointConfigurationConfigurer.java |  20 +-
 ...omingPhoneNumberLocalEndpointConfiguration.java |   2 +-
 ...NumberLocalEndpointConfigurationConfigurer.java |  16 +-
 ...mingPhoneNumberMobileEndpointConfiguration.java |   2 +-
 ...umberMobileEndpointConfigurationConfigurer.java |  16 +-
 ...ngPhoneNumberTollFreeEndpointConfiguration.java |   2 +-
 ...berTollFreeEndpointConfigurationConfigurer.java |  16 +-
 .../component/twilio/KeyEndpointConfiguration.java |   2 +-
 .../twilio/KeyEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/MessageEndpointConfiguration.java       |   2 +-
 .../MessageEndpointConfigurationConfigurer.java    |  26 +-
 .../MessageFeedbackEndpointConfiguration.java      |   2 +-
 ...ageFeedbackEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/MessageMediaEndpointConfiguration.java  |   2 +-
 ...essageMediaEndpointConfigurationConfigurer.java |  18 +-
 .../twilio/NewKeyEndpointConfiguration.java        |   2 +-
 .../NewKeyEndpointConfigurationConfigurer.java     |  14 +-
 .../twilio/NewSigningKeyEndpointConfiguration.java |   2 +-
 ...wSigningKeyEndpointConfigurationConfigurer.java |  14 +-
 .../twilio/NotificationEndpointConfiguration.java  |   2 +-
 ...otificationEndpointConfigurationConfigurer.java |  16 +-
 .../OutgoingCallerIdEndpointConfiguration.java     |   2 +-
 ...ingCallerIdEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/QueueEndpointConfiguration.java         |   2 +-
 .../QueueEndpointConfigurationConfigurer.java      |  18 +-
 .../twilio/QueueMemberEndpointConfiguration.java   |   2 +-
 ...QueueMemberEndpointConfigurationConfigurer.java |  20 +-
 .../RecordingAddOnResultEndpointConfiguration.java |   2 +-
 ...AddOnResultEndpointConfigurationConfigurer.java |  18 +-
 ...ingAddOnResultPayloadEndpointConfiguration.java |   2 +-
 ...sultPayloadEndpointConfigurationConfigurer.java |  20 +-
 .../twilio/RecordingEndpointConfiguration.java     |   2 +-
 .../RecordingEndpointConfigurationConfigurer.java  |  16 +-
 ...ecordingTranscriptionEndpointConfiguration.java |   2 +-
 ...anscriptionEndpointConfigurationConfigurer.java |  18 +-
 .../twilio/ShortCodeEndpointConfiguration.java     |   2 +-
 .../ShortCodeEndpointConfigurationConfigurer.java  |  16 +-
 .../twilio/SigningKeyEndpointConfiguration.java    |   2 +-
 .../SigningKeyEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/SipCredentialEndpointConfiguration.java |   2 +-
 ...pCredentialEndpointConfigurationConfigurer.java |  22 +-
 .../SipCredentialListEndpointConfiguration.java    |   2 +-
 ...dentialListEndpointConfigurationConfigurer.java |  18 +-
 ...CredentialListMappingEndpointConfiguration.java |   2 +-
 ...ListMappingEndpointConfigurationConfigurer.java |  20 +-
 .../twilio/SipDomainEndpointConfiguration.java     |   2 +-
 .../SipDomainEndpointConfigurationConfigurer.java  |  18 +-
 ...essControlListMappingEndpointConfiguration.java |   2 +-
 ...ListMappingEndpointConfigurationConfigurer.java |  20 +-
 ...ipIpAccessControlListEndpointConfiguration.java |   2 +-
 ...ControlListEndpointConfigurationConfigurer.java |  18 +-
 ...sControlListIpAddressEndpointConfiguration.java |   2 +-
 ...stIpAddressEndpointConfigurationConfigurer.java |  22 +-
 .../twilio/TokenEndpointConfiguration.java         |   2 +-
 .../TokenEndpointConfigurationConfigurer.java      |  14 +-
 .../twilio/TranscriptionEndpointConfiguration.java |   2 +-
 ...anscriptionEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/TwilioComponentConfigurer.java          |  23 +-
 .../twilio/TwilioConfigurationConfigurer.java      |  12 +-
 .../component/twilio/TwilioEndpointConfigurer.java |  52 +-
 .../UsageRecordAllTimeEndpointConfiguration.java   |   2 +-
 ...cordAllTimeEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordDailyEndpointConfiguration.java     |   2 +-
 ...RecordDailyEndpointConfigurationConfigurer.java |  14 +-
 .../twilio/UsageRecordEndpointConfiguration.java   |   2 +-
 ...UsageRecordEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordLastMonthEndpointConfiguration.java |   2 +-
 ...rdLastMonthEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordMonthlyEndpointConfiguration.java   |   2 +-
 ...cordMonthlyEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordThisMonthEndpointConfiguration.java |   2 +-
 ...rdThisMonthEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordTodayEndpointConfiguration.java     |   2 +-
 ...RecordTodayEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordYearlyEndpointConfiguration.java    |   2 +-
 ...ecordYearlyEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordYesterdayEndpointConfiguration.java |   2 +-
 ...rdYesterdayEndpointConfigurationConfigurer.java |  14 +-
 .../twilio/UsageTriggerEndpointConfiguration.java  |   2 +-
 ...sageTriggerEndpointConfigurationConfigurer.java |  22 +-
 .../ValidationRequestEndpointConfiguration.java    |   2 +-
 ...tionRequestEndpointConfigurationConfigurer.java |  16 +-
 .../component/twilio/TwilioConfiguration.java      |   2 +-
 .../TwitterDirectMessageComponentConfigurer.java   |  32 +-
 .../TwitterDirectMessageEndpointConfigurer.java    |  87 ++-
 .../search/TwitterSearchComponentConfigurer.java   |  32 +-
 .../search/TwitterSearchEndpointConfigurer.java    |  87 ++-
 .../TwitterTimelineComponentConfigurer.java        |  32 +-
 .../TwitterTimelineEndpointConfigurer.java         |  88 ++-
 .../undertow/UndertowComponentConfigurer.java      |  32 +-
 .../undertow/UndertowEndpointConfigurer.java       |  69 ++-
 .../validator/ValidatorComponentConfigurer.java    |  16 +-
 .../validator/ValidatorEndpointConfigurer.java     |  33 +-
 .../velocity/VelocityComponentConfigurer.java      |  20 +-
 .../velocity/VelocityEndpointConfigurer.java       |  26 +-
 .../vertx/http/VertxHttpComponentConfigurer.java   |  43 +-
 .../vertx/http/VertxHttpEndpointConfigurer.java    |  56 +-
 .../VertxWebsocketComponentConfigurer.java         |  22 +-
 .../VertxWebsocketEndpointConfigurer.java          |  34 +-
 .../component/vertx/VertxComponentConfigurer.java  |  24 +-
 .../component/vertx/VertxEndpointConfigurer.java   |  23 +-
 .../camel/component/vm/VmComponentConfigurer.java  |   2 +-
 .../camel/component/vm/VmEndpointConfigurer.java   |   2 +-
 .../weather/WeatherComponentConfigurer.java        |  16 +-
 .../weather/WeatherEndpointConfigurer.java         |  78 ++-
 .../component/web3j/Web3jComponentConfigurer.java  |  72 ++-
 .../component/web3j/Web3jEndpointConfigurer.java   |  76 ++-
 .../webhook/WebhookComponentConfigurer.java        |  25 +-
 .../webhook/WebhookEndpointConfigurer.java         |  29 +-
 .../websocket/jsr356/JSR356EndpointConfigurer.java |  23 +-
 .../jsr356/JSR356WebSocketComponentConfigurer.java |  18 +-
 .../websocket/WebsocketComponentConfigurer.java    |  38 +-
 .../websocket/WebsocketEndpointConfigurer.java     |  49 +-
 .../component/weka/WekaComponentConfigurer.java    |  14 +-
 .../component/weka/WekaEndpointConfigurer.java     |  26 +-
 .../wordpress/WordpressComponentConfigurer.java    |  27 +-
 .../wordpress/WordpressEndpointConfigurer.java     |  31 +-
 .../workday/WorkdayComponentConfigurer.java        |  14 +-
 .../workday/WorkdayEndpointConfigurer.java         |  27 +-
 .../xchange/XChangeComponentConfigurer.java        |  14 +-
 .../xchange/XChangeEndpointConfigurer.java         |  20 +-
 .../camel/component/xj/XJComponentConfigurer.java  |   2 +-
 .../camel/component/xj/XJEndpointConfigurer.java   |  12 +-
 .../xmlsecurity/XmlSignerComponentConfigurer.java  |  67 ++-
 .../xmlsecurity/XmlSignerEndpointConfigurer.java   |  66 ++-
 .../XmlVerifierComponentConfigurer.java            |  48 +-
 .../xmlsecurity/XmlVerifierEndpointConfigurer.java |  47 +-
 .../component/xmpp/XmppComponentConfigurer.java    |  16 +-
 .../component/xmpp/XmppEndpointConfigurer.java     |  43 +-
 .../xslt/saxon/XsltSaxonComponentConfigurer.java   |  16 +-
 .../xslt/saxon/XsltSaxonEndpointConfigurer.java    |  16 +-
 .../component/xslt/XsltComponentConfigurer.java    |  24 +-
 .../component/xslt/XsltEndpointConfigurer.java     |  38 +-
 .../yammer/YammerComponentConfigurer.java          |  35 +-
 .../component/yammer/YammerEndpointConfigurer.java |  67 ++-
 .../zendesk/ZendeskComponentConfigurer.java        |  25 +-
 .../zendesk/ZendeskConfigurationConfigurer.java    |  20 +-
 .../zendesk/ZendeskEndpointConfiguration.java      |   2 +-
 .../ZendeskEndpointConfigurationConfigurer.java    | 246 ++++++++-
 .../zendesk/ZendeskEndpointConfigurer.java         |  59 +-
 .../component/zendesk/ZendeskConfiguration.java    |   2 +-
 .../zookeepermaster/MasterComponentConfigurer.java |  25 +-
 .../zookeepermaster/MasterEndpointConfigurer.java  |  19 +-
 .../zookeeper/ZooKeeperComponentConfigurer.java    |  27 +-
 .../zookeeper/ZooKeeperEndpointConfigurer.java     |  31 +-
 .../main/java/org/apache/camel/spi/Configurer.java |   4 +-
 .../org/apache/camel/spi/ConfigurerStrategy.java   |  16 -
 .../java/org/apache/camel/spi/ErrorHandler.java    |   0
 .../apache/camel/spi/PropertyConfigurerGetter.java |  10 +
 .../camel/impl/engine/AbstractCamelContext.java    |   2 -
 .../impl/engine/DefaultCamelBeanPostProcessor.java |   9 +
 .../camel/impl/ExtendedCamelContextConfigurer.java | 162 +++++-
 .../camel/impl/RestConfigurationConfigurer.java    |  66 ++-
 ...ToleranceConfigurationDefinitionConfigurer.java |  38 +-
 .../HystrixConfigurationDefinitionConfigurer.java  |  74 ++-
 ...ilience4jConfigurationDefinitionConfigurer.java |  50 +-
 .../FaultToleranceConfigurationDefinition.java     |   2 +-
 .../model/HystrixConfigurationDefinition.java      |   2 +-
 .../model/Resilience4jConfigurationDefinition.java |   2 +-
 ...opertyBindingSupportAutowireNestedDeepTest.java | 118 ----
 .../PropertyBindingSupportAutowireNestedTest.java  |  21 -
 .../PropertyBindingSupportAutowireTest.java        | 109 ----
 .../PropertyBindingSupportConfigurerTest.java      |  24 +-
 ...ToleranceConfigurationPropertiesConfigurer.java |  34 +-
 ...althCheckConfigurationPropertiesConfigurer.java |  16 +-
 .../HealthConfigurationPropertiesConfigurer.java   |  18 +-
 .../HystrixConfigurationPropertiesConfigurer.java  |  70 ++-
 .../main/LraConfigurationPropertiesConfigurer.java |  16 +-
 .../MainConfigurationPropertiesConfigurer.java     | 188 ++++++-
 ...ilience4jConfigurationPropertiesConfigurer.java |  46 +-
 .../RestConfigurationPropertiesConfigurer.java     |  64 ++-
 ...hreadPoolConfigurationPropertiesConfigurer.java |  24 +-
 .../camel-main-configuration-metadata.json         |   4 -
 core/camel-main/src/main/docs/main.adoc            |   4 -
 .../org/apache/camel/main/BaseMainSupport.java     |  27 -
 .../FaultToleranceConfigurationProperties.java     |   2 +-
 .../main/HealthCheckConfigurationProperties.java   |   2 +-
 .../camel/main/HealthConfigurationProperties.java  |   2 +-
 .../camel/main/HystrixConfigurationProperties.java |   2 +-
 .../camel/main/LraConfigurationProperties.java     |   2 +-
 .../camel/main/MainConfigurationProperties.java    | 113 +---
 .../main/Resilience4jConfigurationProperties.java  |   2 +-
 .../camel/main/RestConfigurationProperties.java    |   2 +-
 .../main/ThreadPoolConfigurationProperties.java    |   2 +-
 .../org/apache/camel/main/MainIoCAutowireTest.java | 173 ------
 .../java/org/apache/camel/main/MainIoCTest.java    |  17 +-
 .../java/org/apache/camel/main/MainSedaTest.java   |  24 -
 .../apache/camel/main/MySecondBarConfigurer.java   |  14 +-
 .../apache/camel/main/MySecondFooConfigurer.java   |  12 +-
 .../DefaultExchangeFormatterConfigurer.java        |  44 +-
 .../camel/support/PropertyBindingSupport.java      | 175 +-----
 .../support/component/AbstractApiProducer.java     |   5 +-
 .../src/main/resources/api-endpoint-config.vm      |   2 +-
 .../packaging/AbstractGenerateConfigurerMojo.java  |  16 +-
 .../packaging/PropertyConfigurerGenerator.java     |  48 +-
 1009 files changed, 30415 insertions(+), 3478 deletions(-)
 rename core/camel-api/src/{generated => main}/java/org/apache/camel/spi/ErrorHandler.java (100%)
 delete mode 100644 core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireNestedDeepTest.java
 delete mode 100644 core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireTest.java
 delete mode 100644 core/camel-main/src/test/java/org/apache/camel/main/MainIoCAutowireTest.java


[camel] 03/03: Regen

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 27dbd7484b3f2d9b64f40bb45e13368914a13b1c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Nov 6 14:35:48 2020 +0100

    Regen
---
 core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
index cb013a0..7f47049 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
@@ -29,7 +29,6 @@ import org.apache.camel.component.seda.SedaComponent;
 import org.apache.camel.model.ModelCamelContext;
 import org.junit.jupiter.api.Test;
 
-
 import static org.junit.jupiter.api.Assertions.*;
 
 public class MainIoCTest {


[camel] 02/03: CAMEL-15826: camel-main - Remove autowire by type

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 16c1802d473c8b27ecba9f52d48c52e6c4ab892d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Nov 6 13:40:55 2020 +0100

    CAMEL-15826: camel-main - Remove autowire by type
---
 .../impl/engine/DefaultCamelBeanPostProcessor.java |   9 ++
 .../FaultToleranceConfigurationDefinition.java     |   2 +-
 .../model/HystrixConfigurationDefinition.java      |   2 +-
 .../model/Resilience4jConfigurationDefinition.java |   2 +-
 ...opertyBindingSupportAutowireNestedDeepTest.java | 118 --------------
 .../PropertyBindingSupportAutowireNestedTest.java  |  21 ---
 .../PropertyBindingSupportAutowireTest.java        | 109 -------------
 .../PropertyBindingSupportConfigurerTest.java      |  10 --
 ...ToleranceConfigurationPropertiesConfigurer.java |   2 +
 ...althCheckConfigurationPropertiesConfigurer.java |   2 +
 .../HealthConfigurationPropertiesConfigurer.java   |   2 +
 .../HystrixConfigurationPropertiesConfigurer.java  |   2 +
 .../main/LraConfigurationPropertiesConfigurer.java |   2 +
 .../MainConfigurationPropertiesConfigurer.java     |  30 +---
 ...ilience4jConfigurationPropertiesConfigurer.java |   2 +
 .../RestConfigurationPropertiesConfigurer.java     |   2 +
 ...hreadPoolConfigurationPropertiesConfigurer.java |   2 +
 .../camel-main-configuration-metadata.json         |   4 -
 core/camel-main/src/main/docs/main.adoc            |   4 -
 .../org/apache/camel/main/BaseMainSupport.java     |  27 ----
 .../FaultToleranceConfigurationProperties.java     |   2 +-
 .../main/HealthCheckConfigurationProperties.java   |   2 +-
 .../camel/main/HealthConfigurationProperties.java  |   2 +-
 .../camel/main/HystrixConfigurationProperties.java |   2 +-
 .../camel/main/LraConfigurationProperties.java     |   2 +-
 .../camel/main/MainConfigurationProperties.java    | 113 +-------------
 .../main/Resilience4jConfigurationProperties.java  |   2 +-
 .../camel/main/RestConfigurationProperties.java    |   2 +-
 .../main/ThreadPoolConfigurationProperties.java    |   2 +-
 .../org/apache/camel/main/MainIoCAutowireTest.java | 173 ---------------------
 .../java/org/apache/camel/main/MainIoCTest.java    |  18 ++-
 .../java/org/apache/camel/main/MainSedaTest.java   |  24 ---
 .../camel/support/PropertyBindingSupport.java      | 167 --------------------
 33 files changed, 51 insertions(+), 814 deletions(-)

diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
index dfd105e..20fac01 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultCamelBeanPostProcessor.java
@@ -468,6 +468,9 @@ public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor {
                 throw RuntimeCamelException.wrapRuntimeException(e);
             }
         }
+        if (bean instanceof CamelContextAware) {
+            ((CamelContextAware) bean).setCamelContext(getOrLookupCamelContext());
+        }
         getOrLookupCamelContext().getRegistry().bind(name, bean);
     }
 
@@ -487,6 +490,9 @@ public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor {
                     throw RuntimeCamelException.wrapRuntimeException(e);
                 }
             }
+            if (value instanceof CamelContextAware) {
+                ((CamelContextAware) value).setCamelContext(getOrLookupCamelContext());
+            }
             getOrLookupCamelContext().getRegistry().bind(name, value);
         }
     }
@@ -520,6 +526,9 @@ public class DefaultCamelBeanPostProcessor implements CamelBeanPostProcessor {
                     throw RuntimeCamelException.wrapRuntimeException(e);
                 }
             }
+            if (value instanceof CamelContextAware) {
+                ((CamelContextAware) value).setCamelContext(getOrLookupCamelContext());
+            }
             getOrLookupCamelContext().getRegistry().bind(name, value);
         }
     }
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java
index 56c12a8..e89e292 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/FaultToleranceConfigurationDefinition.java
@@ -30,7 +30,7 @@ import org.apache.camel.spi.Metadata;
 @Metadata(label = "eip,routing,circuitbreaker")
 @XmlRootElement(name = "faultToleranceConfiguration")
 @XmlAccessorType(XmlAccessType.FIELD)
-@Configurer(api = true)
+@Configurer
 public class FaultToleranceConfigurationDefinition extends FaultToleranceConfigurationCommon {
 
     @XmlTransient
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
index c8e5c8f..25b7fab 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/HystrixConfigurationDefinition.java
@@ -32,7 +32,7 @@ import org.apache.camel.spi.Metadata;
 @Metadata(label = "eip,routing,circuitbreaker")
 @XmlRootElement(name = "hystrixConfiguration")
 @XmlAccessorType(XmlAccessType.FIELD)
-@Configurer(api = true)
+@Configurer
 @Deprecated
 public class HystrixConfigurationDefinition extends HystrixConfigurationCommon {
 
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java
index 2ab6f0b..0ea39fb 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/Resilience4jConfigurationDefinition.java
@@ -32,7 +32,7 @@ import org.apache.camel.spi.Metadata;
 @Metadata(label = "eip,routing,circuitbreaker")
 @XmlRootElement(name = "resilience4jConfiguration")
 @XmlAccessorType(XmlAccessType.FIELD)
-@Configurer(api = true)
+@Configurer
 public class Resilience4jConfigurationDefinition extends Resilience4jConfigurationCommon {
 
     @XmlTransient
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireNestedDeepTest.java b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireNestedDeepTest.java
deleted file mode 100644
index a40402a..0000000
--- a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireNestedDeepTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.support;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-
-/**
- * Unit test for PropertyBindingSupport
- */
-public class PropertyBindingSupportAutowireNestedDeepTest extends ContextTestSupport {
-
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        CamelContext context = super.createCamelContext();
-
-        Company work = new Company();
-        work.setId(456);
-        work.setName("Acme");
-        context.getRegistry().bind("myWork", work);
-
-        return context;
-    }
-
-    @Test
-    public void testAutowirePropertiesDeep() throws Exception {
-        Foo foo = new Foo();
-
-        PropertyBindingSupport.build().bind(context, foo, "name", "James");
-        // use deep nesting
-        PropertyBindingSupport.autowireSingletonPropertiesFromRegistry(context, foo, false, true, null);
-
-        assertEquals("James", foo.getName());
-        // should be auto wired (deep)
-        assertNotNull(foo.getBar().getWork());
-        assertEquals(456, foo.getBar().getWork().getId());
-        assertEquals("Acme", foo.getBar().getWork().getName());
-    }
-
-    public static class Foo {
-        private String name;
-        private Bar bar;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public Bar getBar() {
-            return bar;
-        }
-
-        public void setBar(Bar bar) {
-            this.bar = bar;
-        }
-    }
-
-    public static class Bar {
-        private int age;
-        private boolean rider;
-        private Company work;
-        private boolean goldCustomer;
-
-        public int getAge() {
-            return age;
-        }
-
-        public void setAge(int age) {
-            this.age = age;
-        }
-
-        public boolean isRider() {
-            return rider;
-        }
-
-        public void setRider(boolean rider) {
-            this.rider = rider;
-        }
-
-        public Company getWork() {
-            return work;
-        }
-
-        public void setWork(Company work) {
-            this.work = work;
-        }
-
-        public boolean isGoldCustomer() {
-            return goldCustomer;
-        }
-
-        public void setGoldCustomer(boolean goldCustomer) {
-            this.goldCustomer = goldCustomer;
-        }
-    }
-
-}
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireNestedTest.java b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireNestedTest.java
index ba716ce..c67816d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireNestedTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireNestedTest.java
@@ -47,7 +47,6 @@ public class PropertyBindingSupportAutowireNestedTest extends ContextTestSupport
         PropertyBindingSupport.build().bind(context, foo, "bar.age", "33");
         PropertyBindingSupport.build().bind(context, foo, "bar.rider", "true");
         PropertyBindingSupport.build().bind(context, foo, "bar.gold-customer", "true");
-        PropertyBindingSupport.autowireSingletonPropertiesFromRegistry(context, foo, false, false, null);
 
         assertEquals("James", foo.getName());
         assertEquals(33, foo.getBar().getAge());
@@ -57,26 +56,6 @@ public class PropertyBindingSupportAutowireNestedTest extends ContextTestSupport
         assertNull(foo.getBar().getWork());
     }
 
-    @Test
-    public void testAutowirePropertiesNested() throws Exception {
-        Foo foo = new Foo();
-
-        PropertyBindingSupport.build().bind(context, foo, "name", "James");
-        PropertyBindingSupport.build().bind(context, foo, "bar.age", "33");
-        PropertyBindingSupport.build().bind(context, foo, "bar.rider", "true");
-        PropertyBindingSupport.build().bind(context, foo, "bar.gold-customer", "true");
-        PropertyBindingSupport.autowireSingletonPropertiesFromRegistry(context, foo, false, true, null);
-
-        assertEquals("James", foo.getName());
-        assertEquals(33, foo.getBar().getAge());
-        assertTrue(foo.getBar().isRider());
-        assertTrue(foo.getBar().isGoldCustomer());
-        // should be auto wired
-        assertNotNull(foo.getBar().getWork());
-        assertEquals(456, foo.getBar().getWork().getId());
-        assertEquals("Acme", foo.getBar().getWork().getName());
-    }
-
     public static class Foo {
         private String name;
         private Bar bar = new Bar(this);
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireTest.java b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireTest.java
deleted file mode 100644
index bfe94f8..0000000
--- a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportAutowireTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.support;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-/**
- * Unit test for PropertyBindingSupport
- */
-public class PropertyBindingSupportAutowireTest extends ContextTestSupport {
-
-    @Override
-    protected CamelContext createCamelContext() throws Exception {
-        CamelContext context = super.createCamelContext();
-
-        Bar bar = new Bar();
-        bar.setAge(33);
-        bar.setGoldCustomer(true);
-        bar.setRider(true);
-        context.getRegistry().bind("myBar", bar);
-
-        return context;
-    }
-
-    @Test
-    public void testAutowireProperties() throws Exception {
-        Foo foo = new Foo();
-
-        PropertyBindingSupport.build().bind(context, foo, "name", "James");
-        PropertyBindingSupport.autowireSingletonPropertiesFromRegistry(context, foo);
-
-        assertEquals("James", foo.getName());
-        // should be auto wired
-        assertEquals(33, foo.getBar().getAge());
-        assertTrue(foo.getBar().isRider());
-        assertTrue(foo.getBar().isGoldCustomer());
-    }
-
-    public static class Foo {
-        private String name;
-        private Bar bar;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public Bar getBar() {
-            return bar;
-        }
-
-        public void setBar(Bar bar) {
-            this.bar = bar;
-        }
-    }
-
-    public static class Bar {
-        private int age;
-        private boolean rider;
-        private boolean goldCustomer;
-
-        public int getAge() {
-            return age;
-        }
-
-        public void setAge(int age) {
-            this.age = age;
-        }
-
-        public boolean isRider() {
-            return rider;
-        }
-
-        public void setRider(boolean rider) {
-            this.rider = rider;
-        }
-
-        public boolean isGoldCustomer() {
-            return goldCustomer;
-        }
-
-        public void setGoldCustomer(boolean goldCustomer) {
-            this.goldCustomer = goldCustomer;
-        }
-    }
-
-}
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportConfigurerTest.java b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportConfigurerTest.java
index 3fc0389..d0899e4 100644
--- a/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportConfigurerTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/PropertyBindingSupportConfigurerTest.java
@@ -277,16 +277,6 @@ public class PropertyBindingSupportConfigurerTest extends ContextTestSupport {
         assertTrue(prop.isEmpty(), "Should bind all properties");
     }
 
-    @Test
-    public void testConfigurerShouldNotFailForAnonymousClasses() throws Exception {
-        PropertyBindingSupport.autowireSingletonPropertiesFromRegistry(context, new Bar() {
-            @Override
-            public int getAge() {
-                return super.getAge();
-            }
-        });
-    }
-
     public static class Bar {
         private int age;
         private boolean rider;
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/FaultToleranceConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/FaultToleranceConfigurationPropertiesConfigurer.java
index c097d62..f987531 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/FaultToleranceConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/FaultToleranceConfigurationPropertiesConfigurer.java
@@ -33,6 +33,7 @@ public class FaultToleranceConfigurationPropertiesConfigurer extends org.apache.
         map.put("TimeoutPoolSize", java.lang.Integer.class);
         map.put("TimeoutScheduledExecutorServiceRef", java.lang.String.class);
         ALL_OPTIONS = map;
+        ConfigurerStrategy.addBootstrapConfigurerClearer(FaultToleranceConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -75,6 +76,7 @@ public class FaultToleranceConfigurationPropertiesConfigurer extends org.apache.
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
     @Override
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/HealthCheckConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/HealthCheckConfigurationPropertiesConfigurer.java
index 3158de0..4a15fda 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/HealthCheckConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/HealthCheckConfigurationPropertiesConfigurer.java
@@ -24,6 +24,7 @@ public class HealthCheckConfigurationPropertiesConfigurer extends org.apache.cam
         map.put("Interval", long.class);
         map.put("Parent", java.lang.String.class);
         ALL_OPTIONS = map;
+        ConfigurerStrategy.addBootstrapConfigurerClearer(HealthCheckConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -48,6 +49,7 @@ public class HealthCheckConfigurationPropertiesConfigurer extends org.apache.cam
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
     @Override
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/HealthConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/HealthConfigurationPropertiesConfigurer.java
index 8577902..3aa7141 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/HealthConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/HealthConfigurationPropertiesConfigurer.java
@@ -25,6 +25,7 @@ public class HealthConfigurationPropertiesConfigurer extends org.apache.camel.su
         map.put("RegistryEnabled", java.lang.Boolean.class);
         map.put("RoutesEnabled", java.lang.Boolean.class);
         ALL_OPTIONS = map;
+        ConfigurerStrategy.addBootstrapConfigurerClearer(HealthConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -51,6 +52,7 @@ public class HealthConfigurationPropertiesConfigurer extends org.apache.camel.su
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
     @Override
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/HystrixConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/HystrixConfigurationPropertiesConfigurer.java
index 4530109..3a89ffa 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/HystrixConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/HystrixConfigurationPropertiesConfigurer.java
@@ -51,6 +51,7 @@ public class HystrixConfigurationPropertiesConfigurer extends org.apache.camel.s
         map.put("ThreadPoolRollingNumberStatisticalWindowBuckets", java.lang.Integer.class);
         map.put("ThreadPoolRollingNumberStatisticalWindowInMilliseconds", java.lang.Integer.class);
         ALL_OPTIONS = map;
+        ConfigurerStrategy.addBootstrapConfigurerClearer(HystrixConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -129,6 +130,7 @@ public class HystrixConfigurationPropertiesConfigurer extends org.apache.camel.s
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
     @Override
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/LraConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/LraConfigurationPropertiesConfigurer.java
index aa4f314..0040c2f 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/LraConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/LraConfigurationPropertiesConfigurer.java
@@ -24,6 +24,7 @@ public class LraConfigurationPropertiesConfigurer extends org.apache.camel.suppo
         map.put("LocalParticipantContextPath", java.lang.String.class);
         map.put("LocalParticipantUrl", java.lang.String.class);
         ALL_OPTIONS = map;
+        ConfigurerStrategy.addBootstrapConfigurerClearer(LraConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -48,6 +49,7 @@ public class LraConfigurationPropertiesConfigurer extends org.apache.camel.suppo
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
     @Override
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
index 987b035..7d59c4d 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/MainConfigurationPropertiesConfigurer.java
@@ -25,10 +25,6 @@ public class MainConfigurationPropertiesConfigurer extends org.apache.camel.supp
         map.put("AutoConfigurationFailFast", boolean.class);
         map.put("AutoConfigurationLogSummary", boolean.class);
         map.put("AutoStartup", boolean.class);
-        map.put("AutowireComponentProperties", boolean.class);
-        map.put("AutowireComponentPropertiesAllowPrivateSetter", boolean.class);
-        map.put("AutowireComponentPropertiesDeep", boolean.class);
-        map.put("AutowireComponentPropertiesNonNullOnly", boolean.class);
         map.put("BacklogTracing", boolean.class);
         map.put("BeanIntrospectionExtendedStatistics", boolean.class);
         map.put("BeanIntrospectionLoggingLevel", org.apache.camel.LoggingLevel.class);
@@ -104,6 +100,7 @@ public class MainConfigurationPropertiesConfigurer extends org.apache.camel.supp
         map.put("XmlRouteTemplates", java.lang.String.class);
         map.put("XmlRoutes", java.lang.String.class);
         ALL_OPTIONS = map;
+        ConfigurerStrategy.addBootstrapConfigurerClearer(MainConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -122,14 +119,6 @@ public class MainConfigurationPropertiesConfigurer extends org.apache.camel.supp
         case "AutoConfigurationLogSummary": target.setAutoConfigurationLogSummary(property(camelContext, boolean.class, value)); return true;
         case "autostartup":
         case "AutoStartup": target.setAutoStartup(property(camelContext, boolean.class, value)); return true;
-        case "autowirecomponentproperties":
-        case "AutowireComponentProperties": target.setAutowireComponentProperties(property(camelContext, boolean.class, value)); return true;
-        case "autowirecomponentpropertiesallowprivatesetter":
-        case "AutowireComponentPropertiesAllowPrivateSetter": target.setAutowireComponentPropertiesAllowPrivateSetter(property(camelContext, boolean.class, value)); return true;
-        case "autowirecomponentpropertiesdeep":
-        case "AutowireComponentPropertiesDeep": target.setAutowireComponentPropertiesDeep(property(camelContext, boolean.class, value)); return true;
-        case "autowirecomponentpropertiesnonnullonly":
-        case "AutowireComponentPropertiesNonNullOnly": target.setAutowireComponentPropertiesNonNullOnly(property(camelContext, boolean.class, value)); return true;
         case "backlogtracing":
         case "BacklogTracing": target.setBacklogTracing(property(camelContext, boolean.class, value)); return true;
         case "beanintrospectionextendedstatistics":
@@ -288,6 +277,7 @@ public class MainConfigurationPropertiesConfigurer extends org.apache.camel.supp
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
     @Override
@@ -305,14 +295,6 @@ public class MainConfigurationPropertiesConfigurer extends org.apache.camel.supp
         case "AutoConfigurationLogSummary": return boolean.class;
         case "autostartup":
         case "AutoStartup": return boolean.class;
-        case "autowirecomponentproperties":
-        case "AutowireComponentProperties": return boolean.class;
-        case "autowirecomponentpropertiesallowprivatesetter":
-        case "AutowireComponentPropertiesAllowPrivateSetter": return boolean.class;
-        case "autowirecomponentpropertiesdeep":
-        case "AutowireComponentPropertiesDeep": return boolean.class;
-        case "autowirecomponentpropertiesnonnullonly":
-        case "AutowireComponentPropertiesNonNullOnly": return boolean.class;
         case "backlogtracing":
         case "BacklogTracing": return boolean.class;
         case "beanintrospectionextendedstatistics":
@@ -481,14 +463,6 @@ public class MainConfigurationPropertiesConfigurer extends org.apache.camel.supp
         case "AutoConfigurationLogSummary": return target.isAutoConfigurationLogSummary();
         case "autostartup":
         case "AutoStartup": return target.isAutoStartup();
-        case "autowirecomponentproperties":
-        case "AutowireComponentProperties": return target.isAutowireComponentProperties();
-        case "autowirecomponentpropertiesallowprivatesetter":
-        case "AutowireComponentPropertiesAllowPrivateSetter": return target.isAutowireComponentPropertiesAllowPrivateSetter();
-        case "autowirecomponentpropertiesdeep":
-        case "AutowireComponentPropertiesDeep": return target.isAutowireComponentPropertiesDeep();
-        case "autowirecomponentpropertiesnonnullonly":
-        case "AutowireComponentPropertiesNonNullOnly": return target.isAutowireComponentPropertiesNonNullOnly();
         case "backlogtracing":
         case "BacklogTracing": return target.isBacklogTracing();
         case "beanintrospectionextendedstatistics":
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/Resilience4jConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/Resilience4jConfigurationPropertiesConfigurer.java
index 5859dcb..cd532c4 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/Resilience4jConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/Resilience4jConfigurationPropertiesConfigurer.java
@@ -39,6 +39,7 @@ public class Resilience4jConfigurationPropertiesConfigurer extends org.apache.ca
         map.put("WaitDurationInOpenState", java.lang.Integer.class);
         map.put("WritableStackTraceEnabled", java.lang.Boolean.class);
         ALL_OPTIONS = map;
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Resilience4jConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -93,6 +94,7 @@ public class Resilience4jConfigurationPropertiesConfigurer extends org.apache.ca
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
     @Override
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/RestConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/RestConfigurationPropertiesConfigurer.java
index b0bfedc..28b9e70 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/RestConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/RestConfigurationPropertiesConfigurer.java
@@ -48,6 +48,7 @@ public class RestConfigurationPropertiesConfigurer extends org.apache.camel.supp
         map.put("UseXForwardHeaders", boolean.class);
         map.put("XmlDataFormat", java.lang.String.class);
         ALL_OPTIONS = map;
+        ConfigurerStrategy.addBootstrapConfigurerClearer(RestConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -120,6 +121,7 @@ public class RestConfigurationPropertiesConfigurer extends org.apache.camel.supp
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
     @Override
diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/ThreadPoolConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/ThreadPoolConfigurationPropertiesConfigurer.java
index 529266a..4f3cec3 100644
--- a/core/camel-main/src/generated/java/org/apache/camel/main/ThreadPoolConfigurationPropertiesConfigurer.java
+++ b/core/camel-main/src/generated/java/org/apache/camel/main/ThreadPoolConfigurationPropertiesConfigurer.java
@@ -28,6 +28,7 @@ public class ThreadPoolConfigurationPropertiesConfigurer extends org.apache.came
         map.put("RejectedPolicy", org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy.class);
         map.put("TimeUnit", java.util.concurrent.TimeUnit.class);
         ALL_OPTIONS = map;
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ThreadPoolConfigurationPropertiesConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -60,6 +61,7 @@ public class ThreadPoolConfigurationPropertiesConfigurer extends org.apache.came
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
     @Override
diff --git a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index b64d68b..6d2cc18 100644
--- a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++ b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -16,10 +16,6 @@
     { "name": "camel.main.autoConfigurationFailFast", "description": "Whether auto configuration should fail fast when configuring one ore more properties fails for whatever reason such as a invalid property name, etc. This option is default enabled.", "sourceType": "org.apache.camel.main.MainConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": true },
     { "name": "camel.main.autoConfigurationLogSummary", "description": "Whether auto configuration should log a summary with the configured properties. This option is default enabled.", "sourceType": "org.apache.camel.main.MainConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": true },
     { "name": "camel.main.autoStartup", "description": "Sets whether the object should automatically start when Camel starts. Important: Currently only routes can be disabled, as CamelContext's are always started. Note: When setting auto startup false on CamelContext then that takes precedence and no routes are started. You would need to start CamelContext explicit using the org.apache.camel.CamelContext.start() method, to start the context, and then you would need to start the routes ma [...]
-    { "name": "camel.main.autowireComponentProperties", "description": "Whether autowiring components with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. This option is default enabled.", "sourceType": "org.apache.camel.main.MainConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": true },
-    { "name": "camel.main.autowireComponentPropertiesAllowPrivateSetter", "description": "Whether autowiring components allows to use private setter method when setting the value. This may be needed in some rare situations when some configuration classes may configure via constructors over setters. But constructor configuration is more cumbersome to use via .properties files etc.", "sourceType": "org.apache.camel.main.MainConfigurationProperties", "type": "boolean", "javaType": "boolean" [...]
-    { "name": "camel.main.autowireComponentPropertiesDeep", "description": "Whether autowiring components (with deep nesting by attempting to walk as deep down the object graph by creating new empty objects on the way if needed) with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. This option is default disabled.", "sourceTyp [...]
-    { "name": "camel.main.autowireComponentPropertiesNonNullOnly", "description": "Whether to only autowire if the property has no default value or has not been configured explicit. This option is default disabled.", "sourceType": "org.apache.camel.main.MainConfigurationProperties", "type": "boolean", "javaType": "boolean" },
     { "name": "camel.main.backlogTracing", "description": "Sets whether backlog tracing is enabled or not. Default is false.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", "javaType": "boolean" },
     { "name": "camel.main.beanIntrospectionExtendedStatistics", "description": "Sets whether bean introspection uses extended statistics. The default is false.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "boolean", "javaType": "boolean" },
     { "name": "camel.main.beanIntrospectionLoggingLevel", "description": "Sets the logging level used by bean introspection, logging activity of its usage. The default is TRACE.", "sourceType": "org.apache.camel.main.DefaultConfigurationProperties", "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "ERROR", "WARN", "INFO", "DEBUG", "TRACE", "OFF" ] },
diff --git a/core/camel-main/src/main/docs/main.adoc b/core/camel-main/src/main/docs/main.adoc
index 832d6d9..2d3fdea 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -28,10 +28,6 @@ The following table lists all the options:
 | *camel.main.autoConfiguration{zwsp}FailFast* | Whether auto configuration should fail fast when configuring one ore more properties fails for whatever reason such as a invalid property name, etc. This option is default enabled. | true | boolean
 | *camel.main.autoConfiguration{zwsp}LogSummary* | Whether auto configuration should log a summary with the configured properties. This option is default enabled. | true | boolean
 | *camel.main.autoStartup* | Sets whether the object should automatically start when Camel starts. Important: Currently only routes can be disabled, as CamelContext's are always started. Note: When setting auto startup false on CamelContext then that takes precedence and no routes are started. You would need to start CamelContext explicit using the org.apache.camel.CamelContext.start() method, to start the context, and then you would need to start the routes manually using CamelContext.g [...]
-| *camel.main.autowireComponent{zwsp}Properties* | Whether autowiring components with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. This option is default enabled. | true | boolean
-| *camel.main.autowireComponent{zwsp}PropertiesAllowPrivateSetter* | Whether autowiring components allows to use private setter method when setting the value. This may be needed in some rare situations when some configuration classes may configure via constructors over setters. But constructor configuration is more cumbersome to use via .properties files etc. | true | boolean
-| *camel.main.autowireComponent{zwsp}PropertiesDeep* | Whether autowiring components (with deep nesting by attempting to walk as deep down the object graph by creating new empty objects on the way if needed) with properties that are of same type, which has been added to the Camel registry, as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin instances to the components. This option is default disabled. |  | boolean
-| *camel.main.autowireComponent{zwsp}PropertiesNonNullOnly* | Whether to only autowire if the property has no default value or has not been configured explicit. This option is default disabled. |  | boolean
 | *camel.main.backlogTracing* | Sets whether backlog tracing is enabled or not. Default is false. |  | boolean
 | *camel.main.beanIntrospection{zwsp}ExtendedStatistics* | Sets whether bean introspection uses extended statistics. The default is false. |  | boolean
 | *camel.main.beanIntrospection{zwsp}LoggingLevel* | Sets the logging level used by bean introspection, logging activity of its usage. The default is TRACE. |  | LoggingLevel
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 6111c68..e03c52e 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -420,20 +420,8 @@ public abstract class BaseMainSupport extends BaseService {
         // try to load configuration classes
         loadConfigurations(camelContext);
 
-        // conventional configuration via properties to allow configuring options on
-        // component, dataformat, and languages (like spring-boot auto-configuration)
-        if (mainConfigurationProperties.isAutowireComponentProperties()
-                || mainConfigurationProperties.isAutowireComponentPropertiesDeep()) {
-            autowireConfigurationFromRegistry(
-                    camelContext,
-                    mainConfigurationProperties.isAutowireComponentPropertiesNonNullOnly(),
-                    mainConfigurationProperties.isAutowireComponentPropertiesDeep());
-        }
         if (mainConfigurationProperties.isAutoConfigurationEnabled()) {
             autoConfigurationFromProperties(camelContext, autoConfiguredProperties);
-        }
-        if (mainConfigurationProperties.isAutowireComponentProperties()
-                || mainConfigurationProperties.isAutowireComponentPropertiesDeep()) {
             autowireWildcardProperties(camelContext);
         }
 
@@ -1186,21 +1174,6 @@ public abstract class BaseMainSupport extends BaseService {
         }
     }
 
-    protected void autowireConfigurationFromRegistry(CamelContext camelContext, boolean bindNullOnly, boolean deepNesting)
-            throws Exception {
-        camelContext.addLifecycleStrategy(new LifecycleStrategySupport() {
-            @Override
-            public void onComponentAdd(String name, Component component) {
-                PropertyBindingSupport.autowireSingletonPropertiesFromRegistry(camelContext, component, bindNullOnly,
-                        deepNesting, (obj, propertyName, type, value) -> {
-                            LOG.info(
-                                    "Autowired property: {} on component: {} as exactly one instance of type: {} found in the registry",
-                                    propertyName, component.getClass().getSimpleName(), type.getName());
-                        });
-            }
-        });
-    }
-
     protected void autowireWildcardProperties(CamelContext camelContext) {
         if (wildcardProperties.isEmpty()) {
             return;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/FaultToleranceConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/FaultToleranceConfigurationProperties.java
index d0e61bf..585281b 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/FaultToleranceConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/FaultToleranceConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Global configuration for MicroProfile Fault Tolerance EIP circuit breaker.
  */
-@Configurer(api = true)
+@Configurer
 public class FaultToleranceConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/HealthCheckConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/HealthCheckConfigurationProperties.java
index 93f1366..4911357 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/HealthCheckConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/HealthCheckConfigurationProperties.java
@@ -19,7 +19,7 @@ package org.apache.camel.main;
 import org.apache.camel.health.HealthCheckConfiguration;
 import org.apache.camel.spi.Configurer;
 
-@Configurer(api = true)
+@Configurer
 public class HealthCheckConfigurationProperties extends HealthCheckConfiguration {
 
 }
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/HealthConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/HealthConfigurationProperties.java
index 0813ef1..e897ef0 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/HealthConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/HealthConfigurationProperties.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Global configuration for Health Check
  */
-@Configurer(api = true)
+@Configurer
 public class HealthConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/HystrixConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/HystrixConfigurationProperties.java
index d450c66..7fce15b 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/HystrixConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/HystrixConfigurationProperties.java
@@ -27,7 +27,7 @@ import org.apache.camel.spi.Configurer;
 /**
  * Global configuration for Hystrix EIP circuit breaker.
  */
-@Configurer(api = true)
+@Configurer
 @Deprecated
 public class HystrixConfigurationProperties implements BootstrapCloseable {
 
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/LraConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/LraConfigurationProperties.java
index 12e0a5d..4832267 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/LraConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/LraConfigurationProperties.java
@@ -23,7 +23,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Global configuration for Saga LRA
  */
-@Configurer(api = true)
+@Configurer
 public class LraConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
index 9a2b5ac..2166391 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/MainConfigurationProperties.java
@@ -28,7 +28,7 @@ import org.apache.camel.spi.Configurer;
 /**
  * Global configuration for Camel Main to setup context name, stream caching and other global configurations.
  */
-@Configurer(api = true)
+@Configurer
 public class MainConfigurationProperties extends DefaultConfigurationProperties<MainConfigurationProperties>
         implements BootstrapCloseable {
 
@@ -36,10 +36,6 @@ public class MainConfigurationProperties extends DefaultConfigurationProperties<
     private boolean autoConfigurationEnvironmentVariablesEnabled = true;
     private boolean autoConfigurationFailFast = true;
     private boolean autoConfigurationLogSummary = true;
-    private boolean autowireComponentProperties = true;
-    private boolean autowireComponentPropertiesDeep;
-    private boolean autowireComponentPropertiesNonNullOnly;
-    private boolean autowireComponentPropertiesAllowPrivateSetter = true;
     private int durationHitExitCode;
     private String packageScanRouteBuilders;
 
@@ -237,63 +233,6 @@ public class MainConfigurationProperties extends DefaultConfigurationProperties<
         this.autoConfigurationLogSummary = autoConfigurationLogSummary;
     }
 
-    public boolean isAutowireComponentProperties() {
-        return autowireComponentProperties;
-    }
-
-    /**
-     * Whether autowiring components with properties that are of same type, which has been added to the Camel registry,
-     * as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin
-     * instances to the components.
-     * <p/>
-     * This option is default enabled.
-     */
-    public void setAutowireComponentProperties(boolean autowireComponentProperties) {
-        this.autowireComponentProperties = autowireComponentProperties;
-    }
-
-    public boolean isAutowireComponentPropertiesDeep() {
-        return autowireComponentPropertiesDeep;
-    }
-
-    /**
-     * Whether autowiring components (with deep nesting by attempting to walk as deep down the object graph by creating
-     * new empty objects on the way if needed) with properties that are of same type, which has been added to the Camel
-     * registry, as a singleton instance. This is used for convention over configuration to inject DataSource,
-     * AmazonLogin instances to the components.
-     * <p/>
-     * This option is default disabled.
-     */
-    public void setAutowireComponentPropertiesDeep(boolean autowireComponentPropertiesDeep) {
-        this.autowireComponentPropertiesDeep = autowireComponentPropertiesDeep;
-    }
-
-    public boolean isAutowireComponentPropertiesNonNullOnly() {
-        return autowireComponentPropertiesNonNullOnly;
-    }
-
-    /**
-     * Whether to only autowire if the property has no default value or has not been configured explicit.
-     * <p/>
-     * This option is default disabled.
-     */
-    public void setAutowireComponentPropertiesNonNullOnly(boolean autowireComponentPropertiesNonNullOnly) {
-        this.autowireComponentPropertiesNonNullOnly = autowireComponentPropertiesNonNullOnly;
-    }
-
-    public boolean isAutowireComponentPropertiesAllowPrivateSetter() {
-        return autowireComponentPropertiesAllowPrivateSetter;
-    }
-
-    /**
-     * Whether autowiring components allows to use private setter method when setting the value. This may be needed in
-     * some rare situations when some configuration classes may configure via constructors over setters. But constructor
-     * configuration is more cumbersome to use via .properties files etc.
-     */
-    public void setAutowireComponentPropertiesAllowPrivateSetter(boolean autowireComponentPropertiesAllowPrivateSetter) {
-        this.autowireComponentPropertiesAllowPrivateSetter = autowireComponentPropertiesAllowPrivateSetter;
-    }
-
     public String getPackageScanRouteBuilders() {
         return packageScanRouteBuilders;
     }
@@ -492,56 +431,6 @@ public class MainConfigurationProperties extends DefaultConfigurationProperties<
     }
 
     /**
-     * Whether autowiring components with properties that are of same type, which has been added to the Camel registry,
-     * as a singleton instance. This is used for convention over configuration to inject DataSource, AmazonLogin
-     * instances to the components.
-     * <p/>
-     * This option is default enabled.
-     */
-    public MainConfigurationProperties withAutowireComponentProperties(boolean autowireComponentProperties) {
-        this.autowireComponentProperties = autowireComponentProperties;
-        return this;
-    }
-
-    /**
-     * Whether autowiring components (with deep nesting by attempting to walk as deep down the object graph by creating
-     * new empty objects on the way if needed) with properties that are of same type, which has been added to the Camel
-     * registry, as a singleton instance. This is used for convention over configuration to inject DataSource,
-     * AmazonLogin instances to the components.
-     * <p/>
-     * This option is default disabled.
-     */
-    public MainConfigurationProperties withAutowireComponentPropertiesDeep(boolean autowireComponentPropertiesDeep) {
-        this.autowireComponentPropertiesDeep = autowireComponentPropertiesDeep;
-        return this;
-    }
-
-    /**
-     * Whether to only autowire if the property has no default value or has not been configured explicit.
-     * <p/>
-     * This option is default disabled.
-     */
-    public MainConfigurationProperties withAutowireComponentPropertiesNonNullOnly(
-            boolean autowireComponentPropertiesNonNullOnly) {
-        this.autowireComponentPropertiesNonNullOnly = autowireComponentPropertiesNonNullOnly;
-        return this;
-    }
-
-    /**
-     * Whether autowiring components (with deep nesting by attempting to walk as deep down the object graph by creating
-     * new empty objects on the way if needed) with properties that are of same type, which has been added to the Camel
-     * registry, as a singleton instance. This is used for convention over configuration to inject DataSource,
-     * AmazonLogin instances to the components.
-     * <p/>
-     * This option is default enabled.
-     */
-    public MainConfigurationProperties withAutowireComponentPropertiesAllowPrivateSetter(
-            boolean autowireComponentPropertiesAllowPrivateSetter) {
-        this.autowireComponentPropertiesAllowPrivateSetter = autowireComponentPropertiesAllowPrivateSetter;
-        return this;
-    }
-
-    /**
      * Sets the exit code for the application if duration was hit
      */
     public MainConfigurationProperties withDurationHitExitCode(int durationHitExitCode) {
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/Resilience4jConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/Resilience4jConfigurationProperties.java
index 6921fc0..7c32641 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/Resilience4jConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/Resilience4jConfigurationProperties.java
@@ -25,7 +25,7 @@ import org.apache.camel.spi.Metadata;
 /**
  * Global configuration for Resilience EIP circuit breaker.
  */
-@Configurer(api = true)
+@Configurer
 public class Resilience4jConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
index 475cfb6..9e61835 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/RestConfigurationProperties.java
@@ -26,7 +26,7 @@ import org.apache.camel.support.PatternHelper;
 /**
  * Global configuration for Rest DSL.
  */
-@Configurer(api = true)
+@Configurer
 public class RestConfigurationProperties extends RestConfiguration implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/main/java/org/apache/camel/main/ThreadPoolConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/ThreadPoolConfigurationProperties.java
index b4f4eb7..77cbec5 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/ThreadPoolConfigurationProperties.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/ThreadPoolConfigurationProperties.java
@@ -27,7 +27,7 @@ import org.apache.camel.util.concurrent.ThreadPoolRejectedPolicy;
 /**
  * Global configuration for thread pools
  */
-@Configurer(api = true)
+@Configurer
 public class ThreadPoolConfigurationProperties implements BootstrapCloseable {
 
     private MainConfigurationProperties parent;
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCAutowireTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCAutowireTest.java
deleted file mode 100644
index fc2b1ca..0000000
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCAutowireTest.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.main;
-
-import java.util.Map;
-
-import org.apache.camel.AsyncCallback;
-import org.apache.camel.BindToRegistry;
-import org.apache.camel.CamelContext;
-import org.apache.camel.CamelContextAware;
-import org.apache.camel.Consumer;
-import org.apache.camel.Endpoint;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.component.seda.BlockingQueueFactory;
-import org.apache.camel.component.seda.PriorityBlockingQueueFactory;
-import org.apache.camel.component.seda.SedaComponent;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.support.DefaultAsyncProducer;
-import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.support.DefaultConsumer;
-import org.apache.camel.support.DefaultEndpoint;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-public class MainIoCAutowireTest {
-    @Test
-    public void autowireNonNullOnlyDisabledTest() {
-        Main main = new Main();
-
-        try {
-            main.bind("seda", createSedaComponent());
-            main.configure().addConfigurationClass(MyConfiguration.class);
-            main.configure().setAutowireComponentPropertiesNonNullOnly(false);
-            main.setPropertyPlaceholderLocations("empty.properties");
-            main.start();
-
-            BlockingQueueFactory qf = main.getCamelContext().getComponent("seda", SedaComponent.class).getDefaultQueueFactory();
-            assertTrue(qf instanceof PriorityBlockingQueueFactory);
-        } finally {
-            main.stop();
-        }
-    }
-
-    @Test
-    public void autowireNonNullOnlyEnabledTest() {
-        Main main = new Main();
-
-        try {
-            main.bind("seda", createSedaComponent());
-            main.configure().addConfigurationClass(MyConfiguration.class);
-            main.configure().setAutowireComponentPropertiesNonNullOnly(true);
-            main.setPropertyPlaceholderLocations("empty.properties");
-            main.start();
-
-            BlockingQueueFactory qf = main.getCamelContext().getComponent("seda", SedaComponent.class).getDefaultQueueFactory();
-            assertTrue(qf instanceof MySedaBlockingQueueFactory);
-        } finally {
-            main.stop();
-        }
-    }
-
-    @Test
-    public void doNotAutowireContextTest() {
-        Main main = new Main();
-
-        try {
-            DefaultCamelContext otherContext = new DefaultCamelContext();
-            otherContext.setName("other-ctx");
-
-            main.bind("dummy", new MyDummyComponent());
-            main.bind("context", otherContext);
-            main.configure().addConfigurationClass(MyConfiguration.class);
-            main.configure().setName("main");
-            main.configure().setAutowireComponentPropertiesNonNullOnly(true);
-            main.setPropertyPlaceholderLocations("empty.properties");
-            main.start();
-
-            MyDummyComponent component = main.getCamelContext().getComponent("dummy", MyDummyComponent.class);
-            // the camel context is bound to the component upon initialization
-            assertEquals(main.getCamelContext(), component.getCamelContext());
-            // the camel context should not be set by auto wiring
-            assertEquals(null, component.getConfig().getCamelContext());
-        } finally {
-            main.stop();
-        }
-    }
-
-    public static class MyConfiguration {
-        @BindToRegistry
-        public BlockingQueueFactory queueFactory(CamelContext myCamel) {
-            // we can optionally include camel context as parameter
-            assertNotNull(myCamel);
-            return new PriorityBlockingQueueFactory();
-        }
-    }
-
-    public static SedaComponent createSedaComponent() {
-        SedaComponent seda = new SedaComponent();
-        seda.setDefaultQueueFactory(new MySedaBlockingQueueFactory());
-
-        return seda;
-    }
-
-    public static class MyDummyComponent extends DefaultComponent {
-        private MyDummyConfig config = new MyDummyConfig();
-
-        public MyDummyConfig getConfig() {
-            return config;
-        }
-
-        public void setConfig(MyDummyConfig config) {
-            this.config = config;
-        }
-
-        @Override
-        protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-            return new DefaultEndpoint() {
-                @Override
-                public Producer createProducer() throws Exception {
-                    return new DefaultAsyncProducer(this) {
-                        @Override
-                        public boolean process(Exchange exchange, AsyncCallback callback) {
-                            return false;
-                        }
-                    };
-                }
-
-                @Override
-                public Consumer createConsumer(Processor processor) throws Exception {
-                    return new DefaultConsumer(this, processor);
-                }
-
-                @Override
-                protected String createEndpointUri() {
-                    return "dummy://foo";
-                }
-            };
-        }
-    }
-
-    public static class MyDummyConfig implements CamelContextAware {
-        private CamelContext camelContext;
-
-        @Override
-        public CamelContext getCamelContext() {
-            return camelContext;
-        }
-
-        @Override
-        public void setCamelContext(CamelContext camelContext) {
-            this.camelContext = camelContext;
-        }
-    }
-}
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
index 5ca7d06..cb013a0 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainIoCTest.java
@@ -29,10 +29,8 @@ import org.apache.camel.component.seda.SedaComponent;
 import org.apache.camel.model.ModelCamelContext;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 public class MainIoCTest {
 
@@ -83,10 +81,11 @@ public class MainIoCTest {
         // should have called the configure class
         assertEquals("123", camelContext.getGlobalOptions().get("foo"));
 
-        // and seda should have been auto-configured by type
+        // and seda should be created and use the custom queue factory
         Object qf = seda.getDefaultQueueFactory();
         assertNotNull(qf);
         assertTrue(qf instanceof PriorityBlockingQueueFactory);
+        assertSame(camelContext, seda.getCamelContext());
 
         MyConfiguration.MyCoolBean mcb = (MyConfiguration.MyCoolBean) camelContext.getRegistry().lookupByName("MyCoolBean");
         assertNotNull(mcb);
@@ -122,13 +121,20 @@ public class MainIoCTest {
             }
         }
 
-        @BindToRegistry
+        @BindToRegistry("myQF")
         public BlockingQueueFactory queueFactory(CamelContext myCamel) {
             // we can optionally include camel context as parameter
             assertNotNull(myCamel);
             return new PriorityBlockingQueueFactory();
         }
 
+        @BindToRegistry
+        public SedaComponent seda(@BeanInject BlockingQueueFactory qf) {
+            SedaComponent seda = new SedaComponent();
+            seda.setDefaultQueueFactory(qf);
+            return seda;
+        }
+
         @BindToRegistry("coolStuff")
         public String cool(
                 @BeanInject MyCoolBean cool,
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainSedaTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSedaTest.java
index c0a5d4c..5b80fe5 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainSedaTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSedaTest.java
@@ -47,30 +47,6 @@ public class MainSedaTest {
         main.stop();
     }
 
-    @Test
-    public void testSedaAutowireFromRegistryMain() throws Exception {
-        Main main = new Main();
-        main.configure().addRoutesBuilder(new MyRouteBuilder());
-        main.addProperty("camel.beans.myqf", "#class:org.apache.camel.main.MySedaBlockingQueueFactory");
-        main.addProperty("camel.beans.myqf.counter", "123");
-        main.start();
-
-        CamelContext camelContext = main.getCamelContext();
-        assertNotNull(camelContext);
-
-        // the keys will be lower-cased
-        assertNotNull(camelContext.getRegistry().lookupByName("myqf"));
-
-        // seda will autowire from registry and discover the custom qf and use it
-        SedaComponent seda = camelContext.getComponent("seda", SedaComponent.class);
-        assertNotNull(seda);
-        assertTrue(seda.getDefaultQueueFactory() instanceof MySedaBlockingQueueFactory);
-        MySedaBlockingQueueFactory myBQF = (MySedaBlockingQueueFactory) seda.getDefaultQueueFactory();
-        assertEquals(123, myBQF.getCounter());
-
-        main.stop();
-    }
-
     public static class MyRouteBuilder extends RouteBuilder {
         @Override
         public void configure() throws Exception {
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index 3b21583..342bf29 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -94,173 +94,6 @@ public final class PropertyBindingSupport {
     }
 
     /**
-     * This will discover all the properties on the target, and automatic bind the properties that are null by looking
-     * up in the registry to see if there is a single instance of the same type as the property. This is used for
-     * convention over configuration to automatic configure resources such as DataSource, Amazon Logins and so on.
-     *
-     * @param  camelContext the camel context
-     * @param  target       the target object
-     * @return              true if one ore more properties was auto wired
-     */
-    public static boolean autowireSingletonPropertiesFromRegistry(CamelContext camelContext, Object target) {
-        return autowireSingletonPropertiesFromRegistry(camelContext, target, false, false, null);
-    }
-
-    /**
-     * This will discover all the properties on the target, and automatic bind the properties by looking up in the
-     * registry to see if there is a single instance of the same type as the property. This is used for convention over
-     * configuration to automatic configure resources such as DataSource, Amazon Logins and so on.
-     *
-     * @param  camelContext the camel context
-     * @param  target       the target object
-     * @param  bindNullOnly whether to only autowire if the property has no default value or has not been configured
-     *                      explicit
-     * @param  deepNesting  whether to attempt to walk as deep down the object graph by creating new empty objects on
-     *                      the way if needed (Camel can only create new empty objects if they have a default no-arg
-     *                      constructor, also mind that this may lead to creating many empty objects, even if they will
-     *                      not have any objects autowired from the registry, so use this with caution)
-     * @param  callback     optional callback when a property was auto wired
-     * @return              true if one ore more properties was auto wired
-     */
-    public static boolean autowireSingletonPropertiesFromRegistry(
-            CamelContext camelContext, Object target,
-            boolean bindNullOnly, boolean deepNesting, OnAutowiring callback) {
-        try {
-            if (target != null) {
-                Set<Object> parents = new HashSet<>();
-                return doAutowireSingletonPropertiesFromRegistry(camelContext, target, parents, bindNullOnly, deepNesting,
-                        callback);
-            }
-        } catch (Exception e) {
-            throw new PropertyBindingException(target, e);
-        }
-
-        return false;
-    }
-
-    private static boolean doAutowireSingletonPropertiesFromRegistry(
-            final CamelContext camelContext, Object target, Set<Object> parents,
-            boolean bindNullOnly, boolean deepNesting, OnAutowiring callback)
-            throws Exception {
-
-        // properties of all the current values from the target
-        Map<String, Object> properties = new LinkedHashMap<>();
-
-        // if there a configurer
-        PropertyConfigurer configurer = PropertyConfigurerHelper.resolvePropertyConfigurer(camelContext, target);
-
-        // use configurer to get all the current options and its values
-        Map<String, Object> getterAllOption = null;
-        if (configurer instanceof PropertyConfigurerGetter) {
-            final PropertyConfigurerGetter getter = (PropertyConfigurerGetter) configurer;
-            final Object lambdaTarget = target;
-            getterAllOption = getter.getAllOptions(target);
-            getterAllOption.forEach((key, type) -> {
-                // we only need the complex types
-                if (isComplexUserType((Class) type)) {
-                    Object value = getter.getOptionValue(lambdaTarget, key, true);
-                    properties.put(key, value);
-                }
-            });
-        } else {
-            // okay use reflection based
-            camelContext.adapt(ExtendedCamelContext.class).getBeanIntrospection().getProperties(target, properties, null);
-        }
-
-        boolean hit = false;
-
-        for (Map.Entry<String, Object> entry : properties.entrySet()) {
-            String key = entry.getKey();
-            Object value = entry.getValue();
-
-            // skip based on some known names
-            if ("basicPropertyBinding".equals(key) || "bridgeErrorHandler".equals(key) || "lazyStartProducer".equals(key)) {
-                continue;
-            }
-
-            boolean skip = parents.contains(value) || value instanceof CamelContext;
-            if (skip) {
-                // we have already covered this as parent of parents so dont walk down this as we want to avoid
-                // circular dependencies when walking the OGNL graph, also we dont want to walk down CamelContext
-                continue;
-            }
-
-            Class<?> type;
-            if (getterAllOption != null) {
-                // use getter configurer to know the property class type
-                type = (Class<?>) getterAllOption.get(key);
-            } else {
-                // okay fallback to use reflection based
-                type = getGetterType(camelContext, target, key, false);
-            }
-            if (type != null && CamelContext.class.isAssignableFrom(type)) {
-                // the camel context is usually bound by other means so don't bind it to the target object
-                // and most important do not walk it down and re-configure it.
-                //
-                // In some cases, such as Camel Quarkus, the Registry and the Context itself are added to
-                // the IoC Container and an attempt to auto re-wire the Context may ends up in a circular
-                // reference and a subsequent stack overflow.
-                continue;
-            }
-
-            if (isComplexUserType(type)) {
-                // if the property has not been set and its a complex type (not simple or string etc)
-                if (!bindNullOnly || value == null) {
-                    Set lookup = camelContext.getRegistry().findByType(type);
-                    if (lookup.size() == 1) {
-                        value = lookup.iterator().next();
-                        if (value != null) {
-                            if (configurer != null) {
-                                // favour using source code generated configurer
-                                hit = configurer.configure(camelContext, target, undashKey(key), value, true);
-                            }
-                            if (!hit) {
-                                // fallback to use reflection based
-                                hit = camelContext.adapt(ExtendedCamelContext.class).getBeanIntrospection()
-                                        .setProperty(camelContext, target, key, value);
-                            }
-                            if (hit && callback != null) {
-                                callback.onAutowire(target, key, type, value);
-                            }
-                        }
-                    }
-                }
-
-                // attempt to create new instances to walk down the tree if its null (deepNesting option)
-                if (value == null && deepNesting) {
-                    // okay is there a setter so we can create a new instance and set it automatic
-                    Method method = findBestSetterMethod(camelContext, target.getClass(), key, true, true, false);
-                    if (method != null) {
-                        Class<?> parameterType = method.getParameterTypes()[0];
-                        if (parameterType != null
-                                && org.apache.camel.util.ObjectHelper.hasDefaultPublicNoArgConstructor(parameterType)) {
-                            Object instance = camelContext.getInjector().newInstance(parameterType);
-                            if (instance != null) {
-                                org.apache.camel.support.ObjectHelper.invokeMethod(method, target, instance);
-                                target = instance;
-                                // remember this as parent and also autowire nested properties
-                                // do not walk down if it point to our-selves (circular reference)
-                                parents.add(target);
-                                value = instance;
-                                hit |= doAutowireSingletonPropertiesFromRegistry(camelContext, value, parents, bindNullOnly,
-                                        deepNesting, callback);
-                            }
-                        }
-                    }
-                } else if (value != null && deepNesting) {
-                    // remember this as parent and also autowire nested properties
-                    // do not walk down if it point to our-selves (circular reference)
-                    parents.add(target);
-                    hit |= doAutowireSingletonPropertiesFromRegistry(camelContext, value, parents, bindNullOnly, deepNesting,
-                            callback);
-                }
-            }
-        }
-
-        return hit;
-    }
-
-    /**
      * Binds the properties to the target object, and removes the property that was bound from properties.
      * <p/>
      * This method uses the default settings, and if you need to configure any setting then use the fluent builder


[camel] 01/03: CAMEL-15824: camel-core - Optimize configurer to have getOptionType and clear big map after bootstrap. Only api components need to retrain.

Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit a1311f22a5dcd35fa5d4dd75d150326d2f4b0eab
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Nov 6 10:12:16 2020 +0100

    CAMEL-15824: camel-core - Optimize configurer to have getOptionType and clear big map after bootstrap. Only api components need to retrain.
---
 .../activemq/ActiveMQComponentConfigurer.java      |  18 +-
 .../activemq/ActiveMQEndpointConfigurer.java       |   2 +-
 .../component/ahc/ws/WsComponentConfigurer.java    |  12 +-
 .../component/ahc/ws/WsEndpointConfigurer.java     |  20 +-
 .../component/ahc/AhcComponentConfigurer.java      |  26 +-
 .../camel/component/ahc/AhcEndpointConfigurer.java |  38 +-
 .../component/amqp/AMQPComponentConfigurer.java    |  12 +-
 .../component/amqp/AMQPEndpointConfigurer.java     |   2 +-
 .../component/apns/ApnsComponentConfigurer.java    |  18 +-
 .../component/apns/ApnsEndpointConfigurer.java     |  51 +-
 .../arangodb/ArangoDbComponentConfigurer.java      |  27 +-
 .../arangodb/ArangoDbEndpointConfigurer.java       |  27 +-
 .../as2/AS2ClientManagerEndpointConfiguration.java |   2 +-
 ...ientManagerEndpointConfigurationConfigurer.java |  68 ++-
 .../component/as2/AS2ComponentConfigurer.java      |  17 +-
 .../component/as2/AS2ConfigurationConfigurer.java  |  64 ++-
 .../camel/component/as2/AS2EndpointConfigurer.java |  70 ++-
 .../as2/AS2ServerManagerEndpointConfiguration.java |   2 +-
 ...rverManagerEndpointConfigurationConfigurer.java |  66 ++-
 .../camel/component/as2/AS2Configuration.java      |   2 +-
 .../asterisk/AsteriskComponentConfigurer.java      |  16 +-
 .../asterisk/AsteriskEndpointConfigurer.java       |  25 +-
 .../atlasmap/AtlasMapComponentConfigurer.java      |  16 +-
 .../atlasmap/AtlasMapEndpointConfigurer.java       |  27 +-
 .../component/atmos/AtmosComponentConfigurer.java  |  23 +-
 .../component/atmos/AtmosEndpointConfigurer.java   |  35 +-
 .../websocket/WebsocketComponentConfigurer.java    |  12 +-
 .../websocket/WebsocketEndpointConfigurer.java     |  18 +-
 .../component/atom/AtomComponentConfigurer.java    |  14 +-
 .../component/atom/AtomEndpointConfigurer.java     |  61 +-
 .../client/map/AtomixMapComponentConfigurer.java   |  40 +-
 .../client/map/AtomixMapEndpointConfigurer.java    |  44 +-
 .../AtomixMessagingComponentConfigurer.java        |  44 +-
 .../AtomixMessagingEndpointConfigurer.java         |  48 +-
 .../AtomixMultiMapComponentConfigurer.java         |  38 +-
 .../multimap/AtomixMultiMapEndpointConfigurer.java |  38 +-
 .../queue/AtomixQueueComponentConfigurer.java      |  38 +-
 .../queue/AtomixQueueEndpointConfigurer.java       |  42 +-
 .../client/set/AtomixSetComponentConfigurer.java   |  39 +-
 .../client/set/AtomixSetEndpointConfigurer.java    |  43 +-
 .../value/AtomixValueComponentConfigurer.java      |  39 +-
 .../value/AtomixValueEndpointConfigurer.java       |  43 +-
 .../component/avro/AvroComponentConfigurer.java    |  28 +-
 .../component/avro/AvroEndpointConfigurer.java     |  32 +-
 .../component/aws/cw/CwComponentConfigurer.java    |  34 +-
 .../component/aws/cw/CwEndpointConfigurer.java     |  34 +-
 .../component/aws/ddb/DdbComponentConfigurer.java  |  41 +-
 .../component/aws/ddb/DdbEndpointConfigurer.java   |  41 +-
 .../ddbstream/DdbStreamComponentConfigurer.java    |  36 +-
 .../aws/ddbstream/DdbStreamEndpointConfigurer.java |  69 ++-
 .../component/aws/ec2/EC2ComponentConfigurer.java  |  31 +-
 .../component/aws/ec2/EC2EndpointConfigurer.java   |  31 +-
 .../component/aws/ecs/ECSComponentConfigurer.java  |  31 +-
 .../component/aws/ecs/ECSEndpointConfigurer.java   |  31 +-
 .../component/aws/eks/EKSComponentConfigurer.java  |  31 +-
 .../component/aws/eks/EKSEndpointConfigurer.java   |  31 +-
 .../component/aws/iam/IAMComponentConfigurer.java  |  31 +-
 .../component/aws/iam/IAMEndpointConfigurer.java   |  31 +-
 .../KinesisFirehoseComponentConfigurer.java        |  30 +-
 .../KinesisFirehoseEndpointConfigurer.java         |  30 +-
 .../aws/kinesis/KinesisComponentConfigurer.java    |  42 +-
 .../aws/kinesis/KinesisEndpointConfigurer.java     |  75 ++-
 .../component/aws/kms/KMSComponentConfigurer.java  |  31 +-
 .../component/aws/kms/KMSEndpointConfigurer.java   |  31 +-
 .../aws/lambda/LambdaComponentConfigurer.java      |  31 +-
 .../aws/lambda/LambdaEndpointConfigurer.java       |  31 +-
 .../component/aws/mq/MQComponentConfigurer.java    |  31 +-
 .../component/aws/mq/MQEndpointConfigurer.java     |  31 +-
 .../component/aws/msk/MSKComponentConfigurer.java  |  31 +-
 .../component/aws/msk/MSKEndpointConfigurer.java   |  31 +-
 .../component/aws/s3/S3ComponentConfigurer.java    |  82 ++-
 .../component/aws/s3/S3EndpointConfigurer.java     | 119 +++-
 .../component/aws/sdb/SdbComponentConfigurer.java  |  14 +-
 .../component/aws/sdb/SdbEndpointConfigurer.java   |  33 +-
 .../component/aws/ses/SesComponentConfigurer.java  |  36 +-
 .../component/aws/ses/SesEndpointConfigurer.java   |  36 +-
 .../component/aws/sns/SnsComponentConfigurer.java  |  46 +-
 .../component/aws/sns/SnsEndpointConfigurer.java   |  48 +-
 .../component/aws/sqs/SqsComponentConfigurer.java  |  83 ++-
 .../component/aws/sqs/SqsEndpointConfigurer.java   | 120 +++-
 .../component/aws/swf/SWFComponentConfigurer.java  |  66 ++-
 .../component/aws/swf/SWFEndpointConfigurer.java   |  70 ++-
 .../translate/TranslateComponentConfigurer.java    |  37 +-
 .../aws/translate/TranslateEndpointConfigurer.java |  37 +-
 .../aws2/athena/Athena2ComponentConfigurer.java    |  64 ++-
 .../aws2/athena/Athena2EndpointConfigurer.java     |  64 ++-
 .../component/aws2/cw/Cw2ComponentConfigurer.java  |  36 +-
 .../component/aws2/cw/Cw2EndpointConfigurer.java   |  36 +-
 .../aws2/ddb/Ddb2ComponentConfigurer.java          |  43 +-
 .../component/aws2/ddb/Ddb2EndpointConfigurer.java |  43 +-
 .../ddbstream/Ddb2StreamComponentConfigurer.java   |  38 +-
 .../ddbstream/Ddb2StreamEndpointConfigurer.java    |  71 ++-
 .../aws2/ec2/AWS2EC2ComponentConfigurer.java       |  35 +-
 .../aws2/ec2/AWS2EC2EndpointConfigurer.java        |  35 +-
 .../aws2/ecs/ECS2ComponentConfigurer.java          |  35 +-
 .../component/aws2/ecs/ECS2EndpointConfigurer.java |  35 +-
 .../aws2/eks/EKS2ComponentConfigurer.java          |  35 +-
 .../component/aws2/eks/EKS2EndpointConfigurer.java |  35 +-
 .../EventbridgeComponentConfigurer.java            |  37 +-
 .../eventbridge/EventbridgeEndpointConfigurer.java |  37 +-
 .../aws2/iam/IAM2ComponentConfigurer.java          |  35 +-
 .../component/aws2/iam/IAM2EndpointConfigurer.java |  35 +-
 .../KinesisFirehose2ComponentConfigurer.java       |  35 +-
 .../KinesisFirehose2EndpointConfigurer.java        |  35 +-
 .../aws2/kinesis/Kinesis2ComponentConfigurer.java  |  46 +-
 .../aws2/kinesis/Kinesis2EndpointConfigurer.java   |  79 ++-
 .../aws2/kms/KMS2ComponentConfigurer.java          |  35 +-
 .../component/aws2/kms/KMS2EndpointConfigurer.java |  35 +-
 .../aws2/lambda/Lambda2ComponentConfigurer.java    |  35 +-
 .../aws2/lambda/Lambda2EndpointConfigurer.java     |  35 +-
 .../component/aws2/mq/MQ2ComponentConfigurer.java  |  35 +-
 .../component/aws2/mq/MQ2EndpointConfigurer.java   |  35 +-
 .../aws2/msk/MSK2ComponentConfigurer.java          |  35 +-
 .../component/aws2/msk/MSK2EndpointConfigurer.java |  35 +-
 .../aws2/s3/AWS2S3ComponentConfigurer.java         |  88 ++-
 .../aws2/s3/AWS2S3EndpointConfigurer.java          | 125 ++++-
 .../aws2/ses/Ses2ComponentConfigurer.java          |  38 +-
 .../component/aws2/ses/Ses2EndpointConfigurer.java |  38 +-
 .../aws2/sns/Sns2ComponentConfigurer.java          |  46 +-
 .../component/aws2/sns/Sns2EndpointConfigurer.java |  48 +-
 .../aws2/sqs/Sqs2ComponentConfigurer.java          |  87 ++-
 .../component/aws2/sqs/Sqs2EndpointConfigurer.java | 124 ++++-
 .../aws2/sts/STS2ComponentConfigurer.java          |  35 +-
 .../component/aws2/sts/STS2EndpointConfigurer.java |  35 +-
 .../translate/Translate2ComponentConfigurer.java   |  41 +-
 .../translate/Translate2EndpointConfigurer.java    |  41 +-
 .../eventhubs/EventHubsComponentConfigurer.java    |  51 +-
 .../eventhubs/EventHubsEndpointConfigurer.java     |  55 +-
 .../storage/blob/BlobComponentConfigurer.java      |  60 +-
 .../azure/storage/blob/BlobEndpointConfigurer.java |  66 ++-
 .../storage/queue/QueueComponentConfigurer.java    |  38 +-
 .../storage/queue/QueueEndpointConfigurer.java     |  42 +-
 .../azure/blob/BlobServiceComponentConfigurer.java |  51 +-
 .../azure/blob/BlobServiceEndpointConfigurer.java  |  55 +-
 .../queue/QueueServiceComponentConfigurer.java     |  33 +-
 .../queue/QueueServiceEndpointConfigurer.java      |  37 +-
 .../BeanValidatorComponentConfigurer.java          |  26 +-
 .../validator/BeanValidatorEndpointConfigurer.java |  28 +-
 .../component/bean/BeanComponentConfigurer.java    |  16 +-
 .../component/bean/BeanEndpointConfigurer.java     |  19 +-
 .../beanclass/ClassComponentConfigurer.java        |   2 +-
 .../beanclass/ClassEndpointConfigurer.java         |   2 +-
 .../beanstalk/BeanstalkComponentConfigurer.java    |  18 +-
 .../beanstalk/BeanstalkEndpointConfigurer.java     |  63 ++-
 .../bonita/BonitaComponentConfigurer.java          |  14 +-
 .../component/bonita/BonitaEndpointConfigurer.java |  21 +-
 ...CollaborationsManagerEndpointConfiguration.java |   2 +-
 ...ionsManagerEndpointConfigurationConfigurer.java |  54 +-
 .../BoxCommentsManagerEndpointConfiguration.java   |   2 +-
 ...entsManagerEndpointConfigurationConfigurer.java |  48 +-
 .../component/box/BoxComponentConfigurer.java      |  47 +-
 .../component/box/BoxConfigurationConfigurer.java  |  42 +-
 .../camel/component/box/BoxEndpointConfigurer.java |  51 +-
 .../BoxEventLogsManagerEndpointConfiguration.java  |   2 +-
 ...LogsManagerEndpointConfigurationConfigurer.java |  50 +-
 .../box/BoxEventsManagerEndpointConfiguration.java |   2 +-
 ...entsManagerEndpointConfigurationConfigurer.java |  44 +-
 .../box/BoxFilesManagerEndpointConfiguration.java  |   2 +-
 ...ilesManagerEndpointConfigurationConfigurer.java | 102 +++-
 .../BoxFoldersManagerEndpointConfiguration.java    |   2 +-
 ...dersManagerEndpointConfigurationConfigurer.java |  70 ++-
 .../box/BoxGroupsManagerEndpointConfiguration.java |   2 +-
 ...oupsManagerEndpointConfigurationConfigurer.java |  64 ++-
 .../box/BoxSearchManagerEndpointConfiguration.java |   2 +-
 ...archManagerEndpointConfigurationConfigurer.java |  46 +-
 .../box/BoxTasksManagerEndpointConfiguration.java  |   2 +-
 ...asksManagerEndpointConfigurationConfigurer.java |  58 +-
 .../box/BoxUsersManagerEndpointConfiguration.java  |   2 +-
 ...sersManagerEndpointConfigurationConfigurer.java |  64 ++-
 .../camel/component/box/BoxConfiguration.java      |   2 +-
 .../AddOnGatewayEndpointConfiguration.java         |   2 +-
 ...ddOnGatewayEndpointConfigurationConfigurer.java |  34 +-
 .../AddressGatewayEndpointConfiguration.java       |   2 +-
 ...ressGatewayEndpointConfigurationConfigurer.java |  40 +-
 .../braintree/BraintreeComponentConfigurer.java    |  15 +-
 .../BraintreeConfigurationConfigurer.java          |  34 +-
 .../braintree/BraintreeEndpointConfigurer.java     |  38 +-
 .../ClientTokenGatewayEndpointConfiguration.java   |   2 +-
 ...okenGatewayEndpointConfigurationConfigurer.java |  36 +-
 ...rdVerificationGatewayEndpointConfiguration.java |   2 +-
 ...tionGatewayEndpointConfigurationConfigurer.java |  40 +-
 .../CustomerGatewayEndpointConfiguration.java      |   2 +-
 ...omerGatewayEndpointConfigurationConfigurer.java |  42 +-
 .../DiscountGatewayEndpointConfiguration.java      |   2 +-
 ...ountGatewayEndpointConfigurationConfigurer.java |  34 +-
 .../DisputeGatewayEndpointConfiguration.java       |   2 +-
 ...puteGatewayEndpointConfigurationConfigurer.java |  50 +-
 ...DocumentUploadGatewayEndpointConfiguration.java |   2 +-
 ...loadGatewayEndpointConfigurationConfigurer.java |  36 +-
 ...erchantAccountGatewayEndpointConfiguration.java |   2 +-
 ...ountGatewayEndpointConfigurationConfigurer.java |  42 +-
 .../PaymentMethodGatewayEndpointConfiguration.java |   2 +-
 ...thodGatewayEndpointConfigurationConfigurer.java |  42 +-
 ...entMethodNonceGatewayEndpointConfiguration.java |   2 +-
 ...onceGatewayEndpointConfigurationConfigurer.java |  40 +-
 .../PlanGatewayEndpointConfiguration.java          |   2 +-
 ...PlanGatewayEndpointConfigurationConfigurer.java |  34 +-
 .../ReportGatewayEndpointConfiguration.java        |   2 +-
 ...portGatewayEndpointConfigurationConfigurer.java |  36 +-
 ...ntBatchSummaryGatewayEndpointConfiguration.java |   2 +-
 ...maryGatewayEndpointConfigurationConfigurer.java |  38 +-
 .../SubscriptionGatewayEndpointConfiguration.java  |   2 +-
 ...tionGatewayEndpointConfigurationConfigurer.java |  48 +-
 .../TransactionGatewayEndpointConfiguration.java   |   2 +-
 ...tionGatewayEndpointConfigurationConfigurer.java |  46 +-
 ...okNotificationGatewayEndpointConfiguration.java |   2 +-
 ...tionGatewayEndpointConfigurationConfigurer.java |  40 +-
 .../braintree/BraintreeConfiguration.java          |   2 +-
 .../browse/BrowseComponentConfigurer.java          |  16 +-
 .../component/browse/BrowseEndpointConfigurer.java |  21 +-
 .../cache/CaffeineCacheComponentConfigurer.java    |  41 +-
 .../cache/CaffeineCacheEndpointConfigurer.java     |  41 +-
 .../load/CaffeineLoadCacheComponentConfigurer.java |  41 +-
 .../load/CaffeineLoadCacheEndpointConfigurer.java  |  41 +-
 .../cassandra/CassandraComponentConfigurer.java    |  16 +-
 .../cassandra/CassandraEndpointConfigurer.java     |  65 ++-
 .../chatscript/ChatScriptComponentConfigurer.java  |  14 +-
 .../chatscript/ChatScriptEndpointConfigurer.java   |  19 +-
 .../component/chunk/ChunkComponentConfigurer.java  |  18 +-
 .../component/chunk/ChunkEndpointConfigurer.java   |  29 +-
 .../camel/component/cm/CMComponentConfigurer.java  |  14 +-
 .../camel/component/cm/CMEndpointConfigurer.java   |  23 +-
 .../component/cmis/CMISComponentConfigurer.java    |  18 +-
 .../component/cmis/CMISEndpointConfigurer.java     |  36 +-
 .../apache/camel/coap/CoAPComponentConfigurer.java |  16 +-
 .../apache/camel/coap/CoAPEndpointConfigurer.java  |  40 +-
 .../cometd/CometdComponentConfigurer.java          |  29 +-
 .../component/cometd/CometdEndpointConfigurer.java |  43 +-
 .../consul/ConsulComponentConfigurer.java          |  60 +-
 .../component/consul/ConsulEndpointConfigurer.java |  62 ++-
 .../controlbus/ControlBusComponentConfigurer.java  |  14 +-
 .../controlbus/ControlBusEndpointConfigurer.java   |  23 +-
 .../component/corda/CordaComponentConfigurer.java  |  33 +-
 .../component/corda/CordaEndpointConfigurer.java   |  37 +-
 .../couchbase/CouchbaseComponentConfigurer.java    |  16 +-
 .../couchbase/CouchbaseEndpointConfigurer.java     |  86 ++-
 .../couchdb/CouchDbComponentConfigurer.java        |  16 +-
 .../couchdb/CouchDbEndpointConfigurer.java         |  30 +-
 .../component/cron/CronComponentConfigurer.java    |  16 +-
 .../component/cron/CronEndpointConfigurer.java     |  20 +-
 .../crypto/cms/CryptoCmsComponentConfigurer.java   |  18 +-
 .../crypto/cms/CryptoCmsEndpointConfigurer.java    |  40 +-
 .../DigitalSignatureComponentConfigurer.java       |  45 +-
 .../crypto/DigitalSignatureEndpointConfigurer.java |  45 +-
 .../component/cxf/CxfComponentConfigurer.java      |  22 +-
 .../camel/component/cxf/CxfEndpointConfigurer.java |  76 ++-
 .../cxf/jaxrs/CxfRsComponentConfigurer.java        |  20 +-
 .../cxf/jaxrs/CxfRsEndpointConfigurer.java         |  69 ++-
 .../dataformat/DataFormatComponentConfigurer.java  |  14 +-
 .../dataformat/DataFormatEndpointConfigurer.java   |  15 +-
 .../dataset/DataSetComponentConfigurer.java        |  16 +-
 .../dataset/DataSetEndpointConfigurer.java         |  28 +-
 .../dataset/DataSetTestComponentConfigurer.java    |  14 +-
 .../dataset/DataSetTestEndpointConfigurer.java     |  15 +-
 .../DebeziumMongodbComponentConfigurer.java        | 116 +++-
 .../DebeziumMongodbEndpointConfigurer.java         | 120 +++-
 .../debezium/DebeziumMySqlComponentConfigurer.java | 167 +++++-
 .../debezium/DebeziumMySqlEndpointConfigurer.java  | 171 +++++-
 .../DebeziumPostgresComponentConfigurer.java       | 176 +++++-
 .../DebeziumPostgresEndpointConfigurer.java        | 180 +++++-
 .../DebeziumSqlserverComponentConfigurer.java      | 136 ++++-
 .../DebeziumSqlserverEndpointConfigurer.java       | 140 ++++-
 .../DigitalOceanComponentConfigurer.java           |  14 +-
 .../DigitalOceanEndpointConfigurer.java            |  31 +-
 .../direct/DirectComponentConfigurer.java          |  18 +-
 .../component/direct/DirectEndpointConfigurer.java |  25 +-
 .../directvm/DirectVmComponentConfigurer.java      |  22 +-
 .../directvm/DirectVmEndpointConfigurer.java       |  29 +-
 .../disruptor/DisruptorComponentConfigurer.java    |  28 +-
 .../disruptor/DisruptorEndpointConfigurer.java     |  35 +-
 .../component/djl/DJLComponentConfigurer.java      |  14 +-
 .../camel/component/djl/DJLEndpointConfigurer.java |  19 +-
 .../component/dns/DnsComponentConfigurer.java      |  14 +-
 .../camel/component/dns/DnsEndpointConfigurer.java |  15 +-
 .../docker/DockerComponentConfigurer.java          |  43 +-
 .../component/docker/DockerEndpointConfigurer.java |  47 +-
 .../component/dozer/DozerComponentConfigurer.java  |  14 +-
 .../component/dozer/DozerEndpointConfigurer.java   |  27 +-
 .../component/drill/DrillComponentConfigurer.java  |  14 +-
 .../component/drill/DrillEndpointConfigurer.java   |  20 +-
 .../dropbox/DropboxComponentConfigurer.java        |  16 +-
 .../dropbox/DropboxEndpointConfigurer.java         |  35 +-
 .../ehcache/EhcacheComponentConfigurer.java        |  38 +-
 .../ehcache/EhcacheEndpointConfigurer.java         |  43 +-
 .../ElasticsearchComponentConfigurer.java          |  33 +-
 .../ElasticsearchEndpointConfigurer.java           |  43 +-
 .../component/elsql/ElsqlComponentConfigurer.java  |  24 +-
 .../component/elsql/ElsqlEndpointConfigurer.java   | 101 +++-
 .../etcd/EtcdKeysComponentConfigurer.java          |  29 +-
 .../component/etcd/EtcdKeysEndpointConfigurer.java |  27 +-
 .../etcd/EtcdStatsComponentConfigurer.java         |  35 +-
 .../etcd/EtcdStatsEndpointConfigurer.java          |  66 ++-
 .../etcd/EtcdWatchComponentConfigurer.java         |  31 +-
 .../etcd/EtcdWatchEndpointConfigurer.java          |  33 +-
 .../component/exec/ExecComponentConfigurer.java    |  14 +-
 .../component/exec/ExecEndpointConfigurer.java     |  28 +-
 .../facebook/FacebookComponentConfigurer.java      |  71 ++-
 .../facebook/FacebookEndpointConfigurer.java       | 200 ++++++-
 .../FhirCapabilitiesEndpointConfiguration.java     |   2 +-
 ...apabilitiesEndpointConfigurationConfigurer.java |  62 ++-
 .../component/fhir/FhirComponentConfigurer.java    |  56 +-
 .../fhir/FhirConfigurationConfigurer.java          |  58 +-
 .../fhir/FhirCreateEndpointConfiguration.java      |   2 +-
 .../FhirCreateEndpointConfigurationConfigurer.java |  68 ++-
 .../fhir/FhirDeleteEndpointConfiguration.java      |   2 +-
 .../FhirDeleteEndpointConfigurationConfigurer.java |  70 ++-
 .../component/fhir/FhirEndpointConfigurer.java     |  91 ++-
 .../fhir/FhirHistoryEndpointConfiguration.java     |   2 +-
 ...FhirHistoryEndpointConfigurationConfigurer.java |  72 ++-
 .../fhir/FhirLoadPageEndpointConfiguration.java    |   2 +-
 ...hirLoadPageEndpointConfigurationConfigurer.java |  66 ++-
 .../fhir/FhirMetaEndpointConfiguration.java        |   2 +-
 .../FhirMetaEndpointConfigurationConfigurer.java   |  68 ++-
 .../fhir/FhirOperationEndpointConfiguration.java   |   2 +-
 ...irOperationEndpointConfigurationConfigurer.java |  82 ++-
 .../fhir/FhirPatchEndpointConfiguration.java       |   2 +-
 .../FhirPatchEndpointConfigurationConfigurer.java  |  70 ++-
 .../fhir/FhirReadEndpointConfiguration.java        |   2 +-
 .../FhirReadEndpointConfigurationConfigurer.java   |  84 ++-
 .../fhir/FhirSearchEndpointConfiguration.java      |   2 +-
 .../FhirSearchEndpointConfigurationConfigurer.java |  62 ++-
 .../fhir/FhirTransactionEndpointConfiguration.java |   2 +-
 ...TransactionEndpointConfigurationConfigurer.java |  66 ++-
 .../fhir/FhirUpdateEndpointConfiguration.java      |   2 +-
 .../FhirUpdateEndpointConfigurationConfigurer.java |  72 ++-
 .../fhir/FhirValidateEndpointConfiguration.java    |   2 +-
 ...hirValidateEndpointConfigurationConfigurer.java |  64 ++-
 .../camel/component/fhir/FhirConfiguration.java    |   2 +-
 .../file/watch/FileWatchComponentConfigurer.java   |  24 +-
 .../file/watch/FileWatchEndpointConfigurer.java    |  35 +-
 .../component/file/FileComponentConfigurer.java    |  16 +-
 .../component/file/FileEndpointConfigurer.java     | 177 +++++-
 .../flatpack/FlatpackComponentConfigurer.java      |  16 +-
 .../flatpack/FlatpackEndpointConfigurer.java       |  61 +-
 .../component/flink/FlinkComponentConfigurer.java  |  20 +-
 .../component/flink/FlinkEndpointConfigurer.java   |  24 +-
 .../component/fop/FopComponentConfigurer.java      |  14 +-
 .../camel/component/fop/FopEndpointConfigurer.java |  19 +-
 .../freemarker/FreemarkerComponentConfigurer.java  |  19 +-
 .../freemarker/FreemarkerEndpointConfigurer.java   |  25 +-
 .../file/remote/FtpComponentConfigurer.java        |  16 +-
 .../file/remote/FtpEndpointConfigurer.java         | 204 ++++++-
 .../file/remote/FtpsComponentConfigurer.java       |  12 +-
 .../file/remote/FtpsEndpointConfigurer.java        | 615 ++++++++++++++++++++-
 .../file/remote/SftpComponentConfigurer.java       |  16 +-
 .../file/remote/SftpEndpointConfigurer.java        | 224 +++++++-
 .../ganglia/GangliaComponentConfigurer.java        |  31 +-
 .../ganglia/GangliaEndpointConfigurer.java         |  31 +-
 .../geocoder/GeoCoderComponentConfigurer.java      |  16 +-
 .../geocoder/GeoCoderEndpointConfigurer.java       |  41 +-
 .../component/git/GitComponentConfigurer.java      |  16 +-
 .../camel/component/git/GitEndpointConfigurer.java |  35 +-
 .../github/GitHubComponentConfigurer.java          |  16 +-
 .../component/github/GitHubEndpointConfigurer.java |  33 +-
 .../GoogleBigQueryComponentConfigurer.java         |  20 +-
 .../bigquery/GoogleBigQueryEndpointConfigurer.java |  19 +-
 .../sql/GoogleBigQuerySQLComponentConfigurer.java  |  18 +-
 .../sql/GoogleBigQuerySQLEndpointConfigurer.java   |  17 +-
 .../calendar/CalendarAclEndpointConfiguration.java |   2 +-
 ...CalendarAclEndpointConfigurationConfigurer.java |  38 +-
 .../CalendarCalendarListEndpointConfiguration.java |   2 +-
 ...alendarListEndpointConfigurationConfigurer.java |  36 +-
 .../CalendarCalendarsEndpointConfiguration.java    |   2 +-
 ...arCalendarsEndpointConfigurationConfigurer.java |  34 +-
 .../CalendarChannelsEndpointConfiguration.java     |   2 +-
 ...darChannelsEndpointConfigurationConfigurer.java |  32 +-
 .../CalendarColorsEndpointConfiguration.java       |   2 +-
 ...endarColorsEndpointConfigurationConfigurer.java |  30 +-
 .../CalendarEventsEndpointConfiguration.java       |   2 +-
 ...endarEventsEndpointConfigurationConfigurer.java |  42 +-
 .../CalendarFreebusyEndpointConfiguration.java     |   2 +-
 ...darFreebusyEndpointConfigurationConfigurer.java |  32 +-
 .../CalendarSettingsEndpointConfiguration.java     |   2 +-
 ...darSettingsEndpointConfigurationConfigurer.java |  34 +-
 .../GoogleCalendarComponentConfigurer.java         |  35 +-
 .../GoogleCalendarConfigurationConfigurer.java     |  30 +-
 .../calendar/GoogleCalendarEndpointConfigurer.java |  68 ++-
 .../GoogleCalendarStreamComponentConfigurer.java   |  37 +-
 .../GoogleCalendarStreamEndpointConfigurer.java    |  68 ++-
 .../calendar/GoogleCalendarConfiguration.java      |   2 +-
 .../drive/DriveAboutEndpointConfiguration.java     |   2 +-
 .../DriveAboutEndpointConfigurationConfigurer.java |  24 +-
 .../drive/DriveAppsEndpointConfiguration.java      |   2 +-
 .../DriveAppsEndpointConfigurationConfigurer.java  |  26 +-
 .../drive/DriveChangesEndpointConfiguration.java   |   2 +-
 ...riveChangesEndpointConfigurationConfigurer.java |  28 +-
 .../drive/DriveChannelsEndpointConfiguration.java  |   2 +-
 ...iveChannelsEndpointConfigurationConfigurer.java |  26 +-
 .../drive/DriveChildrenEndpointConfiguration.java  |   2 +-
 ...iveChildrenEndpointConfigurationConfigurer.java |  30 +-
 .../drive/DriveCommentsEndpointConfiguration.java  |   2 +-
 ...iveCommentsEndpointConfigurationConfigurer.java |  30 +-
 .../drive/DriveFilesEndpointConfiguration.java     |   2 +-
 .../DriveFilesEndpointConfigurationConfigurer.java |  34 +-
 .../drive/DriveParentsEndpointConfiguration.java   |   2 +-
 ...riveParentsEndpointConfigurationConfigurer.java |  30 +-
 .../DrivePermissionsEndpointConfiguration.java     |   2 +-
 ...PermissionsEndpointConfigurationConfigurer.java |  32 +-
 .../DrivePropertiesEndpointConfiguration.java      |   2 +-
 ...ePropertiesEndpointConfigurationConfigurer.java |  30 +-
 .../drive/DriveRealtimeEndpointConfiguration.java  |   2 +-
 ...iveRealtimeEndpointConfigurationConfigurer.java |  28 +-
 .../drive/DriveRepliesEndpointConfiguration.java   |   2 +-
 ...riveRepliesEndpointConfigurationConfigurer.java |  32 +-
 .../drive/DriveRevisionsEndpointConfiguration.java |   2 +-
 ...veRevisionsEndpointConfigurationConfigurer.java |  30 +-
 .../drive/GoogleDriveComponentConfigurer.java      |  30 +-
 .../drive/GoogleDriveConfigurationConfigurer.java  |  24 +-
 .../drive/GoogleDriveEndpointConfigurer.java       |  65 ++-
 .../google/drive/GoogleDriveConfiguration.java     |   2 +-
 .../GmailUsersDraftsEndpointConfiguration.java     |   2 +-
 ...UsersDraftsEndpointConfigurationConfigurer.java |  30 +-
 .../mail/GmailUsersEndpointConfiguration.java      |   2 +-
 .../GmailUsersEndpointConfigurationConfigurer.java |  26 +-
 .../GmailUsersHistoryEndpointConfiguration.java    |   2 +-
 ...sersHistoryEndpointConfigurationConfigurer.java |  24 +-
 .../GmailUsersLabelsEndpointConfiguration.java     |   2 +-
 ...UsersLabelsEndpointConfigurationConfigurer.java |  28 +-
 ...rsMessagesAttachmentsEndpointConfiguration.java |   2 +-
 ...AttachmentsEndpointConfigurationConfigurer.java |  28 +-
 .../GmailUsersMessagesEndpointConfiguration.java   |   2 +-
 ...ersMessagesEndpointConfigurationConfigurer.java |  36 +-
 .../GmailUsersThreadsEndpointConfiguration.java    |   2 +-
 ...sersThreadsEndpointConfigurationConfigurer.java |  28 +-
 .../google/mail/GoogleMailComponentConfigurer.java |  29 +-
 .../mail/GoogleMailConfigurationConfigurer.java    |  22 +-
 .../google/mail/GoogleMailEndpointConfigurer.java  |  62 ++-
 .../GoogleMailStreamComponentConfigurer.java       |  33 +-
 .../stream/GoogleMailStreamEndpointConfigurer.java |  64 ++-
 .../google/mail/GoogleMailConfiguration.java       |   2 +-
 .../pubsub/GooglePubsubComponentConfigurer.java    |  23 +-
 .../pubsub/GooglePubsubEndpointConfigurer.java     |  31 +-
 .../sheets/GoogleSheetsComponentConfigurer.java    |  31 +-
 .../GoogleSheetsConfigurationConfigurer.java       |  24 +-
 .../sheets/GoogleSheetsEndpointConfigurer.java     |  64 ++-
 .../SheetsSpreadsheetsEndpointConfiguration.java   |   2 +-
 ...preadsheetsEndpointConfigurationConfigurer.java |  32 +-
 ...etsSpreadsheetsValuesEndpointConfiguration.java |   2 +-
 ...heetsValuesEndpointConfigurationConfigurer.java |  42 +-
 .../GoogleSheetsStreamComponentConfigurer.java     |  41 +-
 .../GoogleSheetsStreamEndpointConfigurer.java      |  72 ++-
 .../google/sheets/GoogleSheetsConfiguration.java   |   2 +-
 .../component/gora/GoraComponentConfigurer.java    |  16 +-
 .../component/gora/GoraEndpointConfigurer.java     |  52 +-
 .../component/grape/GrapeComponentConfigurer.java  |  16 +-
 .../component/grape/GrapeEndpointConfigurer.java   |  15 +-
 .../graphql/GraphqlComponentConfigurer.java        |  14 +-
 .../graphql/GraphqlEndpointConfigurer.java         |  27 +-
 .../component/grpc/GrpcComponentConfigurer.java    |  16 +-
 .../component/grpc/GrpcEndpointConfigurer.java     |  66 ++-
 .../eventbus/GuavaEventBusComponentConfigurer.java |  20 +-
 .../eventbus/GuavaEventBusEndpointConfigurer.java  |  25 +-
 .../HazelcastAtomicnumberComponentConfigurer.java  |  18 +-
 .../HazelcastAtomicnumberEndpointConfigurer.java   |  21 +-
 .../HazelcastInstanceComponentConfigurer.java      |  18 +-
 .../HazelcastInstanceEndpointConfigurer.java       |  25 +-
 .../list/HazelcastListComponentConfigurer.java     |  20 +-
 .../list/HazelcastListEndpointConfigurer.java      |  27 +-
 .../map/HazelcastMapComponentConfigurer.java       |  20 +-
 .../map/HazelcastMapEndpointConfigurer.java        |  27 +-
 .../HazelcastMultimapComponentConfigurer.java      |  20 +-
 .../HazelcastMultimapEndpointConfigurer.java       |  27 +-
 .../queue/HazelcastQueueComponentConfigurer.java   |  20 +-
 .../queue/HazelcastQueueEndpointConfigurer.java    |  33 +-
 .../HazelcastReplicatedmapComponentConfigurer.java |  20 +-
 .../HazelcastReplicatedmapEndpointConfigurer.java  |  27 +-
 .../HazelcastRingbufferComponentConfigurer.java    |  18 +-
 .../HazelcastRingbufferEndpointConfigurer.java     |  21 +-
 .../seda/HazelcastSedaComponentConfigurer.java     |  20 +-
 .../seda/HazelcastSedaEndpointConfigurer.java      |  36 +-
 .../set/HazelcastSetComponentConfigurer.java       |  20 +-
 .../set/HazelcastSetEndpointConfigurer.java        |  27 +-
 .../topic/HazelcastTopicComponentConfigurer.java   |  20 +-
 .../topic/HazelcastTopicEndpointConfigurer.java    |  28 +-
 .../component/hbase/HBaseComponentConfigurer.java  |  19 +-
 .../component/hbase/HBaseEndpointConfigurer.java   |  42 +-
 .../component/hdfs/HdfsComponentConfigurer.java    |  20 +-
 .../component/hdfs/HdfsEndpointConfigurer.java     |  95 +++-
 .../component/http/HttpComponentConfigurer.java    |  62 ++-
 .../component/http/HttpEndpointConfigurer.java     | 114 +++-
 .../iec60870/client/ClientComponentConfigurer.java |  18 +-
 .../iec60870/client/ClientEndpointConfigurer.java  |  50 +-
 .../iec60870/server/ServerComponentConfigurer.java |  18 +-
 .../iec60870/server/ServerEndpointConfigurer.java  |  52 +-
 .../infinispan/InfinispanComponentConfigurer.java  |  57 +-
 .../infinispan/InfinispanEndpointConfigurer.java   |  61 +-
 .../influxdb/InfluxDbComponentConfigurer.java      |  16 +-
 .../influxdb/InfluxDbEndpointConfigurer.java       |  22 +-
 .../component/iota/IOTAComponentConfigurer.java    |  14 +-
 .../component/iota/IOTAEndpointConfigurer.java     |  23 +-
 .../component/ipfs/IPFSComponentConfigurer.java    |  18 +-
 .../component/ipfs/IPFSEndpointConfigurer.java     |  16 +-
 .../component/irc/IrcComponentConfigurer.java      |  18 +-
 .../camel/component/irc/IrcEndpointConfigurer.java |  59 +-
 .../ironmq/IronMQComponentConfigurer.java          |  16 +-
 .../component/ironmq/IronMQEndpointConfigurer.java |  68 ++-
 .../component/jbpm/JBPMComponentConfigurer.java    |  16 +-
 .../component/jbpm/JBPMEndpointConfigurer.java     |  62 ++-
 .../jcache/JCacheComponentConfigurer.java          |  26 +-
 .../component/jcache/JCacheEndpointConfigurer.java |  56 +-
 .../jclouds/JcloudsComponentConfigurer.java        |  20 +-
 .../jclouds/JcloudsEndpointConfigurer.java         |  38 +-
 .../component/jcr/JcrComponentConfigurer.java      |  16 +-
 .../camel/component/jcr/JcrEndpointConfigurer.java |  37 +-
 .../component/jdbc/JdbcComponentConfigurer.java    |  16 +-
 .../component/jdbc/JdbcEndpointConfigurer.java     |  37 +-
 .../jetty9/JettyHttpComponent9Configurer.java      |  73 ++-
 .../jetty9/JettyHttpEndpoint9Configurer.java       |  73 ++-
 .../raft/JGroupsRaftComponentConfigurer.java       |  24 +-
 .../raft/JGroupsRaftEndpointConfigurer.java        |  23 +-
 .../jgroups/JGroupsComponentConfigurer.java        |  21 +-
 .../jgroups/JGroupsEndpointConfigurer.java         |  25 +-
 .../validator/jing/JingComponentConfigurer.java    |  14 +-
 .../validator/jing/JingEndpointConfigurer.java     |  17 +-
 .../component/jira/JiraComponentConfigurer.java    |  30 +-
 .../component/jira/JiraEndpointConfigurer.java     |  41 +-
 .../component/jms/JmsComponentConfigurer.java      | 196 ++++++-
 .../camel/component/jms/JmsEndpointConfigurer.java | 194 ++++++-
 .../component/jmx/JMXComponentConfigurer.java      |  14 +-
 .../camel/component/jmx/JMXEndpointConfigurer.java |  65 ++-
 .../component/jolt/JoltComponentConfigurer.java    |  17 +-
 .../component/jolt/JoltEndpointConfigurer.java     |  27 +-
 .../component/jooq/JooqComponentConfigurer.java    |  23 +-
 .../component/jooq/JooqEndpointConfigurer.java     |  56 +-
 .../component/jpa/JpaComponentConfigurer.java      |  24 +-
 .../camel/component/jpa/JpaEndpointConfigurer.java |  94 +++-
 .../component/scp/ScpComponentConfigurer.java      |  16 +-
 .../camel/component/scp/ScpEndpointConfigurer.java |  50 +-
 .../component/jslt/JsltComponentConfigurer.java    |  19 +-
 .../component/jslt/JsltEndpointConfigurer.java     |  23 +-
 .../JsonValidatorComponentConfigurer.java          |  14 +-
 .../JsonValidatorEndpointConfigurer.java           |  29 +-
 .../jsonata/JsonataComponentConfigurer.java        |  14 +-
 .../jsonata/JsonataEndpointConfigurer.java         |  23 +-
 .../component/jt400/Jt400ComponentConfigurer.java  |  18 +-
 .../component/jt400/Jt400EndpointConfigurer.java   |  70 ++-
 .../component/kafka/KafkaComponentConfigurer.java  | 199 ++++++-
 .../component/kafka/KafkaEndpointConfigurer.java   | 199 ++++++-
 .../KubernetesConfigMapsComponentConfigurer.java   |  14 +-
 .../KubernetesConfigMapsEndpointConfigurer.java    |  50 +-
 ...bernetesCustomResourcesComponentConfigurer.java |  16 +-
 ...ubernetesCustomResourcesEndpointConfigurer.java |  75 ++-
 .../KubernetesDeploymentsComponentConfigurer.java  |  16 +-
 .../KubernetesDeploymentsEndpointConfigurer.java   |  75 ++-
 .../hpa/KubernetesHPAComponentConfigurer.java      |  16 +-
 .../hpa/KubernetesHPAEndpointConfigurer.java       |  75 ++-
 .../job/KubernetesJobComponentConfigurer.java      |  16 +-
 .../job/KubernetesJobEndpointConfigurer.java       |  75 ++-
 .../KubernetesNamespacesComponentConfigurer.java   |  16 +-
 .../KubernetesNamespacesEndpointConfigurer.java    |  75 ++-
 .../nodes/KubernetesNodesComponentConfigurer.java  |  16 +-
 .../nodes/KubernetesNodesEndpointConfigurer.java   |  75 ++-
 ...rnetesPersistentVolumesComponentConfigurer.java |  14 +-
 ...ernetesPersistentVolumesEndpointConfigurer.java |  50 +-
 ...PersistentVolumesClaimsComponentConfigurer.java |  14 +-
 ...sPersistentVolumesClaimsEndpointConfigurer.java |  50 +-
 .../pods/KubernetesPodsComponentConfigurer.java    |  16 +-
 .../pods/KubernetesPodsEndpointConfigurer.java     |  75 ++-
 ...sReplicationControllersComponentConfigurer.java |  16 +-
 ...esReplicationControllersEndpointConfigurer.java |  75 ++-
 ...ubernetesResourcesQuotaComponentConfigurer.java |  14 +-
 ...KubernetesResourcesQuotaEndpointConfigurer.java |  50 +-
 .../KubernetesSecretsComponentConfigurer.java      |  14 +-
 .../KubernetesSecretsEndpointConfigurer.java       |  50 +-
 ...bernetesServiceAccountsComponentConfigurer.java |  14 +-
 ...ubernetesServiceAccountsEndpointConfigurer.java |  50 +-
 .../KubernetesServicesComponentConfigurer.java     |  16 +-
 .../KubernetesServicesEndpointConfigurer.java      |  75 ++-
 .../OpenshiftBuildConfigsComponentConfigurer.java  |  14 +-
 .../OpenshiftBuildConfigsEndpointConfigurer.java   |  50 +-
 .../builds/OpenshiftBuildsComponentConfigurer.java |  14 +-
 .../builds/OpenshiftBuildsEndpointConfigurer.java  |  50 +-
 .../component/kudu/KuduComponentConfigurer.java    |  14 +-
 .../component/kudu/KuduEndpointConfigurer.java     |  16 +-
 .../language/LanguageComponentConfigurer.java      |  14 +-
 .../language/LanguageEndpointConfigurer.java       |  24 +-
 .../component/ldap/LdapComponentConfigurer.java    |  14 +-
 .../component/ldap/LdapEndpointConfigurer.java     |  21 +-
 .../component/ldif/LdifComponentConfigurer.java    |  14 +-
 .../component/ldif/LdifEndpointConfigurer.java     |  15 +-
 .../component/log/LogComponentConfigurer.java      |  16 +-
 .../camel/component/log/LogEndpointConfigurer.java |  61 +-
 .../service/lra/LRASagaServiceConfigurer.java      |  20 +-
 .../lucene/LuceneComponentConfigurer.java          |  22 +-
 .../component/lucene/LuceneEndpointConfigurer.java |  22 +-
 .../lumberjack/LumberjackComponentConfigurer.java  |  18 +-
 .../lumberjack/LumberjackEndpointConfigurer.java   |  21 +-
 .../component/mail/MailComponentConfigurer.java    |  80 ++-
 .../component/mail/MailEndpointConfigurer.java     | 126 ++++-
 .../master/MasterComponentConfigurer.java          |  17 +-
 .../component/master/MasterEndpointConfigurer.java |  19 +-
 .../metrics/MetricsComponentConfigurer.java        |  16 +-
 .../metrics/MetricsEndpointConfigurer.java         |  21 +-
 .../micrometer/MicrometerComponentConfigurer.java  |  16 +-
 .../micrometer/MicrometerEndpointConfigurer.java   |  19 +-
 .../MicroProfileMetricsComponentConfigurer.java    |  16 +-
 .../MicroProfileMetricsEndpointConfigurer.java     |  32 +-
 .../milo/client/MiloClientComponentConfigurer.java |  57 +-
 .../milo/client/MiloClientEndpointConfigurer.java  |  67 ++-
 .../milo/server/MiloServerComponentConfigurer.java |  47 +-
 .../milo/server/MiloServerEndpointConfigurer.java  |  21 +-
 .../component/mina/MinaComponentConfigurer.java    |  58 +-
 .../component/mina/MinaEndpointConfigurer.java     |  60 +-
 .../component/minio/MinioComponentConfigurer.java  |  93 +++-
 .../component/minio/MinioEndpointConfigurer.java   | 126 ++++-
 .../component/mock/MockComponentConfigurer.java    |  14 +-
 .../component/mock/MockEndpointConfigurer.java     |  35 +-
 .../mongodb/gridfs/GridFsComponentConfigurer.java  |  16 +-
 .../mongodb/gridfs/GridFsEndpointConfigurer.java   |  40 +-
 .../mongodb/MongoDbComponentConfigurer.java        |  18 +-
 .../mongodb/MongoDbEndpointConfigurer.java         |  57 +-
 .../validator/msv/MsvComponentConfigurer.java      |  12 +-
 .../validator/msv/MsvEndpointConfigurer.java       |   2 +-
 .../mustache/MustacheComponentConfigurer.java      |  20 +-
 .../mustache/MustacheEndpointConfigurer.java       |  26 +-
 .../component/mvel/MvelComponentConfigurer.java    |  18 +-
 .../component/mvel/MvelEndpointConfigurer.java     |  22 +-
 .../mybatis/MyBatisBeanComponentConfigurer.java    |  18 +-
 .../mybatis/MyBatisBeanEndpointConfigurer.java     |  21 +-
 .../mybatis/MyBatisComponentConfigurer.java        |  20 +-
 .../mybatis/MyBatisEndpointConfigurer.java         |  69 ++-
 .../nagios/NagiosComponentConfigurer.java          |  20 +-
 .../component/nagios/NagiosEndpointConfigurer.java |  22 +-
 .../component/nats/NatsComponentConfigurer.java    |  20 +-
 .../component/nats/NatsEndpointConfigurer.java     |  59 +-
 .../netty/http/NettyHttpComponentConfigurer.java   |  16 +-
 .../netty/http/NettyHttpEndpointConfigurer.java    |  56 +-
 .../component/netty/NettyComponentConfigurer.java  | 140 ++++-
 .../component/netty/NettyEndpointConfigurer.java   | 138 ++++-
 .../nitrite/NitriteComponentConfigurer.java        |  16 +-
 .../nitrite/NitriteEndpointConfigurer.java         |  28 +-
 .../component/nsq/NsqComponentConfigurer.java      |  19 +-
 .../camel/component/nsq/NsqEndpointConfigurer.java |  43 +-
 .../component/OAIPMHComponentConfigurer.java       |  16 +-
 .../oaipmh/component/OAIPMHEndpointConfigurer.java |  62 ++-
 .../olingo2/Olingo2AppEndpointConfiguration.java   |   2 +-
 .../Olingo2AppEndpointConfigurationConfigurer.java |  52 +-
 .../olingo2/Olingo2ComponentConfigurer.java        |  44 +-
 .../olingo2/Olingo2ConfigurationConfigurer.java    |  38 +-
 .../olingo2/Olingo2EndpointConfigurer.java         |  77 ++-
 .../component/olingo2/Olingo2Configuration.java    |   2 +-
 .../olingo4/Olingo4AppEndpointConfiguration.java   |   2 +-
 .../Olingo4AppEndpointConfigurationConfigurer.java |  48 +-
 .../olingo4/Olingo4ComponentConfigurer.java        |  40 +-
 .../olingo4/Olingo4ConfigurationConfigurer.java    |  34 +-
 .../olingo4/Olingo4EndpointConfigurer.java         |  73 ++-
 .../component/olingo4/Olingo4Configuration.java    |   2 +-
 .../cinder/CinderComponentConfigurer.java          |  14 +-
 .../openstack/cinder/CinderEndpointConfigurer.java |  24 +-
 .../glance/GlanceComponentConfigurer.java          |  14 +-
 .../openstack/glance/GlanceEndpointConfigurer.java |  23 +-
 .../keystone/KeystoneComponentConfigurer.java      |  14 +-
 .../keystone/KeystoneEndpointConfigurer.java       |  22 +-
 .../neutron/NeutronComponentConfigurer.java        |  14 +-
 .../neutron/NeutronEndpointConfigurer.java         |  24 +-
 .../openstack/nova/NovaComponentConfigurer.java    |  14 +-
 .../openstack/nova/NovaEndpointConfigurer.java     |  24 +-
 .../openstack/swift/SwiftComponentConfigurer.java  |  14 +-
 .../openstack/swift/SwiftEndpointConfigurer.java   |  24 +-
 .../OptaPlannerComponentConfigurer.java            |  16 +-
 .../optaplanner/OptaPlannerEndpointConfigurer.java |  30 +-
 .../component/paho/PahoComponentConfigurer.java    |  66 ++-
 .../component/paho/PahoEndpointConfigurer.java     |  70 ++-
 .../component/pdf/PdfComponentConfigurer.java      |  14 +-
 .../camel/component/pdf/PdfEndpointConfigurer.java |  30 +-
 .../slot/PgReplicationSlotComponentConfigurer.java |  14 +-
 .../slot/PgReplicationSlotEndpointConfigurer.java  |  56 +-
 .../pgevent/PgEventComponentConfigurer.java        |  16 +-
 .../pgevent/PgEventEndpointConfigurer.java         |  24 +-
 .../http/PlatformHttpComponentConfigurer.java      |  15 +-
 .../http/PlatformHttpEndpointConfigurer.java       |  31 +-
 .../printer/PrinterComponentConfigurer.java        |  14 +-
 .../printer/PrinterEndpointConfigurer.java         |  31 +-
 .../pubnub/PubNubComponentConfigurer.java          |  16 +-
 .../component/pubnub/PubNubEndpointConfigurer.java |  37 +-
 .../pulsar/PulsarComponentConfigurer.java          |  81 ++-
 .../component/pulsar/PulsarEndpointConfigurer.java |  79 ++-
 .../quartz/QuartzComponentConfigurer.java          |  34 +-
 .../component/quartz/QuartzEndpointConfigurer.java |  47 +-
 .../quickfixj/QuickfixjComponentConfigurer.java    |  24 +-
 .../quickfixj/QuickfixjEndpointConfigurer.java     |  25 +-
 .../rabbitmq/RabbitMQComponentConfigurer.java      | 108 +++-
 .../rabbitmq/RabbitMQEndpointConfigurer.java       | 130 ++++-
 .../ReactiveStreamsComponentConfigurer.java        |  28 +-
 .../streams/ReactiveStreamsEndpointConfigurer.java |  33 +-
 .../component/ref/RefComponentConfigurer.java      |  16 +-
 .../camel/component/ref/RefEndpointConfigurer.java |  21 +-
 .../openapi/RestOpenApiComponentConfigurer.java    |  27 +-
 .../openapi/RestOpenApiEndpointConfigurer.java     |  22 +-
 .../swagger/RestSwaggerComponentConfigurer.java    |  27 +-
 .../swagger/RestSwaggerEndpointConfigurer.java     |  24 +-
 .../component/rest/RestApiComponentConfigurer.java |  14 +-
 .../component/rest/RestApiEndpointConfigurer.java  |  23 +-
 .../component/rest/RestComponentConfigurer.java    |  25 +-
 .../component/rest/RestEndpointConfigurer.java     |  41 +-
 .../resteasy/ResteasyComponentConfigurer.java      |  14 +-
 .../resteasy/ResteasyEndpointConfigurer.java       |  43 +-
 .../RobotFrameworkComponentConfigurer.java         |  95 +++-
 .../RobotFrameworkEndpointConfigurer.java          | 130 ++++-
 .../component/rss/RssComponentConfigurer.java      |  14 +-
 .../camel/component/rss/RssEndpointConfigurer.java |  61 +-
 .../component/saga/SagaComponentConfigurer.java    |  14 +-
 .../component/saga/SagaEndpointConfigurer.java     |  15 +-
 .../salesforce/SalesforceComponentConfigurer.java  | 148 ++++-
 .../salesforce/SalesforceEndpointConfigurer.java   |  97 +++-
 .../netweaver/NetWeaverComponentConfigurer.java    |  14 +-
 .../sap/netweaver/NetWeaverEndpointConfigurer.java |  22 +-
 .../xquery/XQueryComponentConfigurer.java          |  21 +-
 .../component/xquery/XQueryEndpointConfigurer.java |  71 ++-
 .../scheduler/SchedulerComponentConfigurer.java    |  16 +-
 .../scheduler/SchedulerEndpointConfigurer.java     |  50 +-
 .../schematron/SchematronComponentConfigurer.java  |  14 +-
 .../schematron/SchematronEndpointConfigurer.java   |  19 +-
 .../component/seda/SedaComponentConfigurer.java    |  28 +-
 .../component/seda/SedaEndpointConfigurer.java     |  46 +-
 .../service/ServiceComponentConfigurer.java        |  17 +-
 .../service/ServiceEndpointConfigurer.java         |  19 +-
 .../servicenow/ServiceNowComponentConfigurer.java  |  95 +++-
 .../servicenow/ServiceNowEndpointConfigurer.java   |  91 ++-
 .../servlet/ServletComponentConfigurer.java        |  30 +-
 .../servlet/ServletEndpointConfigurer.java         |  55 +-
 .../component/sip/SipComponentConfigurer.java      |  16 +-
 .../camel/component/sip/SipEndpointConfigurer.java |  99 +++-
 .../component/sjms/SjmsComponentConfigurer.java    |  48 +-
 .../component/sjms/SjmsEndpointConfigurer.java     |  82 ++-
 .../sjms/batch/SjmsBatchComponentConfigurer.java   |  22 +-
 .../sjms/batch/SjmsBatchEndpointConfigurer.java    |  57 +-
 .../component/sjms2/Sjms2ComponentConfigurer.java  |   2 +-
 .../component/sjms2/Sjms2EndpointConfigurer.java   |  14 +-
 .../component/slack/SlackComponentConfigurer.java  |  18 +-
 .../component/slack/SlackEndpointConfigurer.java   |  62 ++-
 .../component/smpp/SmppComponentConfigurer.java    |  82 ++-
 .../component/smpp/SmppEndpointConfigurer.java     |  86 ++-
 .../component/snmp/SnmpComponentConfigurer.java    |  16 +-
 .../component/snmp/SnmpEndpointConfigurer.java     |  77 ++-
 .../component/solr/SolrComponentConfigurer.java    |  14 +-
 .../component/solr/SolrEndpointConfigurer.java     |  40 +-
 .../component/SoroushBotComponentConfigurer.java   |  18 +-
 .../component/SoroushBotEndpointConfigurer.java    |  53 +-
 .../component/spark/SparkComponentConfigurer.java  |  17 +-
 .../component/spark/SparkEndpointConfigurer.java   |  23 +-
 .../splunkhec/SplunkHECComponentConfigurer.java    |  14 +-
 .../splunkhec/SplunkHECEndpointConfigurer.java     |  23 +-
 .../splunk/SplunkComponentConfigurer.java          |  18 +-
 .../component/splunk/SplunkEndpointConfigurer.java |  83 ++-
 .../batch/SpringBatchComponentConfigurer.java      |  18 +-
 .../batch/SpringBatchEndpointConfigurer.java       |  21 +-
 .../SpringIntegrationComponentConfigurer.java      |  16 +-
 .../SpringIntegrationEndpointConfigurer.java       |  27 +-
 .../springldap/SpringLdapComponentConfigurer.java  |  14 +-
 .../springldap/SpringLdapEndpointConfigurer.java   |  17 +-
 .../component/redis/RedisComponentConfigurer.java  |  16 +-
 .../component/redis/RedisEndpointConfigurer.java   |  30 +-
 .../ws/SpringWebserviceComponentConfigurer.java    |  18 +-
 .../ws/SpringWebserviceEndpointConfigurer.java     |  54 +-
 .../component/event/EventComponentConfigurer.java  |  16 +-
 .../component/event/EventEndpointConfigurer.java   |  21 +-
 .../component/sql/SqlComponentConfigurer.java      |  20 +-
 .../camel/component/sql/SqlEndpointConfigurer.java |  97 +++-
 .../sql/stored/SqlStoredComponentConfigurer.java   |  16 +-
 .../sql/stored/SqlStoredEndpointConfigurer.java    |  24 +-
 .../component/ssh/SshComponentConfigurer.java      |  40 +-
 .../camel/component/ssh/SshEndpointConfigurer.java |  73 ++-
 .../component/stax/StAXComponentConfigurer.java    |  14 +-
 .../component/stax/StAXEndpointConfigurer.java     |  15 +-
 .../component/stomp/StompComponentConfigurer.java  |  31 +-
 .../component/stomp/StompEndpointConfigurer.java   |  33 +-
 .../stream/StreamComponentConfigurer.java          |  16 +-
 .../component/stream/StreamEndpointConfigurer.java |  48 +-
 .../StringTemplateComponentConfigurer.java         |  18 +-
 .../StringTemplateEndpointConfigurer.java          |  25 +-
 .../component/stub/StubComponentConfigurer.java    |   2 +-
 .../component/stub/StubEndpointConfigurer.java     |   2 +-
 .../telegram/TelegramComponentConfigurer.java      |  23 +-
 .../telegram/TelegramEndpointConfigurer.java       |  68 ++-
 .../thrift/ThriftComponentConfigurer.java          |  18 +-
 .../component/thrift/ThriftEndpointConfigurer.java |  36 +-
 .../component/tika/TikaComponentConfigurer.java    |  14 +-
 .../component/tika/TikaEndpointConfigurer.java     |  23 +-
 .../component/timer/TimerComponentConfigurer.java  |  14 +-
 .../component/timer/TimerEndpointConfigurer.java   |  31 +-
 .../twilio/AccountEndpointConfiguration.java       |   2 +-
 .../AccountEndpointConfigurationConfigurer.java    |  14 +-
 ...sDependentPhoneNumberEndpointConfiguration.java |   2 +-
 ...PhoneNumberEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/AddressEndpointConfiguration.java       |   2 +-
 .../AddressEndpointConfigurationConfigurer.java    |  28 +-
 .../twilio/ApplicationEndpointConfiguration.java   |   2 +-
 ...ApplicationEndpointConfigurationConfigurer.java |  16 +-
 ...blePhoneNumberCountryEndpointConfiguration.java |   2 +-
 ...mberCountryEndpointConfigurationConfigurer.java |  16 +-
 ...oneNumberCountryLocalEndpointConfiguration.java |   2 +-
 ...ountryLocalEndpointConfigurationConfigurer.java |  16 +-
 ...neNumberCountryMobileEndpointConfiguration.java |   2 +-
 ...untryMobileEndpointConfigurationConfigurer.java |  16 +-
 ...NumberCountryTollFreeEndpointConfiguration.java |   2 +-
 ...tryTollFreeEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/CallEndpointConfiguration.java          |   2 +-
 .../CallEndpointConfigurationConfigurer.java       |  26 +-
 .../twilio/CallFeedbackEndpointConfiguration.java  |   2 +-
 ...allFeedbackEndpointConfigurationConfigurer.java |  18 +-
 .../CallFeedbackSummaryEndpointConfiguration.java  |   2 +-
 ...backSummaryEndpointConfigurationConfigurer.java |  20 +-
 .../CallNotificationEndpointConfiguration.java     |   2 +-
 ...otificationEndpointConfigurationConfigurer.java |  18 +-
 .../twilio/CallRecordingEndpointConfiguration.java |   2 +-
 ...llRecordingEndpointConfigurationConfigurer.java |  20 +-
 .../twilio/ConferenceEndpointConfiguration.java    |   2 +-
 .../ConferenceEndpointConfigurationConfigurer.java |  16 +-
 ...ConferenceParticipantEndpointConfiguration.java |   2 +-
 ...ParticipantEndpointConfigurationConfigurer.java |  22 +-
 .../twilio/ConnectAppEndpointConfiguration.java    |   2 +-
 .../ConnectAppEndpointConfigurationConfigurer.java |  16 +-
 .../IncomingPhoneNumberEndpointConfiguration.java  |   2 +-
 ...PhoneNumberEndpointConfigurationConfigurer.java |  20 +-
 ...omingPhoneNumberLocalEndpointConfiguration.java |   2 +-
 ...NumberLocalEndpointConfigurationConfigurer.java |  16 +-
 ...mingPhoneNumberMobileEndpointConfiguration.java |   2 +-
 ...umberMobileEndpointConfigurationConfigurer.java |  16 +-
 ...ngPhoneNumberTollFreeEndpointConfiguration.java |   2 +-
 ...berTollFreeEndpointConfigurationConfigurer.java |  16 +-
 .../component/twilio/KeyEndpointConfiguration.java |   2 +-
 .../twilio/KeyEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/MessageEndpointConfiguration.java       |   2 +-
 .../MessageEndpointConfigurationConfigurer.java    |  26 +-
 .../MessageFeedbackEndpointConfiguration.java      |   2 +-
 ...ageFeedbackEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/MessageMediaEndpointConfiguration.java  |   2 +-
 ...essageMediaEndpointConfigurationConfigurer.java |  18 +-
 .../twilio/NewKeyEndpointConfiguration.java        |   2 +-
 .../NewKeyEndpointConfigurationConfigurer.java     |  14 +-
 .../twilio/NewSigningKeyEndpointConfiguration.java |   2 +-
 ...wSigningKeyEndpointConfigurationConfigurer.java |  14 +-
 .../twilio/NotificationEndpointConfiguration.java  |   2 +-
 ...otificationEndpointConfigurationConfigurer.java |  16 +-
 .../OutgoingCallerIdEndpointConfiguration.java     |   2 +-
 ...ingCallerIdEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/QueueEndpointConfiguration.java         |   2 +-
 .../QueueEndpointConfigurationConfigurer.java      |  18 +-
 .../twilio/QueueMemberEndpointConfiguration.java   |   2 +-
 ...QueueMemberEndpointConfigurationConfigurer.java |  20 +-
 .../RecordingAddOnResultEndpointConfiguration.java |   2 +-
 ...AddOnResultEndpointConfigurationConfigurer.java |  18 +-
 ...ingAddOnResultPayloadEndpointConfiguration.java |   2 +-
 ...sultPayloadEndpointConfigurationConfigurer.java |  20 +-
 .../twilio/RecordingEndpointConfiguration.java     |   2 +-
 .../RecordingEndpointConfigurationConfigurer.java  |  16 +-
 ...ecordingTranscriptionEndpointConfiguration.java |   2 +-
 ...anscriptionEndpointConfigurationConfigurer.java |  18 +-
 .../twilio/ShortCodeEndpointConfiguration.java     |   2 +-
 .../ShortCodeEndpointConfigurationConfigurer.java  |  16 +-
 .../twilio/SigningKeyEndpointConfiguration.java    |   2 +-
 .../SigningKeyEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/SipCredentialEndpointConfiguration.java |   2 +-
 ...pCredentialEndpointConfigurationConfigurer.java |  22 +-
 .../SipCredentialListEndpointConfiguration.java    |   2 +-
 ...dentialListEndpointConfigurationConfigurer.java |  18 +-
 ...CredentialListMappingEndpointConfiguration.java |   2 +-
 ...ListMappingEndpointConfigurationConfigurer.java |  20 +-
 .../twilio/SipDomainEndpointConfiguration.java     |   2 +-
 .../SipDomainEndpointConfigurationConfigurer.java  |  18 +-
 ...essControlListMappingEndpointConfiguration.java |   2 +-
 ...ListMappingEndpointConfigurationConfigurer.java |  20 +-
 ...ipIpAccessControlListEndpointConfiguration.java |   2 +-
 ...ControlListEndpointConfigurationConfigurer.java |  18 +-
 ...sControlListIpAddressEndpointConfiguration.java |   2 +-
 ...stIpAddressEndpointConfigurationConfigurer.java |  22 +-
 .../twilio/TokenEndpointConfiguration.java         |   2 +-
 .../TokenEndpointConfigurationConfigurer.java      |  14 +-
 .../twilio/TranscriptionEndpointConfiguration.java |   2 +-
 ...anscriptionEndpointConfigurationConfigurer.java |  16 +-
 .../twilio/TwilioComponentConfigurer.java          |  23 +-
 .../twilio/TwilioConfigurationConfigurer.java      |  12 +-
 .../component/twilio/TwilioEndpointConfigurer.java |  52 +-
 .../UsageRecordAllTimeEndpointConfiguration.java   |   2 +-
 ...cordAllTimeEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordDailyEndpointConfiguration.java     |   2 +-
 ...RecordDailyEndpointConfigurationConfigurer.java |  14 +-
 .../twilio/UsageRecordEndpointConfiguration.java   |   2 +-
 ...UsageRecordEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordLastMonthEndpointConfiguration.java |   2 +-
 ...rdLastMonthEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordMonthlyEndpointConfiguration.java   |   2 +-
 ...cordMonthlyEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordThisMonthEndpointConfiguration.java |   2 +-
 ...rdThisMonthEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordTodayEndpointConfiguration.java     |   2 +-
 ...RecordTodayEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordYearlyEndpointConfiguration.java    |   2 +-
 ...ecordYearlyEndpointConfigurationConfigurer.java |  14 +-
 .../UsageRecordYesterdayEndpointConfiguration.java |   2 +-
 ...rdYesterdayEndpointConfigurationConfigurer.java |  14 +-
 .../twilio/UsageTriggerEndpointConfiguration.java  |   2 +-
 ...sageTriggerEndpointConfigurationConfigurer.java |  22 +-
 .../ValidationRequestEndpointConfiguration.java    |   2 +-
 ...tionRequestEndpointConfigurationConfigurer.java |  16 +-
 .../component/twilio/TwilioConfiguration.java      |   2 +-
 .../TwitterDirectMessageComponentConfigurer.java   |  32 +-
 .../TwitterDirectMessageEndpointConfigurer.java    |  87 ++-
 .../search/TwitterSearchComponentConfigurer.java   |  32 +-
 .../search/TwitterSearchEndpointConfigurer.java    |  87 ++-
 .../TwitterTimelineComponentConfigurer.java        |  32 +-
 .../TwitterTimelineEndpointConfigurer.java         |  88 ++-
 .../undertow/UndertowComponentConfigurer.java      |  32 +-
 .../undertow/UndertowEndpointConfigurer.java       |  69 ++-
 .../validator/ValidatorComponentConfigurer.java    |  16 +-
 .../validator/ValidatorEndpointConfigurer.java     |  33 +-
 .../velocity/VelocityComponentConfigurer.java      |  20 +-
 .../velocity/VelocityEndpointConfigurer.java       |  26 +-
 .../vertx/http/VertxHttpComponentConfigurer.java   |  43 +-
 .../vertx/http/VertxHttpEndpointConfigurer.java    |  56 +-
 .../VertxWebsocketComponentConfigurer.java         |  22 +-
 .../VertxWebsocketEndpointConfigurer.java          |  34 +-
 .../component/vertx/VertxComponentConfigurer.java  |  24 +-
 .../component/vertx/VertxEndpointConfigurer.java   |  23 +-
 .../camel/component/vm/VmComponentConfigurer.java  |   2 +-
 .../camel/component/vm/VmEndpointConfigurer.java   |   2 +-
 .../weather/WeatherComponentConfigurer.java        |  16 +-
 .../weather/WeatherEndpointConfigurer.java         |  78 ++-
 .../component/web3j/Web3jComponentConfigurer.java  |  72 ++-
 .../component/web3j/Web3jEndpointConfigurer.java   |  76 ++-
 .../webhook/WebhookComponentConfigurer.java        |  25 +-
 .../webhook/WebhookEndpointConfigurer.java         |  29 +-
 .../websocket/jsr356/JSR356EndpointConfigurer.java |  23 +-
 .../jsr356/JSR356WebSocketComponentConfigurer.java |  18 +-
 .../websocket/WebsocketComponentConfigurer.java    |  38 +-
 .../websocket/WebsocketEndpointConfigurer.java     |  49 +-
 .../component/weka/WekaComponentConfigurer.java    |  14 +-
 .../component/weka/WekaEndpointConfigurer.java     |  26 +-
 .../wordpress/WordpressComponentConfigurer.java    |  27 +-
 .../wordpress/WordpressEndpointConfigurer.java     |  31 +-
 .../workday/WorkdayComponentConfigurer.java        |  14 +-
 .../workday/WorkdayEndpointConfigurer.java         |  27 +-
 .../xchange/XChangeComponentConfigurer.java        |  14 +-
 .../xchange/XChangeEndpointConfigurer.java         |  20 +-
 .../camel/component/xj/XJComponentConfigurer.java  |   2 +-
 .../camel/component/xj/XJEndpointConfigurer.java   |  12 +-
 .../xmlsecurity/XmlSignerComponentConfigurer.java  |  67 ++-
 .../xmlsecurity/XmlSignerEndpointConfigurer.java   |  66 ++-
 .../XmlVerifierComponentConfigurer.java            |  48 +-
 .../xmlsecurity/XmlVerifierEndpointConfigurer.java |  47 +-
 .../component/xmpp/XmppComponentConfigurer.java    |  16 +-
 .../component/xmpp/XmppEndpointConfigurer.java     |  43 +-
 .../xslt/saxon/XsltSaxonComponentConfigurer.java   |  16 +-
 .../xslt/saxon/XsltSaxonEndpointConfigurer.java    |  16 +-
 .../component/xslt/XsltComponentConfigurer.java    |  24 +-
 .../component/xslt/XsltEndpointConfigurer.java     |  38 +-
 .../yammer/YammerComponentConfigurer.java          |  35 +-
 .../component/yammer/YammerEndpointConfigurer.java |  67 ++-
 .../zendesk/ZendeskComponentConfigurer.java        |  25 +-
 .../zendesk/ZendeskConfigurationConfigurer.java    |  20 +-
 .../zendesk/ZendeskEndpointConfiguration.java      |   2 +-
 .../ZendeskEndpointConfigurationConfigurer.java    | 246 ++++++++-
 .../zendesk/ZendeskEndpointConfigurer.java         |  59 +-
 .../component/zendesk/ZendeskConfiguration.java    |   2 +-
 .../zookeepermaster/MasterComponentConfigurer.java |  25 +-
 .../zookeepermaster/MasterEndpointConfigurer.java  |  19 +-
 .../zookeeper/ZooKeeperComponentConfigurer.java    |  27 +-
 .../zookeeper/ZooKeeperEndpointConfigurer.java     |  31 +-
 .../main/java/org/apache/camel/spi/Configurer.java |   4 +-
 .../org/apache/camel/spi/ConfigurerStrategy.java   |  16 -
 .../java/org/apache/camel/spi/ErrorHandler.java    |   0
 .../apache/camel/spi/PropertyConfigurerGetter.java |  10 +
 .../camel/impl/engine/AbstractCamelContext.java    |   2 -
 .../camel/impl/ExtendedCamelContextConfigurer.java | 162 +++++-
 .../camel/impl/RestConfigurationConfigurer.java    |  66 ++-
 ...ToleranceConfigurationDefinitionConfigurer.java |  38 +-
 .../HystrixConfigurationDefinitionConfigurer.java  |  74 ++-
 ...ilience4jConfigurationDefinitionConfigurer.java |  50 +-
 .../FaultToleranceConfigurationDefinition.java     |   2 +-
 .../model/HystrixConfigurationDefinition.java      |   2 +-
 .../model/Resilience4jConfigurationDefinition.java |   2 +-
 .../PropertyBindingSupportConfigurerTest.java      |  14 +
 ...ToleranceConfigurationPropertiesConfigurer.java |  36 +-
 ...althCheckConfigurationPropertiesConfigurer.java |  18 +-
 .../HealthConfigurationPropertiesConfigurer.java   |  20 +-
 .../HystrixConfigurationPropertiesConfigurer.java  |  72 ++-
 .../main/LraConfigurationPropertiesConfigurer.java |  18 +-
 .../MainConfigurationPropertiesConfigurer.java     | 178 +++++-
 ...ilience4jConfigurationPropertiesConfigurer.java |  48 +-
 .../RestConfigurationPropertiesConfigurer.java     |  66 ++-
 ...hreadPoolConfigurationPropertiesConfigurer.java |  26 +-
 .../FaultToleranceConfigurationProperties.java     |   2 +-
 .../main/HealthCheckConfigurationProperties.java   |   2 +-
 .../camel/main/HealthConfigurationProperties.java  |   2 +-
 .../camel/main/HystrixConfigurationProperties.java |   2 +-
 .../camel/main/LraConfigurationProperties.java     |   2 +-
 .../camel/main/MainConfigurationProperties.java    |   2 +-
 .../main/Resilience4jConfigurationProperties.java  |   2 +-
 .../camel/main/RestConfigurationProperties.java    |   2 +-
 .../main/ThreadPoolConfigurationProperties.java    |   2 +-
 .../apache/camel/main/MySecondBarConfigurer.java   |  14 +-
 .../apache/camel/main/MySecondFooConfigurer.java   |  12 +-
 .../DefaultExchangeFormatterConfigurer.java        |  44 +-
 .../camel/support/PropertyBindingSupport.java      |   8 +-
 .../support/component/AbstractApiProducer.java     |   5 +-
 .../src/main/resources/api-endpoint-config.vm      |   2 +-
 .../packaging/AbstractGenerateConfigurerMojo.java  |  16 +-
 .../packaging/PropertyConfigurerGenerator.java     |  48 +-
 999 files changed, 30403 insertions(+), 2702 deletions(-)

diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQComponentConfigurer.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQComponentConfigurer.java
index 359cda7..243be89 100644
--- a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQComponentConfigurer.java
+++ b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQComponentConfigurer.java
@@ -120,7 +120,7 @@ public class ActiveMQComponentConfigurer extends JmsComponentConfigurer implemen
         map.put("transactionName", java.lang.String.class);
         map.put("transactionTimeout", int.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(ActiveMQComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ActiveMQComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -145,10 +145,22 @@ public class ActiveMQComponentConfigurer extends JmsComponentConfigurer implemen
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "brokerurl":
+        case "brokerURL": return java.lang.String.class;
+        case "trustallpackages":
+        case "trustAllPackages": return boolean.class;
+        case "usepooledconnection":
+        case "usePooledConnection": return boolean.class;
+        case "usesingleconnection":
+        case "useSingleConnection": return boolean.class;
+        default: return super.getOptionType(name, ignoreCase);
+        }
     }
 
     @Override
diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointConfigurer.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointConfigurer.java
index 7890b9f..889932b 100644
--- a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointConfigurer.java
+++ b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointConfigurer.java
@@ -117,7 +117,7 @@ public class ActiveMQEndpointConfigurer extends JmsEndpointConfigurer implements
         map.put("transactionName", java.lang.String.class);
         map.put("transactionTimeout", int.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(ActiveMQEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ActiveMQEndpointConfigurer::clearBootstrapConfigurers);
     }
 
 }
diff --git a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsComponentConfigurer.java b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsComponentConfigurer.java
index 4d99001..22d105b 100644
--- a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsComponentConfigurer.java
+++ b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsComponentConfigurer.java
@@ -30,7 +30,7 @@ public class WsComponentConfigurer extends AhcComponentConfigurer implements Gen
         map.put("sslContextParameters", org.apache.camel.support.jsse.SSLContextParameters.class);
         map.put("useGlobalSslContextParameters", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(WsComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(WsComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -49,10 +49,16 @@ public class WsComponentConfigurer extends AhcComponentConfigurer implements Gen
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        default: return super.getOptionType(name, ignoreCase);
+        }
     }
 
     @Override
diff --git a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointConfigurer.java b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointConfigurer.java
index 4c90901..bccc68d 100644
--- a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointConfigurer.java
+++ b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointConfigurer.java
@@ -41,7 +41,7 @@ public class WsEndpointConfigurer extends AhcEndpointConfigurer implements Gener
         map.put("clientConfigRealmOptions", java.util.Map.class);
         map.put("sslContextParameters", org.apache.camel.support.jsse.SSLContextParameters.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(WsEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(WsEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -68,10 +68,24 @@ public class WsEndpointConfigurer extends AhcEndpointConfigurer implements Gener
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "sendmessageonerror":
+        case "sendMessageOnError": return boolean.class;
+        case "usestreaming":
+        case "useStreaming": return boolean.class;
+        default: return super.getOptionType(name, ignoreCase);
+        }
     }
 
     @Override
diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcComponentConfigurer.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcComponentConfigurer.java
index e040656..257d4ab 100644
--- a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcComponentConfigurer.java
+++ b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcComponentConfigurer.java
@@ -29,7 +29,7 @@ public class AhcComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("sslContextParameters", org.apache.camel.support.jsse.SSLContextParameters.class);
         map.put("useGlobalSslContextParameters", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AhcComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AhcComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -62,10 +62,30 @@ public class AhcComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "allowjavaserializedobject":
+        case "allowJavaSerializedObject": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "binding": return org.apache.camel.component.ahc.AhcBinding.class;
+        case "client": return org.asynchttpclient.AsyncHttpClient.class;
+        case "clientconfig":
+        case "clientConfig": return org.asynchttpclient.AsyncHttpClientConfig.class;
+        case "headerfilterstrategy":
+        case "headerFilterStrategy": return org.apache.camel.spi.HeaderFilterStrategy.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "sslcontextparameters":
+        case "sslContextParameters": return org.apache.camel.support.jsse.SSLContextParameters.class;
+        case "useglobalsslcontextparameters":
+        case "useGlobalSslContextParameters": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointConfigurer.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointConfigurer.java
index 3aecbb1..8a8a5d7 100644
--- a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointConfigurer.java
+++ b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointConfigurer.java
@@ -36,7 +36,7 @@ public class AhcEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("clientConfigRealmOptions", java.util.Map.class);
         map.put("sslContextParameters", org.apache.camel.support.jsse.SSLContextParameters.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AhcEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AhcEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -81,10 +81,42 @@ public class AhcEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "binding": return org.apache.camel.component.ahc.AhcBinding.class;
+        case "bridgeendpoint":
+        case "bridgeEndpoint": return boolean.class;
+        case "buffersize":
+        case "bufferSize": return int.class;
+        case "clientconfig":
+        case "clientConfig": return org.asynchttpclient.AsyncHttpClientConfig.class;
+        case "clientconfigoptions":
+        case "clientConfigOptions": return java.util.Map.class;
+        case "clientconfigrealmoptions":
+        case "clientConfigRealmOptions": return java.util.Map.class;
+        case "connectionclose":
+        case "connectionClose": return boolean.class;
+        case "cookiehandler":
+        case "cookieHandler": return org.apache.camel.http.base.cookie.CookieHandler.class;
+        case "headerfilterstrategy":
+        case "headerFilterStrategy": return org.apache.camel.spi.HeaderFilterStrategy.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "sslcontextparameters":
+        case "sslContextParameters": return org.apache.camel.support.jsse.SSLContextParameters.class;
+        case "synchronous": return boolean.class;
+        case "throwexceptiononfailure":
+        case "throwExceptionOnFailure": return boolean.class;
+        case "transferexception":
+        case "transferException": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPComponentConfigurer.java b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPComponentConfigurer.java
index 18fce15..4f9f61b 100644
--- a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPComponentConfigurer.java
+++ b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPComponentConfigurer.java
@@ -117,7 +117,7 @@ public class AMQPComponentConfigurer extends JmsComponentConfigurer implements G
         map.put("transactionName", java.lang.String.class);
         map.put("transactionTimeout", int.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AMQPComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AMQPComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -136,10 +136,16 @@ public class AMQPComponentConfigurer extends JmsComponentConfigurer implements G
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "includeamqpannotations":
+        case "includeAmqpAnnotations": return boolean.class;
+        default: return super.getOptionType(name, ignoreCase);
+        }
     }
 
     @Override
diff --git a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointConfigurer.java b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointConfigurer.java
index 162a94c..c75c8b9 100644
--- a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointConfigurer.java
+++ b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointConfigurer.java
@@ -117,7 +117,7 @@ public class AMQPEndpointConfigurer extends JmsEndpointConfigurer implements Gen
         map.put("transactionName", java.lang.String.class);
         map.put("transactionTimeout", int.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AMQPEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AMQPEndpointConfigurer::clearBootstrapConfigurers);
     }
 
 }
diff --git a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsComponentConfigurer.java b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsComponentConfigurer.java
index 38a8073..b8af951 100644
--- a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsComponentConfigurer.java
+++ b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsComponentConfigurer.java
@@ -24,7 +24,7 @@ public class ApnsComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("lazyStartProducer", boolean.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(ApnsComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ApnsComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -49,10 +49,22 @@ public class ApnsComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "apnsservice":
+        case "apnsService": return com.notnoop.apns.ApnsService.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointConfigurer.java b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointConfigurer.java
index 9581ac1..ac38cf1 100644
--- a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointConfigurer.java
+++ b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointConfigurer.java
@@ -44,7 +44,7 @@ public class ApnsEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("timeUnit", java.util.concurrent.TimeUnit.class);
         map.put("useFixedDelay", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(ApnsEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ApnsEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -102,10 +102,55 @@ public class ApnsEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "backofferrorthreshold":
+        case "backoffErrorThreshold": return int.class;
+        case "backoffidlethreshold":
+        case "backoffIdleThreshold": return int.class;
+        case "backoffmultiplier":
+        case "backoffMultiplier": return int.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "delay": return long.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "greedy": return boolean.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "pollstrategy":
+        case "pollStrategy": return org.apache.camel.spi.PollingConsumerPollStrategy.class;
+        case "repeatcount":
+        case "repeatCount": return long.class;
+        case "runlogginglevel":
+        case "runLoggingLevel": return org.apache.camel.LoggingLevel.class;
+        case "scheduledexecutorservice":
+        case "scheduledExecutorService": return java.util.concurrent.ScheduledExecutorService.class;
+        case "scheduler": return java.lang.Object.class;
+        case "schedulerproperties":
+        case "schedulerProperties": return java.util.Map.class;
+        case "sendemptymessagewhenidle":
+        case "sendEmptyMessageWhenIdle": return boolean.class;
+        case "startscheduler":
+        case "startScheduler": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "timeunit":
+        case "timeUnit": return java.util.concurrent.TimeUnit.class;
+        case "tokens": return java.lang.String.class;
+        case "usefixeddelay":
+        case "useFixedDelay": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbComponentConfigurer.java b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbComponentConfigurer.java
index 1bb74fe..ed0e8f0 100644
--- a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbComponentConfigurer.java
+++ b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbComponentConfigurer.java
@@ -32,7 +32,7 @@ public class ArangoDbComponentConfigurer extends PropertyConfigurerSupport imple
         map.put("password", java.lang.String.class);
         map.put("user", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(ArangoDbComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ArangoDbComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.arangodb.ArangoDbConfiguration getOrCreateConfiguration(ArangoDbComponent target) {
@@ -73,10 +73,31 @@ public class ArangoDbComponentConfigurer extends PropertyConfigurerSupport imple
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.arangodb.ArangoDbConfiguration.class;
+        case "documentcollection":
+        case "documentCollection": return java.lang.String.class;
+        case "edgecollection":
+        case "edgeCollection": return java.lang.String.class;
+        case "graph": return java.lang.String.class;
+        case "host": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.arangodb.ArangoDbOperation.class;
+        case "password": return java.lang.String.class;
+        case "port": return int.class;
+        case "user": return java.lang.String.class;
+        case "vertexcollection":
+        case "vertexCollection": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointConfigurer.java b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointConfigurer.java
index 72699eb..2078204 100644
--- a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointConfigurer.java
+++ b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointConfigurer.java
@@ -33,7 +33,7 @@ public class ArangoDbEndpointConfigurer extends PropertyConfigurerSupport implem
         map.put("password", java.lang.String.class);
         map.put("user", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(ArangoDbEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ArangoDbEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -67,10 +67,31 @@ public class ArangoDbEndpointConfigurer extends PropertyConfigurerSupport implem
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "documentcollection":
+        case "documentCollection": return java.lang.String.class;
+        case "edgecollection":
+        case "edgeCollection": return java.lang.String.class;
+        case "graph": return java.lang.String.class;
+        case "host": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.arangodb.ArangoDbOperation.class;
+        case "password": return java.lang.String.class;
+        case "port": return int.class;
+        case "synchronous": return boolean.class;
+        case "user": return java.lang.String.class;
+        case "vertexcollection":
+        case "vertexCollection": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfiguration.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfiguration.java
index f1acbf9..6fbbbbe 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfiguration.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfiguration.java
@@ -18,7 +18,7 @@ import org.apache.camel.spi.UriParams;
            description = "Sends EDI Messages over HTTP",
            apiMethods = {@ApiMethod(methodName = "send", description="Send ediMessage to trading partner", signatures={"org.apache.http.protocol.HttpCoreContext send(String ediMessage, String requestUri, String subject, String from, String as2From, String as2To, org.apache.camel.component.as2.api.AS2MessageStructure as2MessageStructure, org.apache.http.entity.ContentType ediMessageContentType, String ediMessageTransferEncoding, org.apache.camel.component.as2.api.AS2SignatureAlgorithm sig [...]
 @UriParams
-@Configurer
+@Configurer(api = true)
 public final class AS2ClientManagerEndpointConfiguration extends AS2Configuration {
     @UriParam
     @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "send", description="AS2 name of sender")})
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfigurationConfigurer.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfigurationConfigurer.java
index 2103cae..1576148 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfigurationConfigurer.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfigurationConfigurer.java
@@ -50,7 +50,6 @@ public class AS2ClientManagerEndpointConfigurationConfigurer extends org.apache.
         map.put("TargetPortNumber", java.lang.Integer.class);
         map.put("UserAgent", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AS2ClientManagerEndpointConfigurationConfigurer::clearConfigurers);
     }
 
     @Override
@@ -129,8 +128,71 @@ public class AS2ClientManagerEndpointConfigurationConfigurer extends org.apache.
     public static void clearBootstrapConfigurers() {
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "apiname":
+        case "ApiName": return org.apache.camel.component.as2.internal.AS2ApiName.class;
+        case "as2from":
+        case "As2From": return java.lang.String.class;
+        case "as2messagestructure":
+        case "As2MessageStructure": return org.apache.camel.component.as2.api.AS2MessageStructure.class;
+        case "as2to":
+        case "As2To": return java.lang.String.class;
+        case "as2version":
+        case "As2Version": return java.lang.String.class;
+        case "clientfqdn":
+        case "ClientFqdn": return java.lang.String.class;
+        case "compressionalgorithm":
+        case "CompressionAlgorithm": return org.apache.camel.component.as2.api.AS2CompressionAlgorithm.class;
+        case "decryptingprivatekey":
+        case "DecryptingPrivateKey": return java.security.PrivateKey.class;
+        case "dispositionnotificationto":
+        case "DispositionNotificationTo": return java.lang.String.class;
+        case "edimessage":
+        case "EdiMessage": return java.lang.String.class;
+        case "edimessagecontenttype":
+        case "EdiMessageContentType": return org.apache.http.entity.ContentType.class;
+        case "edimessagetransferencoding":
+        case "EdiMessageTransferEncoding": return java.lang.String.class;
+        case "edimessagetype":
+        case "EdiMessageType": return org.apache.http.entity.ContentType.class;
+        case "encryptingalgorithm":
+        case "EncryptingAlgorithm": return org.apache.camel.component.as2.api.AS2EncryptionAlgorithm.class;
+        case "encryptingcertificatechain":
+        case "EncryptingCertificateChain": return java.security.cert.Certificate[].class;
+        case "from":
+        case "From": return java.lang.String.class;
+        case "mdnmessagetemplate":
+        case "MdnMessageTemplate": return java.lang.String.class;
+        case "methodname":
+        case "MethodName": return java.lang.String.class;
+        case "requesturi":
+        case "RequestUri": return java.lang.String.class;
+        case "server":
+        case "Server": return java.lang.String.class;
+        case "serverfqdn":
+        case "ServerFqdn": return java.lang.String.class;
+        case "serverportnumber":
+        case "ServerPortNumber": return java.lang.Integer.class;
+        case "signedreceiptmicalgorithms":
+        case "SignedReceiptMicAlgorithms": return java.lang.String[].class;
+        case "signingalgorithm":
+        case "SigningAlgorithm": return org.apache.camel.component.as2.api.AS2SignatureAlgorithm.class;
+        case "signingcertificatechain":
+        case "SigningCertificateChain": return java.security.cert.Certificate[].class;
+        case "signingprivatekey":
+        case "SigningPrivateKey": return java.security.PrivateKey.class;
+        case "subject":
+        case "Subject": return java.lang.String.class;
+        case "targethostname":
+        case "TargetHostname": return java.lang.String.class;
+        case "targetportnumber":
+        case "TargetPortNumber": return java.lang.Integer.class;
+        case "useragent":
+        case "UserAgent": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ComponentConfigurer.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ComponentConfigurer.java
index 0b8aa6f..a039f6c 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ComponentConfigurer.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ComponentConfigurer.java
@@ -24,7 +24,7 @@ public class AS2ComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("basicPropertyBinding", boolean.class);
         map.put("configuration", org.apache.camel.component.as2.AS2Configuration.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AS2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AS2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -48,10 +48,21 @@ public class AS2ComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configuration": return org.apache.camel.component.as2.AS2Configuration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ConfigurationConfigurer.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ConfigurationConfigurer.java
index 4aea856..b4d3f3a 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ConfigurationConfigurer.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ConfigurationConfigurer.java
@@ -48,7 +48,6 @@ public class AS2ConfigurationConfigurer extends org.apache.camel.support.compone
         map.put("TargetPortNumber", java.lang.Integer.class);
         map.put("UserAgent", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AS2ConfigurationConfigurer::clearConfigurers);
     }
 
     @Override
@@ -123,8 +122,67 @@ public class AS2ConfigurationConfigurer extends org.apache.camel.support.compone
     public static void clearBootstrapConfigurers() {
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "apiname":
+        case "ApiName": return org.apache.camel.component.as2.internal.AS2ApiName.class;
+        case "as2from":
+        case "As2From": return java.lang.String.class;
+        case "as2messagestructure":
+        case "As2MessageStructure": return org.apache.camel.component.as2.api.AS2MessageStructure.class;
+        case "as2to":
+        case "As2To": return java.lang.String.class;
+        case "as2version":
+        case "As2Version": return java.lang.String.class;
+        case "clientfqdn":
+        case "ClientFqdn": return java.lang.String.class;
+        case "compressionalgorithm":
+        case "CompressionAlgorithm": return org.apache.camel.component.as2.api.AS2CompressionAlgorithm.class;
+        case "decryptingprivatekey":
+        case "DecryptingPrivateKey": return java.security.PrivateKey.class;
+        case "dispositionnotificationto":
+        case "DispositionNotificationTo": return java.lang.String.class;
+        case "edimessagetransferencoding":
+        case "EdiMessageTransferEncoding": return java.lang.String.class;
+        case "edimessagetype":
+        case "EdiMessageType": return org.apache.http.entity.ContentType.class;
+        case "encryptingalgorithm":
+        case "EncryptingAlgorithm": return org.apache.camel.component.as2.api.AS2EncryptionAlgorithm.class;
+        case "encryptingcertificatechain":
+        case "EncryptingCertificateChain": return java.security.cert.Certificate[].class;
+        case "from":
+        case "From": return java.lang.String.class;
+        case "mdnmessagetemplate":
+        case "MdnMessageTemplate": return java.lang.String.class;
+        case "methodname":
+        case "MethodName": return java.lang.String.class;
+        case "requesturi":
+        case "RequestUri": return java.lang.String.class;
+        case "server":
+        case "Server": return java.lang.String.class;
+        case "serverfqdn":
+        case "ServerFqdn": return java.lang.String.class;
+        case "serverportnumber":
+        case "ServerPortNumber": return java.lang.Integer.class;
+        case "signedreceiptmicalgorithms":
+        case "SignedReceiptMicAlgorithms": return java.lang.String[].class;
+        case "signingalgorithm":
+        case "SigningAlgorithm": return org.apache.camel.component.as2.api.AS2SignatureAlgorithm.class;
+        case "signingcertificatechain":
+        case "SigningCertificateChain": return java.security.cert.Certificate[].class;
+        case "signingprivatekey":
+        case "SigningPrivateKey": return java.security.PrivateKey.class;
+        case "subject":
+        case "Subject": return java.lang.String.class;
+        case "targethostname":
+        case "TargetHostname": return java.lang.String.class;
+        case "targetportnumber":
+        case "TargetPortNumber": return java.lang.Integer.class;
+        case "useragent":
+        case "UserAgent": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointConfigurer.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointConfigurer.java
index 904584f..2824472 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointConfigurer.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointConfigurer.java
@@ -54,7 +54,7 @@ public class AS2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AS2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AS2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -131,10 +131,74 @@ public class AS2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "as2from":
+        case "as2From": return java.lang.String.class;
+        case "as2messagestructure":
+        case "as2MessageStructure": return org.apache.camel.component.as2.api.AS2MessageStructure.class;
+        case "as2to":
+        case "as2To": return java.lang.String.class;
+        case "as2version":
+        case "as2Version": return java.lang.String.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "clientfqdn":
+        case "clientFqdn": return java.lang.String.class;
+        case "compressionalgorithm":
+        case "compressionAlgorithm": return org.apache.camel.component.as2.api.AS2CompressionAlgorithm.class;
+        case "decryptingprivatekey":
+        case "decryptingPrivateKey": return java.security.PrivateKey.class;
+        case "dispositionnotificationto":
+        case "dispositionNotificationTo": return java.lang.String.class;
+        case "edimessagetransferencoding":
+        case "ediMessageTransferEncoding": return java.lang.String.class;
+        case "edimessagetype":
+        case "ediMessageType": return org.apache.http.entity.ContentType.class;
+        case "encryptingalgorithm":
+        case "encryptingAlgorithm": return org.apache.camel.component.as2.api.AS2EncryptionAlgorithm.class;
+        case "encryptingcertificatechain":
+        case "encryptingCertificateChain": return java.security.cert.Certificate[].class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "from": return java.lang.String.class;
+        case "inbody":
+        case "inBody": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "mdnmessagetemplate":
+        case "mdnMessageTemplate": return java.lang.String.class;
+        case "requesturi":
+        case "requestUri": return java.lang.String.class;
+        case "server": return java.lang.String.class;
+        case "serverfqdn":
+        case "serverFqdn": return java.lang.String.class;
+        case "serverportnumber":
+        case "serverPortNumber": return java.lang.Integer.class;
+        case "signedreceiptmicalgorithms":
+        case "signedReceiptMicAlgorithms": return java.lang.String[].class;
+        case "signingalgorithm":
+        case "signingAlgorithm": return org.apache.camel.component.as2.api.AS2SignatureAlgorithm.class;
+        case "signingcertificatechain":
+        case "signingCertificateChain": return java.security.cert.Certificate[].class;
+        case "signingprivatekey":
+        case "signingPrivateKey": return java.security.PrivateKey.class;
+        case "subject": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "targethostname":
+        case "targetHostname": return java.lang.String.class;
+        case "targetportnumber":
+        case "targetPortNumber": return java.lang.Integer.class;
+        case "useragent":
+        case "userAgent": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfiguration.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfiguration.java
index f14c3b3..851b63c 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfiguration.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfiguration.java
@@ -18,7 +18,7 @@ import org.apache.camel.spi.UriParams;
            description = "Receives EDI Messages over HTTP",
            apiMethods = {@ApiMethod(methodName = "listen", signatures={"void listen(String requestUriPattern, org.apache.http.protocol.HttpRequestHandler handler)"})}, aliases = {})
 @UriParams
-@Configurer
+@Configurer(api = true)
 public final class AS2ServerManagerEndpointConfiguration extends AS2Configuration {
     @UriParam
     @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "listen")})
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfigurationConfigurer.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfigurationConfigurer.java
index 0ff2cdb..0997bfd 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfigurationConfigurer.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfigurationConfigurer.java
@@ -49,7 +49,6 @@ public class AS2ServerManagerEndpointConfigurationConfigurer extends org.apache.
         map.put("TargetPortNumber", java.lang.Integer.class);
         map.put("UserAgent", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AS2ServerManagerEndpointConfigurationConfigurer::clearConfigurers);
     }
 
     @Override
@@ -126,8 +125,69 @@ public class AS2ServerManagerEndpointConfigurationConfigurer extends org.apache.
     public static void clearBootstrapConfigurers() {
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "apiname":
+        case "ApiName": return org.apache.camel.component.as2.internal.AS2ApiName.class;
+        case "as2from":
+        case "As2From": return java.lang.String.class;
+        case "as2messagestructure":
+        case "As2MessageStructure": return org.apache.camel.component.as2.api.AS2MessageStructure.class;
+        case "as2to":
+        case "As2To": return java.lang.String.class;
+        case "as2version":
+        case "As2Version": return java.lang.String.class;
+        case "clientfqdn":
+        case "ClientFqdn": return java.lang.String.class;
+        case "compressionalgorithm":
+        case "CompressionAlgorithm": return org.apache.camel.component.as2.api.AS2CompressionAlgorithm.class;
+        case "decryptingprivatekey":
+        case "DecryptingPrivateKey": return java.security.PrivateKey.class;
+        case "dispositionnotificationto":
+        case "DispositionNotificationTo": return java.lang.String.class;
+        case "edimessagetransferencoding":
+        case "EdiMessageTransferEncoding": return java.lang.String.class;
+        case "edimessagetype":
+        case "EdiMessageType": return org.apache.http.entity.ContentType.class;
+        case "encryptingalgorithm":
+        case "EncryptingAlgorithm": return org.apache.camel.component.as2.api.AS2EncryptionAlgorithm.class;
+        case "encryptingcertificatechain":
+        case "EncryptingCertificateChain": return java.security.cert.Certificate[].class;
+        case "from":
+        case "From": return java.lang.String.class;
+        case "mdnmessagetemplate":
+        case "MdnMessageTemplate": return java.lang.String.class;
+        case "methodname":
+        case "MethodName": return java.lang.String.class;
+        case "requesturi":
+        case "RequestUri": return java.lang.String.class;
+        case "requesturipattern":
+        case "RequestUriPattern": return java.lang.String.class;
+        case "server":
+        case "Server": return java.lang.String.class;
+        case "serverfqdn":
+        case "ServerFqdn": return java.lang.String.class;
+        case "serverportnumber":
+        case "ServerPortNumber": return java.lang.Integer.class;
+        case "signedreceiptmicalgorithms":
+        case "SignedReceiptMicAlgorithms": return java.lang.String[].class;
+        case "signingalgorithm":
+        case "SigningAlgorithm": return org.apache.camel.component.as2.api.AS2SignatureAlgorithm.class;
+        case "signingcertificatechain":
+        case "SigningCertificateChain": return java.security.cert.Certificate[].class;
+        case "signingprivatekey":
+        case "SigningPrivateKey": return java.security.PrivateKey.class;
+        case "subject":
+        case "Subject": return java.lang.String.class;
+        case "targethostname":
+        case "TargetHostname": return java.lang.String.class;
+        case "targetportnumber":
+        case "TargetPortNumber": return java.lang.Integer.class;
+        case "useragent":
+        case "UserAgent": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java
index aa25a8e..ba3c1bd 100644
--- a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java
+++ b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java
@@ -36,7 +36,7 @@ import org.apache.http.entity.ContentType;
  * Component configuration for AS2 component.
  */
 @UriParams
-@Configurer
+@Configurer(api = true)
 public class AS2Configuration {
 
     @UriPath
diff --git a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskComponentConfigurer.java b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskComponentConfigurer.java
index 63ae6d0..0cda512 100644
--- a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskComponentConfigurer.java
+++ b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskComponentConfigurer.java
@@ -23,7 +23,7 @@ public class AsteriskComponentConfigurer extends PropertyConfigurerSupport imple
         map.put("lazyStartProducer", boolean.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AsteriskComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AsteriskComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -46,10 +46,20 @@ public class AsteriskComponentConfigurer extends PropertyConfigurerSupport imple
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointConfigurer.java b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointConfigurer.java
index f680639..5472ee2 100644
--- a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointConfigurer.java
+++ b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointConfigurer.java
@@ -31,7 +31,7 @@ public class AsteriskEndpointConfigurer extends PropertyConfigurerSupport implem
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AsteriskEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AsteriskEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -63,10 +63,29 @@ public class AsteriskEndpointConfigurer extends PropertyConfigurerSupport implem
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "action": return org.apache.camel.component.asterisk.AsteriskAction.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "hostname": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "password": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "username": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapComponentConfigurer.java b/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapComponentConfigurer.java
index a1e71b5..4ec5ba4 100644
--- a/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapComponentConfigurer.java
+++ b/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapComponentConfigurer.java
@@ -23,7 +23,7 @@ public class AtlasMapComponentConfigurer extends PropertyConfigurerSupport imple
         map.put("atlasContextFactory", io.atlasmap.api.AtlasContextFactory.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtlasMapComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtlasMapComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -46,10 +46,20 @@ public class AtlasMapComponentConfigurer extends PropertyConfigurerSupport imple
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atlascontextfactory":
+        case "atlasContextFactory": return io.atlasmap.api.AtlasContextFactory.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapEndpointConfigurer.java b/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapEndpointConfigurer.java
index a9cdbf0..ae2cb9d 100644
--- a/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapEndpointConfigurer.java
+++ b/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapEndpointConfigurer.java
@@ -30,7 +30,7 @@ public class AtlasMapEndpointConfigurer extends PropertyConfigurerSupport implem
         map.put("propertiesFile", java.lang.String.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtlasMapEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtlasMapEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -64,10 +64,31 @@ public class AtlasMapEndpointConfigurer extends PropertyConfigurerSupport implem
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "allowcontextmapall":
+        case "allowContextMapAll": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "contentcache":
+        case "contentCache": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "propertiesfile":
+        case "propertiesFile": return java.lang.String.class;
+        case "sourcemapname":
+        case "sourceMapName": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "targetmapmode":
+        case "targetMapMode": return org.apache.camel.component.atlasmap.AtlasMapEndpoint.TargetMapMode.class;
+        case "targetmapname":
+        case "targetMapName": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosComponentConfigurer.java b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosComponentConfigurer.java
index 4a22a7d..4774b46 100644
--- a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosComponentConfigurer.java
+++ b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosComponentConfigurer.java
@@ -27,7 +27,7 @@ public class AtmosComponentConfigurer extends PropertyConfigurerSupport implemen
         map.put("secretKey", java.lang.String.class);
         map.put("sslValidation", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtmosComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtmosComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -57,10 +57,27 @@ public class AtmosComponentConfigurer extends PropertyConfigurerSupport implemen
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "fulltokenid":
+        case "fullTokenId": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sslvalidation":
+        case "sslValidation": return boolean.class;
+        case "uri": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointConfigurer.java b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointConfigurer.java
index dfd7018..f33f113 100644
--- a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointConfigurer.java
+++ b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointConfigurer.java
@@ -36,7 +36,7 @@ public class AtmosEndpointConfigurer extends PropertyConfigurerSupport implement
         map.put("secretKey", java.lang.String.class);
         map.put("sslValidation", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtmosEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtmosEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -78,10 +78,39 @@ public class AtmosEndpointConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "fulltokenid":
+        case "fullTokenId": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "localpath":
+        case "localPath": return java.lang.String.class;
+        case "newremotepath":
+        case "newRemotePath": return java.lang.String.class;
+        case "query": return java.lang.String.class;
+        case "remotepath":
+        case "remotePath": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sslvalidation":
+        case "sslValidation": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "uri": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurer.java b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurer.java
index 42f1864..d47aedb 100644
--- a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurer.java
+++ b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurer.java
@@ -31,7 +31,7 @@ public class WebsocketComponentConfigurer extends ServletComponentConfigurer imp
         map.put("httpConfiguration", org.apache.camel.http.common.HttpConfiguration.class);
         map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(WebsocketComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(WebsocketComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -50,10 +50,16 @@ public class WebsocketComponentConfigurer extends ServletComponentConfigurer imp
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        default: return super.getOptionType(name, ignoreCase);
+        }
     }
 
     @Override
diff --git a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointConfigurer.java b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointConfigurer.java
index 768c04b..18d7107 100644
--- a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointConfigurer.java
+++ b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointConfigurer.java
@@ -49,7 +49,7 @@ public class WebsocketEndpointConfigurer extends ServletEndpointConfigurer imple
         map.put("mapHttpMessageHeaders", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(WebsocketEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(WebsocketEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -74,10 +74,22 @@ public class WebsocketEndpointConfigurer extends ServletEndpointConfigurer imple
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "bridgeendpoint":
+        case "bridgeEndpoint": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "sendtoall":
+        case "sendToAll": return boolean.class;
+        case "usestreaming":
+        case "useStreaming": return boolean.class;
+        default: return super.getOptionType(name, ignoreCase);
+        }
     }
 
     @Override
diff --git a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomComponentConfigurer.java b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomComponentConfigurer.java
index 2d7284a..dbb9992 100644
--- a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomComponentConfigurer.java
+++ b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomComponentConfigurer.java
@@ -22,7 +22,7 @@ public class AtomComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("bridgeErrorHandler", boolean.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -43,10 +43,18 @@ public class AtomComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointConfigurer.java b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointConfigurer.java
index bf76ddb..d5b3ea4 100644
--- a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointConfigurer.java
+++ b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointConfigurer.java
@@ -50,7 +50,7 @@ public class AtomEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("timeUnit", java.util.concurrent.TimeUnit.class);
         map.put("useFixedDelay", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -118,10 +118,65 @@ public class AtomEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "backofferrorthreshold":
+        case "backoffErrorThreshold": return int.class;
+        case "backoffidlethreshold":
+        case "backoffIdleThreshold": return int.class;
+        case "backoffmultiplier":
+        case "backoffMultiplier": return int.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "delay": return long.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "feedheader":
+        case "feedHeader": return boolean.class;
+        case "filter": return boolean.class;
+        case "greedy": return boolean.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "lastupdate":
+        case "lastUpdate": return java.util.Date.class;
+        case "password": return java.lang.String.class;
+        case "pollstrategy":
+        case "pollStrategy": return org.apache.camel.spi.PollingConsumerPollStrategy.class;
+        case "repeatcount":
+        case "repeatCount": return long.class;
+        case "runlogginglevel":
+        case "runLoggingLevel": return org.apache.camel.LoggingLevel.class;
+        case "scheduledexecutorservice":
+        case "scheduledExecutorService": return java.util.concurrent.ScheduledExecutorService.class;
+        case "scheduler": return java.lang.Object.class;
+        case "schedulerproperties":
+        case "schedulerProperties": return java.util.Map.class;
+        case "sendemptymessagewhenidle":
+        case "sendEmptyMessageWhenIdle": return boolean.class;
+        case "sortentries":
+        case "sortEntries": return boolean.class;
+        case "splitentries":
+        case "splitEntries": return boolean.class;
+        case "startscheduler":
+        case "startScheduler": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "throttleentries":
+        case "throttleEntries": return boolean.class;
+        case "timeunit":
+        case "timeUnit": return java.util.concurrent.TimeUnit.class;
+        case "usefixeddelay":
+        case "useFixedDelay": return boolean.class;
+        case "username": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapComponentConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapComponentConfigurer.java
index f537e1a..b494b27 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapComponentConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapComponentConfigurer.java
@@ -38,7 +38,7 @@ public class AtomixMapComponentConfigurer extends PropertyConfigurerSupport impl
         map.put("resourceConfigs", java.util.Map.class);
         map.put("resourceOptions", java.util.Map.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomixMapComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixMapComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.atomix.client.map.AtomixMapConfiguration getOrCreateConfiguration(AtomixMapComponent target) {
@@ -92,10 +92,44 @@ public class AtomixMapComponentConfigurer extends PropertyConfigurerSupport impl
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atomix": return io.atomix.Atomix.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configuration": return org.apache.camel.component.atomix.client.map.AtomixMapConfiguration.class;
+        case "configurationuri":
+        case "configurationUri": return java.lang.String.class;
+        case "defaultaction":
+        case "defaultAction": return org.apache.camel.component.atomix.client.map.AtomixMap.Action.class;
+        case "defaultresourceconfig":
+        case "defaultResourceConfig": return java.util.Properties.class;
+        case "defaultresourceoptions":
+        case "defaultResourceOptions": return java.util.Properties.class;
+        case "ephemeral": return boolean.class;
+        case "key": return java.lang.Object.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "nodes": return java.util.List.class;
+        case "readconsistency":
+        case "readConsistency": return io.atomix.resource.ReadConsistency.class;
+        case "resourceconfigs":
+        case "resourceConfigs": return java.util.Map.class;
+        case "resourceoptions":
+        case "resourceOptions": return java.util.Map.class;
+        case "resultheader":
+        case "resultHeader": return java.lang.String.class;
+        case "transportclassname":
+        case "transportClassName": return java.lang.String.class;
+        case "ttl": return long.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointConfigurer.java
index 2768ce9..d3d3346 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointConfigurer.java
@@ -41,7 +41,7 @@ public class AtomixMapEndpointConfigurer extends PropertyConfigurerSupport imple
         map.put("resourceOptions", java.util.Map.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomixMapEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixMapEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -92,10 +92,48 @@ public class AtomixMapEndpointConfigurer extends PropertyConfigurerSupport imple
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atomix": return io.atomix.Atomix.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configurationuri":
+        case "configurationUri": return java.lang.String.class;
+        case "defaultaction":
+        case "defaultAction": return org.apache.camel.component.atomix.client.map.AtomixMap.Action.class;
+        case "defaultresourceconfig":
+        case "defaultResourceConfig": return java.util.Properties.class;
+        case "defaultresourceoptions":
+        case "defaultResourceOptions": return java.util.Properties.class;
+        case "ephemeral": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "key": return java.lang.Object.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "nodes": return java.lang.String.class;
+        case "readconsistency":
+        case "readConsistency": return io.atomix.resource.ReadConsistency.class;
+        case "resourceconfigs":
+        case "resourceConfigs": return java.util.Map.class;
+        case "resourceoptions":
+        case "resourceOptions": return java.util.Map.class;
+        case "resultheader":
+        case "resultHeader": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "transportclassname":
+        case "transportClassName": return java.lang.String.class;
+        case "ttl": return long.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingComponentConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingComponentConfigurer.java
index 3ffaa00..21c1010 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingComponentConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingComponentConfigurer.java
@@ -39,7 +39,7 @@ public class AtomixMessagingComponentConfigurer extends PropertyConfigurerSuppor
         map.put("resourceConfigs", java.util.Map.class);
         map.put("resourceOptions", java.util.Map.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomixMessagingComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixMessagingComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.atomix.client.messaging.AtomixMessagingConfiguration getOrCreateConfiguration(AtomixMessagingComponent target) {
@@ -97,10 +97,48 @@ public class AtomixMessagingComponentConfigurer extends PropertyConfigurerSuppor
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atomix": return io.atomix.Atomix.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "broadcasttype":
+        case "broadcastType": return org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType.class;
+        case "channelname":
+        case "channelName": return java.lang.String.class;
+        case "configuration": return org.apache.camel.component.atomix.client.messaging.AtomixMessagingConfiguration.class;
+        case "configurationuri":
+        case "configurationUri": return java.lang.String.class;
+        case "defaultaction":
+        case "defaultAction": return org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action.class;
+        case "defaultresourceconfig":
+        case "defaultResourceConfig": return java.util.Properties.class;
+        case "defaultresourceoptions":
+        case "defaultResourceOptions": return java.util.Properties.class;
+        case "ephemeral": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "membername":
+        case "memberName": return java.lang.String.class;
+        case "nodes": return java.util.List.class;
+        case "readconsistency":
+        case "readConsistency": return io.atomix.resource.ReadConsistency.class;
+        case "resourceconfigs":
+        case "resourceConfigs": return java.util.Map.class;
+        case "resourceoptions":
+        case "resourceOptions": return java.util.Map.class;
+        case "resultheader":
+        case "resultHeader": return java.lang.String.class;
+        case "transportclassname":
+        case "transportClassName": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointConfigurer.java
index eb86826..0985ae0 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointConfigurer.java
@@ -42,7 +42,7 @@ public class AtomixMessagingEndpointConfigurer extends PropertyConfigurerSupport
         map.put("resourceOptions", java.util.Map.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomixMessagingEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixMessagingEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -97,10 +97,52 @@ public class AtomixMessagingEndpointConfigurer extends PropertyConfigurerSupport
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atomix": return io.atomix.Atomix.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "broadcasttype":
+        case "broadcastType": return org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType.class;
+        case "channelname":
+        case "channelName": return java.lang.String.class;
+        case "configurationuri":
+        case "configurationUri": return java.lang.String.class;
+        case "defaultaction":
+        case "defaultAction": return org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action.class;
+        case "defaultresourceconfig":
+        case "defaultResourceConfig": return java.util.Properties.class;
+        case "defaultresourceoptions":
+        case "defaultResourceOptions": return java.util.Properties.class;
+        case "ephemeral": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "membername":
+        case "memberName": return java.lang.String.class;
+        case "nodes": return java.lang.String.class;
+        case "readconsistency":
+        case "readConsistency": return io.atomix.resource.ReadConsistency.class;
+        case "resourceconfigs":
+        case "resourceConfigs": return java.util.Map.class;
+        case "resourceoptions":
+        case "resourceOptions": return java.util.Map.class;
+        case "resultheader":
+        case "resultHeader": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "transportclassname":
+        case "transportClassName": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapComponentConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapComponentConfigurer.java
index acdf7c9..3840bfe 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapComponentConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapComponentConfigurer.java
@@ -37,7 +37,7 @@ public class AtomixMultiMapComponentConfigurer extends PropertyConfigurerSupport
         map.put("resourceConfigs", java.util.Map.class);
         map.put("resourceOptions", java.util.Map.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomixMultiMapComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixMultiMapComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration getOrCreateConfiguration(AtomixMultiMapComponent target) {
@@ -89,10 +89,42 @@ public class AtomixMultiMapComponentConfigurer extends PropertyConfigurerSupport
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atomix": return io.atomix.Atomix.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration.class;
+        case "configurationuri":
+        case "configurationUri": return java.lang.String.class;
+        case "defaultaction":
+        case "defaultAction": return org.apache.camel.component.atomix.client.multimap.AtomixMultiMap.Action.class;
+        case "defaultresourceconfig":
+        case "defaultResourceConfig": return java.util.Properties.class;
+        case "defaultresourceoptions":
+        case "defaultResourceOptions": return java.util.Properties.class;
+        case "ephemeral": return boolean.class;
+        case "key": return java.lang.Object.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "nodes": return java.util.List.class;
+        case "readconsistency":
+        case "readConsistency": return io.atomix.resource.ReadConsistency.class;
+        case "resourceconfigs":
+        case "resourceConfigs": return java.util.Map.class;
+        case "resourceoptions":
+        case "resourceOptions": return java.util.Map.class;
+        case "resultheader":
+        case "resultHeader": return java.lang.String.class;
+        case "transportclassname":
+        case "transportClassName": return java.lang.String.class;
+        case "ttl": return long.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointConfigurer.java
index bb9de3a..901fca1 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointConfigurer.java
@@ -38,7 +38,7 @@ public class AtomixMultiMapEndpointConfigurer extends PropertyConfigurerSupport
         map.put("resourceOptions", java.util.Map.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomixMultiMapEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixMultiMapEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -83,10 +83,42 @@ public class AtomixMultiMapEndpointConfigurer extends PropertyConfigurerSupport
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atomix": return io.atomix.Atomix.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configurationuri":
+        case "configurationUri": return java.lang.String.class;
+        case "defaultaction":
+        case "defaultAction": return org.apache.camel.component.atomix.client.multimap.AtomixMultiMap.Action.class;
+        case "defaultresourceconfig":
+        case "defaultResourceConfig": return java.util.Properties.class;
+        case "defaultresourceoptions":
+        case "defaultResourceOptions": return java.util.Properties.class;
+        case "ephemeral": return boolean.class;
+        case "key": return java.lang.Object.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "nodes": return java.lang.String.class;
+        case "readconsistency":
+        case "readConsistency": return io.atomix.resource.ReadConsistency.class;
+        case "resourceconfigs":
+        case "resourceConfigs": return java.util.Map.class;
+        case "resourceoptions":
+        case "resourceOptions": return java.util.Map.class;
+        case "resultheader":
+        case "resultHeader": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "transportclassname":
+        case "transportClassName": return java.lang.String.class;
+        case "ttl": return long.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueComponentConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueComponentConfigurer.java
index b941186..dca8ec6 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueComponentConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueComponentConfigurer.java
@@ -36,7 +36,7 @@ public class AtomixQueueComponentConfigurer extends PropertyConfigurerSupport im
         map.put("resourceConfigs", java.util.Map.class);
         map.put("resourceOptions", java.util.Map.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomixQueueComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixQueueComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.atomix.client.queue.AtomixQueueConfiguration getOrCreateConfiguration(AtomixQueueComponent target) {
@@ -88,10 +88,42 @@ public class AtomixQueueComponentConfigurer extends PropertyConfigurerSupport im
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atomix": return io.atomix.Atomix.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configuration": return org.apache.camel.component.atomix.client.queue.AtomixQueueConfiguration.class;
+        case "configurationuri":
+        case "configurationUri": return java.lang.String.class;
+        case "defaultaction":
+        case "defaultAction": return org.apache.camel.component.atomix.client.queue.AtomixQueue.Action.class;
+        case "defaultresourceconfig":
+        case "defaultResourceConfig": return java.util.Properties.class;
+        case "defaultresourceoptions":
+        case "defaultResourceOptions": return java.util.Properties.class;
+        case "ephemeral": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "nodes": return java.util.List.class;
+        case "readconsistency":
+        case "readConsistency": return io.atomix.resource.ReadConsistency.class;
+        case "resourceconfigs":
+        case "resourceConfigs": return java.util.Map.class;
+        case "resourceoptions":
+        case "resourceOptions": return java.util.Map.class;
+        case "resultheader":
+        case "resultHeader": return java.lang.String.class;
+        case "transportclassname":
+        case "transportClassName": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointConfigurer.java
index 309c9a8..31f7eb0 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointConfigurer.java
@@ -39,7 +39,7 @@ public class AtomixQueueEndpointConfigurer extends PropertyConfigurerSupport imp
         map.put("resourceOptions", java.util.Map.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomixQueueEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixQueueEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -88,10 +88,46 @@ public class AtomixQueueEndpointConfigurer extends PropertyConfigurerSupport imp
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atomix": return io.atomix.Atomix.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configurationuri":
+        case "configurationUri": return java.lang.String.class;
+        case "defaultaction":
+        case "defaultAction": return org.apache.camel.component.atomix.client.queue.AtomixQueue.Action.class;
+        case "defaultresourceconfig":
+        case "defaultResourceConfig": return java.util.Properties.class;
+        case "defaultresourceoptions":
+        case "defaultResourceOptions": return java.util.Properties.class;
+        case "ephemeral": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "nodes": return java.lang.String.class;
+        case "readconsistency":
+        case "readConsistency": return io.atomix.resource.ReadConsistency.class;
+        case "resourceconfigs":
+        case "resourceConfigs": return java.util.Map.class;
+        case "resourceoptions":
+        case "resourceOptions": return java.util.Map.class;
+        case "resultheader":
+        case "resultHeader": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "transportclassname":
+        case "transportClassName": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetComponentConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetComponentConfigurer.java
index cfbca22..147f26b 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetComponentConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetComponentConfigurer.java
@@ -37,7 +37,7 @@ public class AtomixSetComponentConfigurer extends PropertyConfigurerSupport impl
         map.put("resourceConfigs", java.util.Map.class);
         map.put("resourceOptions", java.util.Map.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomixSetComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixSetComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.atomix.client.set.AtomixSetConfiguration getOrCreateConfiguration(AtomixSetComponent target) {
@@ -90,10 +90,43 @@ public class AtomixSetComponentConfigurer extends PropertyConfigurerSupport impl
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atomix": return io.atomix.Atomix.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configuration": return org.apache.camel.component.atomix.client.set.AtomixSetConfiguration.class;
+        case "configurationuri":
+        case "configurationUri": return java.lang.String.class;
+        case "defaultaction":
+        case "defaultAction": return org.apache.camel.component.atomix.client.set.AtomixSet.Action.class;
+        case "defaultresourceconfig":
+        case "defaultResourceConfig": return java.util.Properties.class;
+        case "defaultresourceoptions":
+        case "defaultResourceOptions": return java.util.Properties.class;
+        case "ephemeral": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "nodes": return java.util.List.class;
+        case "readconsistency":
+        case "readConsistency": return io.atomix.resource.ReadConsistency.class;
+        case "resourceconfigs":
+        case "resourceConfigs": return java.util.Map.class;
+        case "resourceoptions":
+        case "resourceOptions": return java.util.Map.class;
+        case "resultheader":
+        case "resultHeader": return java.lang.String.class;
+        case "transportclassname":
+        case "transportClassName": return java.lang.String.class;
+        case "ttl": return long.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointConfigurer.java
index 275c9d7..66548ad 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointConfigurer.java
@@ -40,7 +40,7 @@ public class AtomixSetEndpointConfigurer extends PropertyConfigurerSupport imple
         map.put("resourceOptions", java.util.Map.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomixSetEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixSetEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -90,10 +90,47 @@ public class AtomixSetEndpointConfigurer extends PropertyConfigurerSupport imple
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atomix": return io.atomix.Atomix.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configurationuri":
+        case "configurationUri": return java.lang.String.class;
+        case "defaultaction":
+        case "defaultAction": return org.apache.camel.component.atomix.client.set.AtomixSet.Action.class;
+        case "defaultresourceconfig":
+        case "defaultResourceConfig": return java.util.Properties.class;
+        case "defaultresourceoptions":
+        case "defaultResourceOptions": return java.util.Properties.class;
+        case "ephemeral": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "nodes": return java.lang.String.class;
+        case "readconsistency":
+        case "readConsistency": return io.atomix.resource.ReadConsistency.class;
+        case "resourceconfigs":
+        case "resourceConfigs": return java.util.Map.class;
+        case "resourceoptions":
+        case "resourceOptions": return java.util.Map.class;
+        case "resultheader":
+        case "resultHeader": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "transportclassname":
+        case "transportClassName": return java.lang.String.class;
+        case "ttl": return long.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueComponentConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueComponentConfigurer.java
index 5b632ee..6b3324f 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueComponentConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueComponentConfigurer.java
@@ -37,7 +37,7 @@ public class AtomixValueComponentConfigurer extends PropertyConfigurerSupport im
         map.put("resourceConfigs", java.util.Map.class);
         map.put("resourceOptions", java.util.Map.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomixValueComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixValueComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.atomix.client.value.AtomixValueConfiguration getOrCreateConfiguration(AtomixValueComponent target) {
@@ -90,10 +90,43 @@ public class AtomixValueComponentConfigurer extends PropertyConfigurerSupport im
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atomix": return io.atomix.Atomix.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configuration": return org.apache.camel.component.atomix.client.value.AtomixValueConfiguration.class;
+        case "configurationuri":
+        case "configurationUri": return java.lang.String.class;
+        case "defaultaction":
+        case "defaultAction": return org.apache.camel.component.atomix.client.value.AtomixValue.Action.class;
+        case "defaultresourceconfig":
+        case "defaultResourceConfig": return java.util.Properties.class;
+        case "defaultresourceoptions":
+        case "defaultResourceOptions": return java.util.Properties.class;
+        case "ephemeral": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "nodes": return java.util.List.class;
+        case "readconsistency":
+        case "readConsistency": return io.atomix.resource.ReadConsistency.class;
+        case "resourceconfigs":
+        case "resourceConfigs": return java.util.Map.class;
+        case "resourceoptions":
+        case "resourceOptions": return java.util.Map.class;
+        case "resultheader":
+        case "resultHeader": return java.lang.String.class;
+        case "transportclassname":
+        case "transportClassName": return java.lang.String.class;
+        case "ttl": return long.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointConfigurer.java
index 5870a5c..12dbda3 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointConfigurer.java
@@ -40,7 +40,7 @@ public class AtomixValueEndpointConfigurer extends PropertyConfigurerSupport imp
         map.put("resourceOptions", java.util.Map.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AtomixValueEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixValueEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -90,10 +90,47 @@ public class AtomixValueEndpointConfigurer extends PropertyConfigurerSupport imp
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "atomix": return io.atomix.Atomix.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configurationuri":
+        case "configurationUri": return java.lang.String.class;
+        case "defaultaction":
+        case "defaultAction": return org.apache.camel.component.atomix.client.value.AtomixValue.Action.class;
+        case "defaultresourceconfig":
+        case "defaultResourceConfig": return java.util.Properties.class;
+        case "defaultresourceoptions":
+        case "defaultResourceOptions": return java.util.Properties.class;
+        case "ephemeral": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "nodes": return java.lang.String.class;
+        case "readconsistency":
+        case "readConsistency": return io.atomix.resource.ReadConsistency.class;
+        case "resourceconfigs":
+        case "resourceConfigs": return java.util.Map.class;
+        case "resourceoptions":
+        case "resourceOptions": return java.util.Map.class;
+        case "resultheader":
+        case "resultHeader": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "transportclassname":
+        case "transportClassName": return java.lang.String.class;
+        case "ttl": return long.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroComponentConfigurer.java b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroComponentConfigurer.java
index ed568c5..090268a 100644
--- a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroComponentConfigurer.java
+++ b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroComponentConfigurer.java
@@ -30,7 +30,7 @@ public class AvroComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("basicPropertyBinding", boolean.class);
         map.put("configuration", org.apache.camel.component.avro.AvroConfiguration.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AvroComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AvroComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.avro.AvroConfiguration getOrCreateConfiguration(AvroComponent target) {
@@ -72,10 +72,32 @@ public class AvroComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configuration": return org.apache.camel.component.avro.AvroConfiguration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "protocol": return org.apache.avro.Protocol.class;
+        case "protocolclassname":
+        case "protocolClassName": return java.lang.String.class;
+        case "protocollocation":
+        case "protocolLocation": return java.lang.String.class;
+        case "reflectionprotocol":
+        case "reflectionProtocol": return boolean.class;
+        case "singleparameter":
+        case "singleParameter": return boolean.class;
+        case "uriauthority":
+        case "uriAuthority": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointConfigurer.java b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointConfigurer.java
index 0fbd0f1..fe72200 100644
--- a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointConfigurer.java
+++ b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointConfigurer.java
@@ -36,7 +36,7 @@ public class AvroEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AvroEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AvroEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -75,10 +75,36 @@ public class AvroEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "protocol": return org.apache.avro.Protocol.class;
+        case "protocolclassname":
+        case "protocolClassName": return java.lang.String.class;
+        case "protocollocation":
+        case "protocolLocation": return java.lang.String.class;
+        case "reflectionprotocol":
+        case "reflectionProtocol": return boolean.class;
+        case "singleparameter":
+        case "singleParameter": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "uriauthority":
+        case "uriAuthority": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwComponentConfigurer.java b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwComponentConfigurer.java
index 616107e..05740bf 100644
--- a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwComponentConfigurer.java
+++ b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwComponentConfigurer.java
@@ -35,7 +35,7 @@ public class CwComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(CwComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(CwComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.cw.CwConfiguration getOrCreateConfiguration(CwComponent target) {
@@ -83,10 +83,38 @@ public class CwComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazoncwclient":
+        case "amazonCwClient": return com.amazonaws.services.cloudwatch.AmazonCloudWatch.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.cw.CwConfiguration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "name": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "timestamp": return java.util.Date.class;
+        case "unit": return java.lang.String.class;
+        case "value": return java.lang.Double.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointConfigurer.java b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointConfigurer.java
index 5564e22..f28f423 100644
--- a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointConfigurer.java
+++ b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointConfigurer.java
@@ -36,7 +36,7 @@ public class CwEndpointConfigurer extends PropertyConfigurerSupport implements G
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(CwEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(CwEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +77,38 @@ public class CwEndpointConfigurer extends PropertyConfigurerSupport implements G
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazoncwclient":
+        case "amazonCwClient": return com.amazonaws.services.cloudwatch.AmazonCloudWatch.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "name": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "timestamp": return java.util.Date.class;
+        case "unit": return java.lang.String.class;
+        case "value": return java.lang.Double.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurer.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurer.java
index 91b5ef8..957c31d 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurer.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurer.java
@@ -37,7 +37,7 @@ public class DdbComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(DdbComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(DdbComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.ddb.DdbConfiguration getOrCreateConfiguration(DdbComponent target) {
@@ -92,10 +92,45 @@ public class DdbComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonddbclient":
+        case "amazonDDBClient": return com.amazonaws.services.dynamodbv2.AmazonDynamoDB.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.ddb.DdbConfiguration.class;
+        case "consistentread":
+        case "consistentRead": return boolean.class;
+        case "keyattributename":
+        case "keyAttributeName": return java.lang.String.class;
+        case "keyattributetype":
+        case "keyAttributeType": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.ddb.DdbOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "readcapacity":
+        case "readCapacity": return java.lang.Long.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "writecapacity":
+        case "writeCapacity": return java.lang.Long.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointConfigurer.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointConfigurer.java
index 0cd223d..802cc38 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointConfigurer.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointConfigurer.java
@@ -38,7 +38,7 @@ public class DdbEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(DdbEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(DdbEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -86,10 +86,45 @@ public class DdbEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonddbclient":
+        case "amazonDDBClient": return com.amazonaws.services.dynamodbv2.AmazonDynamoDB.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "consistentread":
+        case "consistentRead": return boolean.class;
+        case "keyattributename":
+        case "keyAttributeName": return java.lang.String.class;
+        case "keyattributetype":
+        case "keyAttributeType": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.ddb.DdbOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "readcapacity":
+        case "readCapacity": return java.lang.Long.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "writecapacity":
+        case "writeCapacity": return java.lang.Long.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurer.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurer.java
index 9408105..056cc54 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurer.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurer.java
@@ -34,7 +34,7 @@ public class DdbStreamComponentConfigurer extends PropertyConfigurerSupport impl
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(DdbStreamComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(DdbStreamComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.ddbstream.DdbStreamConfiguration getOrCreateConfiguration(DdbStreamComponent target) {
@@ -84,10 +84,40 @@ public class DdbStreamComponentConfigurer extends PropertyConfigurerSupport impl
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazondynamodbstreamsclient":
+        case "amazonDynamoDbStreamsClient": return com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.ddbstream.DdbStreamConfiguration.class;
+        case "iteratortype":
+        case "iteratorType": return com.amazonaws.services.dynamodbv2.model.ShardIteratorType.class;
+        case "maxresultsperrequest":
+        case "maxResultsPerRequest": return int.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sequencenumberprovider":
+        case "sequenceNumberProvider": return org.apache.camel.component.aws.ddbstream.SequenceNumberProvider.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointConfigurer.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointConfigurer.java
index 290ddc4..ea5317a 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointConfigurer.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointConfigurer.java
@@ -53,7 +53,7 @@ public class DdbStreamEndpointConfigurer extends PropertyConfigurerSupport imple
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(DdbStreamEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(DdbStreamEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -129,10 +129,73 @@ public class DdbStreamEndpointConfigurer extends PropertyConfigurerSupport imple
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazondynamodbstreamsclient":
+        case "amazonDynamoDbStreamsClient": return com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "backofferrorthreshold":
+        case "backoffErrorThreshold": return int.class;
+        case "backoffidlethreshold":
+        case "backoffIdleThreshold": return int.class;
+        case "backoffmultiplier":
+        case "backoffMultiplier": return int.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "delay": return long.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "greedy": return boolean.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "iteratortype":
+        case "iteratorType": return com.amazonaws.services.dynamodbv2.model.ShardIteratorType.class;
+        case "maxresultsperrequest":
+        case "maxResultsPerRequest": return int.class;
+        case "pollstrategy":
+        case "pollStrategy": return org.apache.camel.spi.PollingConsumerPollStrategy.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "repeatcount":
+        case "repeatCount": return long.class;
+        case "runlogginglevel":
+        case "runLoggingLevel": return org.apache.camel.LoggingLevel.class;
+        case "scheduledexecutorservice":
+        case "scheduledExecutorService": return java.util.concurrent.ScheduledExecutorService.class;
+        case "scheduler": return java.lang.Object.class;
+        case "schedulerproperties":
+        case "schedulerProperties": return java.util.Map.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sendemptymessagewhenidle":
+        case "sendEmptyMessageWhenIdle": return boolean.class;
+        case "sequencenumberprovider":
+        case "sequenceNumberProvider": return org.apache.camel.component.aws.ddbstream.SequenceNumberProvider.class;
+        case "startscheduler":
+        case "startScheduler": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "timeunit":
+        case "timeUnit": return java.util.concurrent.TimeUnit.class;
+        case "usefixeddelay":
+        case "useFixedDelay": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurer.java b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurer.java
index d7af3c6..c6d0409 100644
--- a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurer.java
+++ b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurer.java
@@ -32,7 +32,7 @@ public class EC2ComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("secretKey", java.lang.String.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(EC2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(EC2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.ec2.EC2Configuration getOrCreateConfiguration(EC2Component target) {
@@ -77,10 +77,35 @@ public class EC2ComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonec2client":
+        case "amazonEc2Client": return com.amazonaws.services.ec2.AmazonEC2.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.ec2.EC2Configuration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.ec2.EC2Operations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointConfigurer.java b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointConfigurer.java
index 0a0c1ff..ad27e60 100644
--- a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointConfigurer.java
+++ b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointConfigurer.java
@@ -33,7 +33,7 @@ public class EC2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(EC2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(EC2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -71,10 +71,35 @@ public class EC2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonec2client":
+        case "amazonEc2Client": return com.amazonaws.services.ec2.AmazonEC2.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.ec2.EC2Operations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurer.java b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurer.java
index 716b602..224e892 100644
--- a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurer.java
+++ b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurer.java
@@ -32,7 +32,7 @@ public class ECSComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("secretKey", java.lang.String.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(ECSComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ECSComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.ecs.ECSConfiguration getOrCreateConfiguration(ECSComponent target) {
@@ -77,10 +77,35 @@ public class ECSComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.ecs.ECSConfiguration.class;
+        case "ecsclient":
+        case "ecsClient": return com.amazonaws.services.ecs.AmazonECS.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.ecs.ECSOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointConfigurer.java b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointConfigurer.java
index 1cf6e7c..6dc4189 100644
--- a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointConfigurer.java
+++ b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointConfigurer.java
@@ -33,7 +33,7 @@ public class ECSEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(ECSEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ECSEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -71,10 +71,35 @@ public class ECSEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "ecsclient":
+        case "ecsClient": return com.amazonaws.services.ecs.AmazonECS.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.ecs.ECSOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSComponentConfigurer.java b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSComponentConfigurer.java
index 6d53469..376ffba 100644
--- a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSComponentConfigurer.java
+++ b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSComponentConfigurer.java
@@ -32,7 +32,7 @@ public class EKSComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("secretKey", java.lang.String.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(EKSComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(EKSComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.eks.EKSConfiguration getOrCreateConfiguration(EKSComponent target) {
@@ -77,10 +77,35 @@ public class EKSComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.eks.EKSConfiguration.class;
+        case "eksclient":
+        case "eksClient": return com.amazonaws.services.eks.AmazonEKS.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.eks.EKSOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointConfigurer.java b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointConfigurer.java
index 1601269..e112e4a 100644
--- a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointConfigurer.java
+++ b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointConfigurer.java
@@ -33,7 +33,7 @@ public class EKSEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(EKSEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(EKSEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -71,10 +71,35 @@ public class EKSEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "eksclient":
+        case "eksClient": return com.amazonaws.services.eks.AmazonEKS.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.eks.EKSOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMComponentConfigurer.java b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMComponentConfigurer.java
index 3780b8e..0efcf70 100644
--- a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMComponentConfigurer.java
+++ b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMComponentConfigurer.java
@@ -32,7 +32,7 @@ public class IAMComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("secretKey", java.lang.String.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(IAMComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(IAMComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.iam.IAMConfiguration getOrCreateConfiguration(IAMComponent target) {
@@ -77,10 +77,35 @@ public class IAMComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.iam.IAMConfiguration.class;
+        case "iamclient":
+        case "iamClient": return com.amazonaws.services.identitymanagement.AmazonIdentityManagement.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.iam.IAMOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointConfigurer.java b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointConfigurer.java
index 73916a5..ab5cb0c 100644
--- a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointConfigurer.java
+++ b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointConfigurer.java
@@ -33,7 +33,7 @@ public class IAMEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(IAMEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(IAMEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -71,10 +71,35 @@ public class IAMEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "iamclient":
+        case "iamClient": return com.amazonaws.services.identitymanagement.AmazonIdentityManagement.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.iam.IAMOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurer.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurer.java
index 3188051..b1f3dc8 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurer.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurer.java
@@ -31,7 +31,7 @@ public class KinesisFirehoseComponentConfigurer extends PropertyConfigurerSuppor
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(KinesisFirehoseComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(KinesisFirehoseComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.firehose.KinesisFirehoseConfiguration getOrCreateConfiguration(KinesisFirehoseComponent target) {
@@ -75,10 +75,34 @@ public class KinesisFirehoseComponentConfigurer extends PropertyConfigurerSuppor
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonkinesisfirehoseclient":
+        case "amazonKinesisFirehoseClient": return com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.firehose.KinesisFirehoseConfiguration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointConfigurer.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointConfigurer.java
index 44f2ce2..4906e59 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointConfigurer.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointConfigurer.java
@@ -32,7 +32,7 @@ public class KinesisFirehoseEndpointConfigurer extends PropertyConfigurerSupport
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(KinesisFirehoseEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(KinesisFirehoseEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -69,10 +69,34 @@ public class KinesisFirehoseEndpointConfigurer extends PropertyConfigurerSupport
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonkinesisfirehoseclient":
+        case "amazonKinesisFirehoseClient": return com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurer.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurer.java
index 5d77ef7..270162a 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurer.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurer.java
@@ -37,7 +37,7 @@ public class KinesisComponentConfigurer extends PropertyConfigurerSupport implem
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(KinesisComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(KinesisComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.kinesis.KinesisConfiguration getOrCreateConfiguration(KinesisComponent target) {
@@ -93,10 +93,46 @@ public class KinesisComponentConfigurer extends PropertyConfigurerSupport implem
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonkinesisclient":
+        case "amazonKinesisClient": return com.amazonaws.services.kinesis.AmazonKinesis.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.kinesis.KinesisConfiguration.class;
+        case "iteratortype":
+        case "iteratorType": return com.amazonaws.services.kinesis.model.ShardIteratorType.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxresultsperrequest":
+        case "maxResultsPerRequest": return int.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sequencenumber":
+        case "sequenceNumber": return java.lang.String.class;
+        case "shardclosed":
+        case "shardClosed": return org.apache.camel.component.aws.kinesis.KinesisShardClosedStrategyEnum.class;
+        case "shardid":
+        case "shardId": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointConfigurer.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointConfigurer.java
index fc6a39e..15d1d5b 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointConfigurer.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointConfigurer.java
@@ -56,7 +56,7 @@ public class KinesisEndpointConfigurer extends PropertyConfigurerSupport impleme
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(KinesisEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(KinesisEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -138,10 +138,79 @@ public class KinesisEndpointConfigurer extends PropertyConfigurerSupport impleme
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonkinesisclient":
+        case "amazonKinesisClient": return com.amazonaws.services.kinesis.AmazonKinesis.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "backofferrorthreshold":
+        case "backoffErrorThreshold": return int.class;
+        case "backoffidlethreshold":
+        case "backoffIdleThreshold": return int.class;
+        case "backoffmultiplier":
+        case "backoffMultiplier": return int.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "delay": return long.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "greedy": return boolean.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "iteratortype":
+        case "iteratorType": return com.amazonaws.services.kinesis.model.ShardIteratorType.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxresultsperrequest":
+        case "maxResultsPerRequest": return int.class;
+        case "pollstrategy":
+        case "pollStrategy": return org.apache.camel.spi.PollingConsumerPollStrategy.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "repeatcount":
+        case "repeatCount": return long.class;
+        case "runlogginglevel":
+        case "runLoggingLevel": return org.apache.camel.LoggingLevel.class;
+        case "scheduledexecutorservice":
+        case "scheduledExecutorService": return java.util.concurrent.ScheduledExecutorService.class;
+        case "scheduler": return java.lang.Object.class;
+        case "schedulerproperties":
+        case "schedulerProperties": return java.util.Map.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sendemptymessagewhenidle":
+        case "sendEmptyMessageWhenIdle": return boolean.class;
+        case "sequencenumber":
+        case "sequenceNumber": return java.lang.String.class;
+        case "shardclosed":
+        case "shardClosed": return org.apache.camel.component.aws.kinesis.KinesisShardClosedStrategyEnum.class;
+        case "shardid":
+        case "shardId": return java.lang.String.class;
+        case "startscheduler":
+        case "startScheduler": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "timeunit":
+        case "timeUnit": return java.util.concurrent.TimeUnit.class;
+        case "usefixeddelay":
+        case "useFixedDelay": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSComponentConfigurer.java b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSComponentConfigurer.java
index 59dc437..03c138b 100644
--- a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSComponentConfigurer.java
+++ b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSComponentConfigurer.java
@@ -32,7 +32,7 @@ public class KMSComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("secretKey", java.lang.String.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(KMSComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(KMSComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.kms.KMSConfiguration getOrCreateConfiguration(KMSComponent target) {
@@ -77,10 +77,35 @@ public class KMSComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.kms.KMSConfiguration.class;
+        case "kmsclient":
+        case "kmsClient": return com.amazonaws.services.kms.AWSKMS.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.kms.KMSOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointConfigurer.java b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointConfigurer.java
index ebd5352..72019fb 100644
--- a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointConfigurer.java
+++ b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointConfigurer.java
@@ -33,7 +33,7 @@ public class KMSEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(KMSEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(KMSEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -71,10 +71,35 @@ public class KMSEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "kmsclient":
+        case "kmsClient": return com.amazonaws.services.kms.AWSKMS.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.kms.KMSOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurer.java b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurer.java
index 7fe11bb..34257d4 100644
--- a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurer.java
+++ b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurer.java
@@ -32,7 +32,7 @@ public class LambdaComponentConfigurer extends PropertyConfigurerSupport impleme
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(LambdaComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(LambdaComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.lambda.LambdaConfiguration getOrCreateConfiguration(LambdaComponent target) {
@@ -77,10 +77,35 @@ public class LambdaComponentConfigurer extends PropertyConfigurerSupport impleme
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "awslambdaclient":
+        case "awsLambdaClient": return com.amazonaws.services.lambda.AWSLambda.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.lambda.LambdaConfiguration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.lambda.LambdaOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointConfigurer.java b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointConfigurer.java
index 9d7164e..3f51ae6 100644
--- a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointConfigurer.java
+++ b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointConfigurer.java
@@ -33,7 +33,7 @@ public class LambdaEndpointConfigurer extends PropertyConfigurerSupport implemen
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(LambdaEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(LambdaEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -71,10 +71,35 @@ public class LambdaEndpointConfigurer extends PropertyConfigurerSupport implemen
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "awslambdaclient":
+        case "awsLambdaClient": return com.amazonaws.services.lambda.AWSLambda.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.lambda.LambdaOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQComponentConfigurer.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQComponentConfigurer.java
index fe32a59..bfc7b07 100644
--- a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQComponentConfigurer.java
+++ b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQComponentConfigurer.java
@@ -32,7 +32,7 @@ public class MQComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("secretKey", java.lang.String.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(MQComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(MQComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.mq.MQConfiguration getOrCreateConfiguration(MQComponent target) {
@@ -77,10 +77,35 @@ public class MQComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonmqclient":
+        case "amazonMqClient": return com.amazonaws.services.mq.AmazonMQ.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.mq.MQConfiguration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.mq.MQOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointConfigurer.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointConfigurer.java
index bc18cd5..0398d0d 100644
--- a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointConfigurer.java
+++ b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointConfigurer.java
@@ -33,7 +33,7 @@ public class MQEndpointConfigurer extends PropertyConfigurerSupport implements G
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(MQEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(MQEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -71,10 +71,35 @@ public class MQEndpointConfigurer extends PropertyConfigurerSupport implements G
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonmqclient":
+        case "amazonMqClient": return com.amazonaws.services.mq.AmazonMQ.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.mq.MQOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKComponentConfigurer.java b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKComponentConfigurer.java
index abbe0df..4da6d00 100644
--- a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKComponentConfigurer.java
+++ b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKComponentConfigurer.java
@@ -32,7 +32,7 @@ public class MSKComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("secretKey", java.lang.String.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(MSKComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(MSKComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.msk.MSKConfiguration getOrCreateConfiguration(MSKComponent target) {
@@ -77,10 +77,35 @@ public class MSKComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.msk.MSKConfiguration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "mskclient":
+        case "mskClient": return com.amazonaws.services.kafka.AWSKafka.class;
+        case "operation": return org.apache.camel.component.aws.msk.MSKOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointConfigurer.java b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointConfigurer.java
index 3825eb8..f93071f 100644
--- a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointConfigurer.java
+++ b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointConfigurer.java
@@ -33,7 +33,7 @@ public class MSKEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(MSKEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(MSKEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -71,10 +71,35 @@ public class MSKEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "mskclient":
+        case "mskClient": return com.amazonaws.services.kafka.AWSKafka.class;
+        case "operation": return org.apache.camel.component.aws.msk.MSKOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3ComponentConfigurer.java b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3ComponentConfigurer.java
index e1c0acf..61e55d6 100644
--- a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3ComponentConfigurer.java
+++ b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3ComponentConfigurer.java
@@ -59,7 +59,7 @@ public class S3ComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(S3ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(S3ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.s3.S3Configuration getOrCreateConfiguration(S3Component target) {
@@ -155,10 +155,86 @@ public class S3ComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "acceleratemodeenabled":
+        case "accelerateModeEnabled": return boolean.class;
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazons3client":
+        case "amazonS3Client": return com.amazonaws.services.s3.AmazonS3.class;
+        case "autocreatebucket":
+        case "autoCreateBucket": return boolean.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "autoclosebody":
+        case "autocloseBody": return boolean.class;
+        case "awskmskeyid":
+        case "awsKMSKeyId": return java.lang.String.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "chunkedencodingdisabled":
+        case "chunkedEncodingDisabled": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.s3.S3Configuration.class;
+        case "deleteafterread":
+        case "deleteAfterRead": return boolean.class;
+        case "deleteafterwrite":
+        case "deleteAfterWrite": return boolean.class;
+        case "delimiter": return java.lang.String.class;
+        case "dualstackenabled":
+        case "dualstackEnabled": return boolean.class;
+        case "encryptionmaterials":
+        case "encryptionMaterials": return com.amazonaws.services.s3.model.EncryptionMaterials.class;
+        case "endpointconfiguration":
+        case "endpointConfiguration": return com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration.class;
+        case "filename":
+        case "fileName": return java.lang.String.class;
+        case "forceglobalbucketaccessenabled":
+        case "forceGlobalBucketAccessEnabled": return boolean.class;
+        case "includebody":
+        case "includeBody": return boolean.class;
+        case "keyname":
+        case "keyName": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "multipartupload":
+        case "multiPartUpload": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.s3.S3Operations.class;
+        case "partsize":
+        case "partSize": return long.class;
+        case "pathstyleaccess":
+        case "pathStyleAccess": return boolean.class;
+        case "payloadsigningenabled":
+        case "payloadSigningEnabled": return boolean.class;
+        case "policy": return java.lang.String.class;
+        case "prefix": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "serversideencryption":
+        case "serverSideEncryption": return java.lang.String.class;
+        case "storageclass":
+        case "storageClass": return java.lang.String.class;
+        case "useawskms":
+        case "useAwsKMS": return boolean.class;
+        case "useencryption":
+        case "useEncryption": return boolean.class;
+        case "useiamcredentials":
+        case "useIAMCredentials": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointConfigurer.java b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointConfigurer.java
index 0088023..a125a8a 100644
--- a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointConfigurer.java
+++ b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointConfigurer.java
@@ -80,7 +80,7 @@ public class S3EndpointConfigurer extends PropertyConfigurerSupport implements G
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(S3EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(S3EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -206,10 +206,123 @@ public class S3EndpointConfigurer extends PropertyConfigurerSupport implements G
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "acceleratemodeenabled":
+        case "accelerateModeEnabled": return boolean.class;
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazons3client":
+        case "amazonS3Client": return com.amazonaws.services.s3.AmazonS3.class;
+        case "autocreatebucket":
+        case "autoCreateBucket": return boolean.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "autoclosebody":
+        case "autocloseBody": return boolean.class;
+        case "awskmskeyid":
+        case "awsKMSKeyId": return java.lang.String.class;
+        case "backofferrorthreshold":
+        case "backoffErrorThreshold": return int.class;
+        case "backoffidlethreshold":
+        case "backoffIdleThreshold": return int.class;
+        case "backoffmultiplier":
+        case "backoffMultiplier": return int.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "chunkedencodingdisabled":
+        case "chunkedEncodingDisabled": return boolean.class;
+        case "delay": return long.class;
+        case "deleteafterread":
+        case "deleteAfterRead": return boolean.class;
+        case "deleteafterwrite":
+        case "deleteAfterWrite": return boolean.class;
+        case "delimiter": return java.lang.String.class;
+        case "dualstackenabled":
+        case "dualstackEnabled": return boolean.class;
+        case "encryptionmaterials":
+        case "encryptionMaterials": return com.amazonaws.services.s3.model.EncryptionMaterials.class;
+        case "endpointconfiguration":
+        case "endpointConfiguration": return com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "filename":
+        case "fileName": return java.lang.String.class;
+        case "forceglobalbucketaccessenabled":
+        case "forceGlobalBucketAccessEnabled": return boolean.class;
+        case "greedy": return boolean.class;
+        case "includebody":
+        case "includeBody": return boolean.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "keyname":
+        case "keyName": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxconnections":
+        case "maxConnections": return int.class;
+        case "maxmessagesperpoll":
+        case "maxMessagesPerPoll": return int.class;
+        case "multipartupload":
+        case "multiPartUpload": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.s3.S3Operations.class;
+        case "partsize":
+        case "partSize": return long.class;
+        case "pathstyleaccess":
+        case "pathStyleAccess": return boolean.class;
+        case "payloadsigningenabled":
+        case "payloadSigningEnabled": return boolean.class;
+        case "policy": return java.lang.String.class;
+        case "pollstrategy":
+        case "pollStrategy": return org.apache.camel.spi.PollingConsumerPollStrategy.class;
+        case "prefix": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "repeatcount":
+        case "repeatCount": return long.class;
+        case "runlogginglevel":
+        case "runLoggingLevel": return org.apache.camel.LoggingLevel.class;
+        case "scheduledexecutorservice":
+        case "scheduledExecutorService": return java.util.concurrent.ScheduledExecutorService.class;
+        case "scheduler": return java.lang.Object.class;
+        case "schedulerproperties":
+        case "schedulerProperties": return java.util.Map.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sendemptymessagewhenidle":
+        case "sendEmptyMessageWhenIdle": return boolean.class;
+        case "serversideencryption":
+        case "serverSideEncryption": return java.lang.String.class;
+        case "startscheduler":
+        case "startScheduler": return boolean.class;
+        case "storageclass":
+        case "storageClass": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "timeunit":
+        case "timeUnit": return java.util.concurrent.TimeUnit.class;
+        case "useawskms":
+        case "useAwsKMS": return boolean.class;
+        case "useencryption":
+        case "useEncryption": return boolean.class;
+        case "usefixeddelay":
+        case "useFixedDelay": return boolean.class;
+        case "useiamcredentials":
+        case "useIAMCredentials": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurer.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurer.java
index f02e3a1..94ecf85 100644
--- a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurer.java
+++ b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurer.java
@@ -22,7 +22,7 @@ public class SdbComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("lazyStartProducer", boolean.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(SdbComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(SdbComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -43,10 +43,18 @@ public class SdbComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointConfigurer.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointConfigurer.java
index 633dac81..0cfa357 100644
--- a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointConfigurer.java
+++ b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointConfigurer.java
@@ -34,7 +34,7 @@ public class SdbEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(SdbEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(SdbEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -74,10 +74,37 @@ public class SdbEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonsdbclient":
+        case "amazonSDBClient": return com.amazonaws.services.simpledb.AmazonSimpleDB.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "consistentread":
+        case "consistentRead": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxnumberofdomains":
+        case "maxNumberOfDomains": return java.lang.Integer.class;
+        case "operation": return org.apache.camel.component.aws.sdb.SdbOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesComponentConfigurer.java b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesComponentConfigurer.java
index 979f1a7..a571872 100644
--- a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesComponentConfigurer.java
+++ b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesComponentConfigurer.java
@@ -35,7 +35,7 @@ public class SesComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(SesComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(SesComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.ses.SesConfiguration getOrCreateConfiguration(SesComponent target) {
@@ -85,10 +85,40 @@ public class SesComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonsesclient":
+        case "amazonSESClient": return com.amazonaws.services.simpleemail.AmazonSimpleEmailService.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.ses.SesConfiguration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "replytoaddresses":
+        case "replyToAddresses": return java.util.List.class;
+        case "returnpath":
+        case "returnPath": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "subject": return java.lang.String.class;
+        case "to": return java.util.List.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointConfigurer.java b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointConfigurer.java
index a17f0af..d88c4ae 100644
--- a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointConfigurer.java
+++ b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointConfigurer.java
@@ -36,7 +36,7 @@ public class SesEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(SesEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(SesEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -79,10 +79,40 @@ public class SesEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonsesclient":
+        case "amazonSESClient": return com.amazonaws.services.simpleemail.AmazonSimpleEmailService.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "replytoaddresses":
+        case "replyToAddresses": return java.util.List.class;
+        case "returnpath":
+        case "returnPath": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "subject": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "to": return java.util.List.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsComponentConfigurer.java b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsComponentConfigurer.java
index 5e7158b..09f8456 100644
--- a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsComponentConfigurer.java
+++ b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsComponentConfigurer.java
@@ -40,7 +40,7 @@ public class SnsComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(SnsComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(SnsComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.sns.SnsConfiguration getOrCreateConfiguration(SnsComponent target) {
@@ -100,10 +100,50 @@ public class SnsComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonsnsclient":
+        case "amazonSNSClient": return com.amazonaws.services.sns.AmazonSNS.class;
+        case "amazonsqsclient":
+        case "amazonSQSClient": return com.amazonaws.services.sqs.AmazonSQS.class;
+        case "autocreatetopic":
+        case "autoCreateTopic": return boolean.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.sns.SnsConfiguration.class;
+        case "kmsmasterkeyid":
+        case "kmsMasterKeyId": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "messagestructure":
+        case "messageStructure": return java.lang.String.class;
+        case "policy": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "queueurl":
+        case "queueUrl": return java.lang.String.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "serversideencryptionenabled":
+        case "serverSideEncryptionEnabled": return boolean.class;
+        case "subject": return java.lang.String.class;
+        case "subscribesnstosqs":
+        case "subscribeSNStoSQS": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointConfigurer.java b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointConfigurer.java
index 94baf6f..340bdda 100644
--- a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointConfigurer.java
+++ b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointConfigurer.java
@@ -42,7 +42,7 @@ public class SnsEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(SnsEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(SnsEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -97,10 +97,52 @@ public class SnsEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonsnsclient":
+        case "amazonSNSClient": return com.amazonaws.services.sns.AmazonSNS.class;
+        case "amazonsqsclient":
+        case "amazonSQSClient": return com.amazonaws.services.sqs.AmazonSQS.class;
+        case "autocreatetopic":
+        case "autoCreateTopic": return boolean.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "headerfilterstrategy":
+        case "headerFilterStrategy": return org.apache.camel.spi.HeaderFilterStrategy.class;
+        case "kmsmasterkeyid":
+        case "kmsMasterKeyId": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "messagestructure":
+        case "messageStructure": return java.lang.String.class;
+        case "policy": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "queueurl":
+        case "queueUrl": return java.lang.String.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "serversideencryptionenabled":
+        case "serverSideEncryptionEnabled": return boolean.class;
+        case "subject": return java.lang.String.class;
+        case "subscribesnstosqs":
+        case "subscribeSNStoSQS": return boolean.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurer.java b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurer.java
index 9fc0ded..9c6da45 100644
--- a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurer.java
+++ b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurer.java
@@ -59,7 +59,7 @@ public class SqsComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(SqsComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(SqsComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.sqs.SqsConfiguration getOrCreateConfiguration(SqsComponent target) {
@@ -156,10 +156,87 @@ public class SqsComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonawshost":
+        case "amazonAWSHost": return java.lang.String.class;
+        case "amazonsqsclient":
+        case "amazonSQSClient": return com.amazonaws.services.sqs.AmazonSQS.class;
+        case "attributenames":
+        case "attributeNames": return java.lang.String.class;
+        case "autocreatequeue":
+        case "autoCreateQueue": return boolean.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "concurrentconsumers":
+        case "concurrentConsumers": return int.class;
+        case "configuration": return org.apache.camel.component.aws.sqs.SqsConfiguration.class;
+        case "defaultvisibilitytimeout":
+        case "defaultVisibilityTimeout": return java.lang.Integer.class;
+        case "delayqueue":
+        case "delayQueue": return boolean.class;
+        case "delayseconds":
+        case "delaySeconds": return java.lang.Integer.class;
+        case "deleteafterread":
+        case "deleteAfterRead": return boolean.class;
+        case "deleteiffiltered":
+        case "deleteIfFiltered": return boolean.class;
+        case "extendmessagevisibility":
+        case "extendMessageVisibility": return boolean.class;
+        case "kmsdatakeyreuseperiodseconds":
+        case "kmsDataKeyReusePeriodSeconds": return java.lang.Integer.class;
+        case "kmsmasterkeyid":
+        case "kmsMasterKeyId": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maximummessagesize":
+        case "maximumMessageSize": return java.lang.Integer.class;
+        case "messageattributenames":
+        case "messageAttributeNames": return java.lang.String.class;
+        case "messagededuplicationidstrategy":
+        case "messageDeduplicationIdStrategy": return java.lang.String.class;
+        case "messagegroupidstrategy":
+        case "messageGroupIdStrategy": return java.lang.String.class;
+        case "messageretentionperiod":
+        case "messageRetentionPeriod": return java.lang.Integer.class;
+        case "operation": return org.apache.camel.component.aws.sqs.SqsOperations.class;
+        case "policy": return java.lang.String.class;
+        case "protocol": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "queueownerawsaccountid":
+        case "queueOwnerAWSAccountId": return java.lang.String.class;
+        case "queueurl":
+        case "queueUrl": return java.lang.String.class;
+        case "receivemessagewaittimeseconds":
+        case "receiveMessageWaitTimeSeconds": return java.lang.Integer.class;
+        case "redrivepolicy":
+        case "redrivePolicy": return java.lang.String.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "serversideencryptionenabled":
+        case "serverSideEncryptionEnabled": return boolean.class;
+        case "visibilitytimeout":
+        case "visibilityTimeout": return java.lang.Integer.class;
+        case "waittimeseconds":
+        case "waitTimeSeconds": return java.lang.Integer.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointConfigurer.java b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointConfigurer.java
index b427a19..a40e45b 100644
--- a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointConfigurer.java
+++ b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointConfigurer.java
@@ -80,7 +80,7 @@ public class SqsEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(SqsEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(SqsEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -207,10 +207,124 @@ public class SqsEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonawshost":
+        case "amazonAWSHost": return java.lang.String.class;
+        case "amazonsqsclient":
+        case "amazonSQSClient": return com.amazonaws.services.sqs.AmazonSQS.class;
+        case "attributenames":
+        case "attributeNames": return java.lang.String.class;
+        case "autocreatequeue":
+        case "autoCreateQueue": return boolean.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "backofferrorthreshold":
+        case "backoffErrorThreshold": return int.class;
+        case "backoffidlethreshold":
+        case "backoffIdleThreshold": return int.class;
+        case "backoffmultiplier":
+        case "backoffMultiplier": return int.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "concurrentconsumers":
+        case "concurrentConsumers": return int.class;
+        case "defaultvisibilitytimeout":
+        case "defaultVisibilityTimeout": return java.lang.Integer.class;
+        case "delay": return long.class;
+        case "delayqueue":
+        case "delayQueue": return boolean.class;
+        case "delayseconds":
+        case "delaySeconds": return java.lang.Integer.class;
+        case "deleteafterread":
+        case "deleteAfterRead": return boolean.class;
+        case "deleteiffiltered":
+        case "deleteIfFiltered": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "extendmessagevisibility":
+        case "extendMessageVisibility": return boolean.class;
+        case "greedy": return boolean.class;
+        case "headerfilterstrategy":
+        case "headerFilterStrategy": return org.apache.camel.spi.HeaderFilterStrategy.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "kmsdatakeyreuseperiodseconds":
+        case "kmsDataKeyReusePeriodSeconds": return java.lang.Integer.class;
+        case "kmsmasterkeyid":
+        case "kmsMasterKeyId": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxmessagesperpoll":
+        case "maxMessagesPerPoll": return int.class;
+        case "maximummessagesize":
+        case "maximumMessageSize": return java.lang.Integer.class;
+        case "messageattributenames":
+        case "messageAttributeNames": return java.lang.String.class;
+        case "messagededuplicationidstrategy":
+        case "messageDeduplicationIdStrategy": return java.lang.String.class;
+        case "messagegroupidstrategy":
+        case "messageGroupIdStrategy": return java.lang.String.class;
+        case "messageretentionperiod":
+        case "messageRetentionPeriod": return java.lang.Integer.class;
+        case "operation": return org.apache.camel.component.aws.sqs.SqsOperations.class;
+        case "policy": return java.lang.String.class;
+        case "pollstrategy":
+        case "pollStrategy": return org.apache.camel.spi.PollingConsumerPollStrategy.class;
+        case "protocol": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "queueownerawsaccountid":
+        case "queueOwnerAWSAccountId": return java.lang.String.class;
+        case "queueurl":
+        case "queueUrl": return java.lang.String.class;
+        case "receivemessagewaittimeseconds":
+        case "receiveMessageWaitTimeSeconds": return java.lang.Integer.class;
+        case "redrivepolicy":
+        case "redrivePolicy": return java.lang.String.class;
+        case "region": return java.lang.String.class;
+        case "repeatcount":
+        case "repeatCount": return long.class;
+        case "runlogginglevel":
+        case "runLoggingLevel": return org.apache.camel.LoggingLevel.class;
+        case "scheduledexecutorservice":
+        case "scheduledExecutorService": return java.util.concurrent.ScheduledExecutorService.class;
+        case "scheduler": return java.lang.Object.class;
+        case "schedulerproperties":
+        case "schedulerProperties": return java.util.Map.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sendemptymessagewhenidle":
+        case "sendEmptyMessageWhenIdle": return boolean.class;
+        case "serversideencryptionenabled":
+        case "serverSideEncryptionEnabled": return boolean.class;
+        case "startscheduler":
+        case "startScheduler": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "timeunit":
+        case "timeUnit": return java.util.concurrent.TimeUnit.class;
+        case "usefixeddelay":
+        case "useFixedDelay": return boolean.class;
+        case "visibilitytimeout":
+        case "visibilityTimeout": return java.lang.Integer.class;
+        case "waittimeseconds":
+        case "waitTimeSeconds": return java.lang.Integer.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFComponentConfigurer.java b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFComponentConfigurer.java
index 2354f73..c6673cc 100644
--- a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFComponentConfigurer.java
+++ b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFComponentConfigurer.java
@@ -50,7 +50,7 @@ public class SWFComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("workflowList", java.lang.String.class);
         map.put("workflowTypeRegistrationOptions", com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(SWFComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(SWFComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.swf.SWFConfiguration getOrCreateConfiguration(SWFComponent target) {
@@ -130,10 +130,70 @@ public class SWFComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "activitylist":
+        case "activityList": return java.lang.String.class;
+        case "activityschedulingoptions":
+        case "activitySchedulingOptions": return com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions.class;
+        case "activitythreadpoolsize":
+        case "activityThreadPoolSize": return int.class;
+        case "activitytypeexecutionoptions":
+        case "activityTypeExecutionOptions": return com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions.class;
+        case "activitytyperegistrationoptions":
+        case "activityTypeRegistrationOptions": return com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions.class;
+        case "amazonswclient":
+        case "amazonSWClient": return com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflow.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "childpolicy":
+        case "childPolicy": return java.lang.String.class;
+        case "clientconfigurationparameters":
+        case "clientConfigurationParameters": return java.util.Map.class;
+        case "configuration": return org.apache.camel.component.aws.swf.SWFConfiguration.class;
+        case "dataconverter":
+        case "dataConverter": return com.amazonaws.services.simpleworkflow.flow.DataConverter.class;
+        case "domainname":
+        case "domainName": return java.lang.String.class;
+        case "eventname":
+        case "eventName": return java.lang.String.class;
+        case "executionstarttoclosetimeout":
+        case "executionStartToCloseTimeout": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return java.lang.String.class;
+        case "region": return java.lang.String.class;
+        case "swclientparameters":
+        case "sWClientParameters": return java.util.Map.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "signalname":
+        case "signalName": return java.lang.String.class;
+        case "startworkflowoptionsparameters":
+        case "startWorkflowOptionsParameters": return java.util.Map.class;
+        case "stateresulttype":
+        case "stateResultType": return java.lang.String.class;
+        case "taskstarttoclosetimeout":
+        case "taskStartToCloseTimeout": return java.lang.String.class;
+        case "terminationdetails":
+        case "terminationDetails": return java.lang.String.class;
+        case "terminationreason":
+        case "terminationReason": return java.lang.String.class;
+        case "version": return java.lang.String.class;
+        case "workflowlist":
+        case "workflowList": return java.lang.String.class;
+        case "workflowtyperegistrationoptions":
+        case "workflowTypeRegistrationOptions": return com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointConfigurer.java b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointConfigurer.java
index ad7ce22..464fa29 100644
--- a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointConfigurer.java
+++ b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointConfigurer.java
@@ -53,7 +53,7 @@ public class SWFEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("workflowList", java.lang.String.class);
         map.put("workflowTypeRegistrationOptions", com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(SWFEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(SWFEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -130,10 +130,74 @@ public class SWFEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "activitylist":
+        case "activityList": return java.lang.String.class;
+        case "activityschedulingoptions":
+        case "activitySchedulingOptions": return com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions.class;
+        case "activitythreadpoolsize":
+        case "activityThreadPoolSize": return int.class;
+        case "activitytypeexecutionoptions":
+        case "activityTypeExecutionOptions": return com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions.class;
+        case "activitytyperegistrationoptions":
+        case "activityTypeRegistrationOptions": return com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions.class;
+        case "amazonswclient":
+        case "amazonSWClient": return com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflow.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "childpolicy":
+        case "childPolicy": return java.lang.String.class;
+        case "clientconfigurationparameters":
+        case "clientConfigurationParameters": return java.util.Map.class;
+        case "dataconverter":
+        case "dataConverter": return com.amazonaws.services.simpleworkflow.flow.DataConverter.class;
+        case "domainname":
+        case "domainName": return java.lang.String.class;
+        case "eventname":
+        case "eventName": return java.lang.String.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "executionstarttoclosetimeout":
+        case "executionStartToCloseTimeout": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return java.lang.String.class;
+        case "region": return java.lang.String.class;
+        case "swclientparameters":
+        case "sWClientParameters": return java.util.Map.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "signalname":
+        case "signalName": return java.lang.String.class;
+        case "startworkflowoptionsparameters":
+        case "startWorkflowOptionsParameters": return java.util.Map.class;
+        case "stateresulttype":
+        case "stateResultType": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "taskstarttoclosetimeout":
+        case "taskStartToCloseTimeout": return java.lang.String.class;
+        case "terminationdetails":
+        case "terminationDetails": return java.lang.String.class;
+        case "terminationreason":
+        case "terminationReason": return java.lang.String.class;
+        case "version": return java.lang.String.class;
+        case "workflowlist":
+        case "workflowList": return java.lang.String.class;
+        case "workflowtyperegistrationoptions":
+        case "workflowTypeRegistrationOptions": return com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateComponentConfigurer.java b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateComponentConfigurer.java
index 12dd828..d624771 100644
--- a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateComponentConfigurer.java
+++ b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateComponentConfigurer.java
@@ -35,7 +35,7 @@ public class TranslateComponentConfigurer extends PropertyConfigurerSupport impl
         map.put("translateClient", com.amazonaws.services.translate.AmazonTranslate.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(TranslateComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(TranslateComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws.translate.TranslateConfiguration getOrCreateConfiguration(TranslateComponent target) {
@@ -86,10 +86,41 @@ public class TranslateComponentConfigurer extends PropertyConfigurerSupport impl
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "autodetectsourcelanguage":
+        case "autodetectSourceLanguage": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws.translate.TranslateConfiguration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.translate.TranslateOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sourcelanguage":
+        case "sourceLanguage": return java.lang.String.class;
+        case "targetlanguage":
+        case "targetLanguage": return java.lang.String.class;
+        case "translateclient":
+        case "translateClient": return com.amazonaws.services.translate.AmazonTranslate.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointConfigurer.java b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointConfigurer.java
index 4a2090e..1b1b952 100644
--- a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointConfigurer.java
+++ b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointConfigurer.java
@@ -36,7 +36,7 @@ public class TranslateEndpointConfigurer extends PropertyConfigurerSupport imple
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(TranslateEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(TranslateEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -80,10 +80,41 @@ public class TranslateEndpointConfigurer extends PropertyConfigurerSupport imple
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "autodetectsourcelanguage":
+        case "autodetectSourceLanguage": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws.translate.TranslateOperations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return com.amazonaws.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sourcelanguage":
+        case "sourceLanguage": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "targetlanguage":
+        case "targetLanguage": return java.lang.String.class;
+        case "translateclient":
+        case "translateClient": return com.amazonaws.services.translate.AmazonTranslate.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2ComponentConfigurer.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2ComponentConfigurer.java
index 2cb044a..83bd374 100644
--- a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2ComponentConfigurer.java
+++ b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2ComponentConfigurer.java
@@ -50,7 +50,7 @@ public class Athena2ComponentConfigurer extends PropertyConfigurerSupport implem
         map.put("basicPropertyBinding", boolean.class);
         map.put("clientRequestToken", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Athena2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Athena2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.athena.Athena2Configuration getOrCreateConfiguration(Athena2Component target) {
@@ -128,10 +128,68 @@ public class Athena2ComponentConfigurer extends PropertyConfigurerSupport implem
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonathenaclient":
+        case "amazonAthenaClient": return software.amazon.awssdk.services.athena.AthenaClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "clientrequesttoken":
+        case "clientRequestToken": return java.lang.String.class;
+        case "configuration": return org.apache.camel.component.aws2.athena.Athena2Configuration.class;
+        case "database": return java.lang.String.class;
+        case "delay": return long.class;
+        case "encryptionoption":
+        case "encryptionOption": return software.amazon.awssdk.services.athena.model.EncryptionOption.class;
+        case "includetrace":
+        case "includeTrace": return boolean.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "kmskey":
+        case "kmsKey": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxattempts":
+        case "maxAttempts": return int.class;
+        case "maxresults":
+        case "maxResults": return java.lang.Integer.class;
+        case "nexttoken":
+        case "nextToken": return java.lang.String.class;
+        case "operation": return org.apache.camel.component.aws2.athena.Athena2Operations.class;
+        case "outputlocation":
+        case "outputLocation": return java.lang.String.class;
+        case "outputtype":
+        case "outputType": return org.apache.camel.component.aws2.athena.Athena2OutputType.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "queryexecutionid":
+        case "queryExecutionId": return java.lang.String.class;
+        case "querystring":
+        case "queryString": return java.lang.String.class;
+        case "region": return java.lang.String.class;
+        case "resetwaittimeoutonretry":
+        case "resetWaitTimeoutOnRetry": return boolean.class;
+        case "retry": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "waittimeout":
+        case "waitTimeout": return long.class;
+        case "workgroup":
+        case "workGroup": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointConfigurer.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointConfigurer.java
index 02e8ad9..8f67c5f 100644
--- a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointConfigurer.java
+++ b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointConfigurer.java
@@ -51,7 +51,7 @@ public class Athena2EndpointConfigurer extends PropertyConfigurerSupport impleme
         map.put("clientRequestToken", java.lang.String.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Athena2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Athena2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -122,10 +122,68 @@ public class Athena2EndpointConfigurer extends PropertyConfigurerSupport impleme
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonathenaclient":
+        case "amazonAthenaClient": return software.amazon.awssdk.services.athena.AthenaClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "clientrequesttoken":
+        case "clientRequestToken": return java.lang.String.class;
+        case "database": return java.lang.String.class;
+        case "delay": return long.class;
+        case "encryptionoption":
+        case "encryptionOption": return software.amazon.awssdk.services.athena.model.EncryptionOption.class;
+        case "includetrace":
+        case "includeTrace": return boolean.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "kmskey":
+        case "kmsKey": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxattempts":
+        case "maxAttempts": return int.class;
+        case "maxresults":
+        case "maxResults": return java.lang.Integer.class;
+        case "nexttoken":
+        case "nextToken": return java.lang.String.class;
+        case "operation": return org.apache.camel.component.aws2.athena.Athena2Operations.class;
+        case "outputlocation":
+        case "outputLocation": return java.lang.String.class;
+        case "outputtype":
+        case "outputType": return org.apache.camel.component.aws2.athena.Athena2OutputType.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "queryexecutionid":
+        case "queryExecutionId": return java.lang.String.class;
+        case "querystring":
+        case "queryString": return java.lang.String.class;
+        case "region": return java.lang.String.class;
+        case "resetwaittimeoutonretry":
+        case "resetWaitTimeoutOnRetry": return boolean.class;
+        case "retry": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "waittimeout":
+        case "waitTimeout": return long.class;
+        case "workgroup":
+        case "workGroup": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
index e49d3b7..150b8e7 100644
--- a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
+++ b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
@@ -36,7 +36,7 @@ public class Cw2ComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Cw2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Cw2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.cw.Cw2Configuration getOrCreateConfiguration(Cw2Component target) {
@@ -86,10 +86,40 @@ public class Cw2ComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazoncwclient":
+        case "amazonCwClient": return software.amazon.awssdk.services.cloudwatch.CloudWatchClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.cw.Cw2Configuration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "name": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "timestamp": return java.time.Instant.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        case "unit": return java.lang.String.class;
+        case "value": return java.lang.Double.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointConfigurer.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointConfigurer.java
index 15222ce..33da397 100644
--- a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointConfigurer.java
+++ b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointConfigurer.java
@@ -37,7 +37,7 @@ public class Cw2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Cw2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Cw2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -80,10 +80,40 @@ public class Cw2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazoncwclient":
+        case "amazonCwClient": return software.amazon.awssdk.services.cloudwatch.CloudWatchClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "name": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "timestamp": return java.time.Instant.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        case "unit": return java.lang.String.class;
+        case "value": return java.lang.Double.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2ComponentConfigurer.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2ComponentConfigurer.java
index 264cdc8..1491179 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2ComponentConfigurer.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2ComponentConfigurer.java
@@ -38,7 +38,7 @@ public class Ddb2ComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Ddb2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Ddb2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.ddb.Ddb2Configuration getOrCreateConfiguration(Ddb2Component target) {
@@ -95,10 +95,47 @@ public class Ddb2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonddbclient":
+        case "amazonDDBClient": return software.amazon.awssdk.services.dynamodb.DynamoDbClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.ddb.Ddb2Configuration.class;
+        case "consistentread":
+        case "consistentRead": return boolean.class;
+        case "keyattributename":
+        case "keyAttributeName": return java.lang.String.class;
+        case "keyattributetype":
+        case "keyAttributeType": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.ddb.Ddb2Operations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "readcapacity":
+        case "readCapacity": return java.lang.Long.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        case "writecapacity":
+        case "writeCapacity": return java.lang.Long.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointConfigurer.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointConfigurer.java
index 6b7ba26..6e8f66b 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointConfigurer.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointConfigurer.java
@@ -39,7 +39,7 @@ public class Ddb2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Ddb2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Ddb2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -89,10 +89,47 @@ public class Ddb2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonddbclient":
+        case "amazonDDBClient": return software.amazon.awssdk.services.dynamodb.DynamoDbClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "consistentread":
+        case "consistentRead": return boolean.class;
+        case "keyattributename":
+        case "keyAttributeName": return java.lang.String.class;
+        case "keyattributetype":
+        case "keyAttributeType": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.ddb.Ddb2Operations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "readcapacity":
+        case "readCapacity": return java.lang.Long.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        case "writecapacity":
+        case "writeCapacity": return java.lang.Long.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamComponentConfigurer.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamComponentConfigurer.java
index 794ecf8..24ec60e 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamComponentConfigurer.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamComponentConfigurer.java
@@ -35,7 +35,7 @@ public class Ddb2StreamComponentConfigurer extends PropertyConfigurerSupport imp
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Ddb2StreamComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Ddb2StreamComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration getOrCreateConfiguration(Ddb2StreamComponent target) {
@@ -87,10 +87,42 @@ public class Ddb2StreamComponentConfigurer extends PropertyConfigurerSupport imp
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazondynamodbstreamsclient":
+        case "amazonDynamoDbStreamsClient": return software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration.class;
+        case "iteratortype":
+        case "iteratorType": return software.amazon.awssdk.services.dynamodb.model.ShardIteratorType.class;
+        case "maxresultsperrequest":
+        case "maxResultsPerRequest": return int.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sequencenumberprovider":
+        case "sequenceNumberProvider": return org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointConfigurer.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointConfigurer.java
index 855e978..55749d0 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointConfigurer.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointConfigurer.java
@@ -54,7 +54,7 @@ public class Ddb2StreamEndpointConfigurer extends PropertyConfigurerSupport impl
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Ddb2StreamEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Ddb2StreamEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -132,10 +132,75 @@ public class Ddb2StreamEndpointConfigurer extends PropertyConfigurerSupport impl
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazondynamodbstreamsclient":
+        case "amazonDynamoDbStreamsClient": return software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "backofferrorthreshold":
+        case "backoffErrorThreshold": return int.class;
+        case "backoffidlethreshold":
+        case "backoffIdleThreshold": return int.class;
+        case "backoffmultiplier":
+        case "backoffMultiplier": return int.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "delay": return long.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "greedy": return boolean.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "iteratortype":
+        case "iteratorType": return software.amazon.awssdk.services.dynamodb.model.ShardIteratorType.class;
+        case "maxresultsperrequest":
+        case "maxResultsPerRequest": return int.class;
+        case "pollstrategy":
+        case "pollStrategy": return org.apache.camel.spi.PollingConsumerPollStrategy.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "repeatcount":
+        case "repeatCount": return long.class;
+        case "runlogginglevel":
+        case "runLoggingLevel": return org.apache.camel.LoggingLevel.class;
+        case "scheduledexecutorservice":
+        case "scheduledExecutorService": return java.util.concurrent.ScheduledExecutorService.class;
+        case "scheduler": return java.lang.Object.class;
+        case "schedulerproperties":
+        case "schedulerProperties": return java.util.Map.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sendemptymessagewhenidle":
+        case "sendEmptyMessageWhenIdle": return boolean.class;
+        case "sequencenumberprovider":
+        case "sequenceNumberProvider": return org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider.class;
+        case "startscheduler":
+        case "startScheduler": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "timeunit":
+        case "timeUnit": return java.util.concurrent.TimeUnit.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        case "usefixeddelay":
+        case "useFixedDelay": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2ComponentConfigurer.java b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2ComponentConfigurer.java
index b5f4b62..3c2847f 100644
--- a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2ComponentConfigurer.java
+++ b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2ComponentConfigurer.java
@@ -34,7 +34,7 @@ public class AWS2EC2ComponentConfigurer extends PropertyConfigurerSupport implem
         map.put("trustAllCertificates", boolean.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AWS2EC2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AWS2EC2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.ec2.AWS2EC2Configuration getOrCreateConfiguration(AWS2EC2Component target) {
@@ -83,10 +83,39 @@ public class AWS2EC2ComponentConfigurer extends PropertyConfigurerSupport implem
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonec2client":
+        case "amazonEc2Client": return software.amazon.awssdk.services.ec2.Ec2Client.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.ec2.AWS2EC2Configuration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.ec2.AWS2EC2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointConfigurer.java b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointConfigurer.java
index 7e3d130..83e2ffc 100644
--- a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointConfigurer.java
+++ b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointConfigurer.java
@@ -35,7 +35,7 @@ public class AWS2EC2EndpointConfigurer extends PropertyConfigurerSupport impleme
         map.put("basicPropertyBinding", boolean.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AWS2EC2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AWS2EC2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +77,39 @@ public class AWS2EC2EndpointConfigurer extends PropertyConfigurerSupport impleme
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonec2client":
+        case "amazonEc2Client": return software.amazon.awssdk.services.ec2.Ec2Client.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.ec2.AWS2EC2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurer.java b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurer.java
index 4ce00eb..231efdc 100644
--- a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurer.java
+++ b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurer.java
@@ -34,7 +34,7 @@ public class ECS2ComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(ECS2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ECS2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.ecs.ECS2Configuration getOrCreateConfiguration(ECS2Component target) {
@@ -83,10 +83,39 @@ public class ECS2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.ecs.ECS2Configuration.class;
+        case "ecsclient":
+        case "ecsClient": return software.amazon.awssdk.services.ecs.EcsClient.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.ecs.ECS2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointConfigurer.java b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointConfigurer.java
index 4a231f8..1d9d77d 100644
--- a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointConfigurer.java
+++ b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointConfigurer.java
@@ -35,7 +35,7 @@ public class ECS2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(ECS2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ECS2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +77,39 @@ public class ECS2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "ecsclient":
+        case "ecsClient": return software.amazon.awssdk.services.ecs.EcsClient.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.ecs.ECS2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurer.java b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurer.java
index 87b86db..f92eaae 100644
--- a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurer.java
+++ b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurer.java
@@ -34,7 +34,7 @@ public class EKS2ComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(EKS2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(EKS2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.eks.EKS2Configuration getOrCreateConfiguration(EKS2Component target) {
@@ -83,10 +83,39 @@ public class EKS2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.eks.EKS2Configuration.class;
+        case "eksclient":
+        case "eksClient": return software.amazon.awssdk.services.eks.EksClient.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.eks.EKS2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointConfigurer.java b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointConfigurer.java
index 22ab721..f732d6e 100644
--- a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointConfigurer.java
+++ b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointConfigurer.java
@@ -35,7 +35,7 @@ public class EKS2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(EKS2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(EKS2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +77,39 @@ public class EKS2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "eksclient":
+        case "eksClient": return software.amazon.awssdk.services.eks.EksClient.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.eks.EKS2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurer.java b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurer.java
index 3a5c334..8d368f5 100644
--- a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurer.java
+++ b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurer.java
@@ -35,7 +35,7 @@ public class EventbridgeComponentConfigurer extends PropertyConfigurerSupport im
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(EventbridgeComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(EventbridgeComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration getOrCreateConfiguration(EventbridgeComponent target) {
@@ -86,10 +86,41 @@ public class EventbridgeComponentConfigurer extends PropertyConfigurerSupport im
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration.class;
+        case "eventpatternfile":
+        case "eventPatternFile": return java.lang.String.class;
+        case "eventbridgeclient":
+        case "eventbridgeClient": return software.amazon.awssdk.services.eventbridge.EventBridgeClient.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.eventbridge.EventbridgeOperations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointConfigurer.java b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointConfigurer.java
index 8594f88..b0880ca 100644
--- a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointConfigurer.java
+++ b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointConfigurer.java
@@ -36,7 +36,7 @@ public class EventbridgeEndpointConfigurer extends PropertyConfigurerSupport imp
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(EventbridgeEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(EventbridgeEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -80,10 +80,41 @@ public class EventbridgeEndpointConfigurer extends PropertyConfigurerSupport imp
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "eventpatternfile":
+        case "eventPatternFile": return java.lang.String.class;
+        case "eventbridgeclient":
+        case "eventbridgeClient": return software.amazon.awssdk.services.eventbridge.EventBridgeClient.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.eventbridge.EventbridgeOperations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2ComponentConfigurer.java b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2ComponentConfigurer.java
index f4cc7efc..17a4dcb 100644
--- a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2ComponentConfigurer.java
+++ b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2ComponentConfigurer.java
@@ -34,7 +34,7 @@ public class IAM2ComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(IAM2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(IAM2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.iam.IAM2Configuration getOrCreateConfiguration(IAM2Component target) {
@@ -83,10 +83,39 @@ public class IAM2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.iam.IAM2Configuration.class;
+        case "iamclient":
+        case "iamClient": return software.amazon.awssdk.services.iam.IamClient.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.iam.IAM2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointConfigurer.java b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointConfigurer.java
index 939547c..552789f 100644
--- a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointConfigurer.java
+++ b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointConfigurer.java
@@ -35,7 +35,7 @@ public class IAM2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(IAM2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(IAM2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +77,39 @@ public class IAM2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "iamclient":
+        case "iamClient": return software.amazon.awssdk.services.iam.IamClient.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.iam.IAM2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
index 91dcbda..eeae899 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
@@ -34,7 +34,7 @@ public class KinesisFirehose2ComponentConfigurer extends PropertyConfigurerSuppo
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(KinesisFirehose2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(KinesisFirehose2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration getOrCreateConfiguration(KinesisFirehose2Component target) {
@@ -83,10 +83,39 @@ public class KinesisFirehose2ComponentConfigurer extends PropertyConfigurerSuppo
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonkinesisfirehoseclient":
+        case "amazonKinesisFirehoseClient": return software.amazon.awssdk.services.firehose.FirehoseClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "cborenabled":
+        case "cborEnabled": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
index c5030e7..a9f1700 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
@@ -35,7 +35,7 @@ public class KinesisFirehose2EndpointConfigurer extends PropertyConfigurerSuppor
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(KinesisFirehose2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(KinesisFirehose2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +77,39 @@ public class KinesisFirehose2EndpointConfigurer extends PropertyConfigurerSuppor
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonkinesisfirehoseclient":
+        case "amazonKinesisFirehoseClient": return software.amazon.awssdk.services.firehose.FirehoseClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "cborenabled":
+        case "cborEnabled": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java
index e137e66..8dc413c 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java
@@ -39,7 +39,7 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Kinesis2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Kinesis2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.kinesis.Kinesis2Configuration getOrCreateConfiguration(Kinesis2Component target) {
@@ -99,10 +99,50 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonkinesisclient":
+        case "amazonKinesisClient": return software.amazon.awssdk.services.kinesis.KinesisClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "cborenabled":
+        case "cborEnabled": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.kinesis.Kinesis2Configuration.class;
+        case "iteratortype":
+        case "iteratorType": return software.amazon.awssdk.services.kinesis.model.ShardIteratorType.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxresultsperrequest":
+        case "maxResultsPerRequest": return int.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sequencenumber":
+        case "sequenceNumber": return java.lang.String.class;
+        case "shardclosed":
+        case "shardClosed": return org.apache.camel.component.aws2.kinesis.Kinesis2ShardClosedStrategyEnum.class;
+        case "shardid":
+        case "shardId": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java
index 348dbaa..1ed4eeb 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java
@@ -58,7 +58,7 @@ public class Kinesis2EndpointConfigurer extends PropertyConfigurerSupport implem
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Kinesis2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Kinesis2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -144,10 +144,83 @@ public class Kinesis2EndpointConfigurer extends PropertyConfigurerSupport implem
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonkinesisclient":
+        case "amazonKinesisClient": return software.amazon.awssdk.services.kinesis.KinesisClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "backofferrorthreshold":
+        case "backoffErrorThreshold": return int.class;
+        case "backoffidlethreshold":
+        case "backoffIdleThreshold": return int.class;
+        case "backoffmultiplier":
+        case "backoffMultiplier": return int.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "cborenabled":
+        case "cborEnabled": return boolean.class;
+        case "delay": return long.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "greedy": return boolean.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "iteratortype":
+        case "iteratorType": return software.amazon.awssdk.services.kinesis.model.ShardIteratorType.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxresultsperrequest":
+        case "maxResultsPerRequest": return int.class;
+        case "pollstrategy":
+        case "pollStrategy": return org.apache.camel.spi.PollingConsumerPollStrategy.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "repeatcount":
+        case "repeatCount": return long.class;
+        case "runlogginglevel":
+        case "runLoggingLevel": return org.apache.camel.LoggingLevel.class;
+        case "scheduledexecutorservice":
+        case "scheduledExecutorService": return java.util.concurrent.ScheduledExecutorService.class;
+        case "scheduler": return java.lang.Object.class;
+        case "schedulerproperties":
+        case "schedulerProperties": return java.util.Map.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sendemptymessagewhenidle":
+        case "sendEmptyMessageWhenIdle": return boolean.class;
+        case "sequencenumber":
+        case "sequenceNumber": return java.lang.String.class;
+        case "shardclosed":
+        case "shardClosed": return org.apache.camel.component.aws2.kinesis.Kinesis2ShardClosedStrategyEnum.class;
+        case "shardid":
+        case "shardId": return java.lang.String.class;
+        case "startscheduler":
+        case "startScheduler": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "timeunit":
+        case "timeUnit": return java.util.concurrent.TimeUnit.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        case "usefixeddelay":
+        case "useFixedDelay": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2ComponentConfigurer.java b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2ComponentConfigurer.java
index 1b0e94d..8dca088 100644
--- a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2ComponentConfigurer.java
+++ b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2ComponentConfigurer.java
@@ -34,7 +34,7 @@ public class KMS2ComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(KMS2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(KMS2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.kms.KMS2Configuration getOrCreateConfiguration(KMS2Component target) {
@@ -83,10 +83,39 @@ public class KMS2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.kms.KMS2Configuration.class;
+        case "kmsclient":
+        case "kmsClient": return software.amazon.awssdk.services.kms.KmsClient.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.kms.KMS2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointConfigurer.java b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointConfigurer.java
index a6418ac..d5028f1 100644
--- a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointConfigurer.java
+++ b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointConfigurer.java
@@ -35,7 +35,7 @@ public class KMS2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(KMS2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(KMS2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +77,39 @@ public class KMS2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "kmsclient":
+        case "kmsClient": return software.amazon.awssdk.services.kms.KmsClient.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.kms.KMS2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentConfigurer.java b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentConfigurer.java
index 1b2ccbf..a3a8cc7 100644
--- a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentConfigurer.java
+++ b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentConfigurer.java
@@ -34,7 +34,7 @@ public class Lambda2ComponentConfigurer extends PropertyConfigurerSupport implem
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Lambda2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Lambda2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.lambda.Lambda2Configuration getOrCreateConfiguration(Lambda2Component target) {
@@ -83,10 +83,39 @@ public class Lambda2ComponentConfigurer extends PropertyConfigurerSupport implem
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "awslambdaclient":
+        case "awsLambdaClient": return software.amazon.awssdk.services.lambda.LambdaClient.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.lambda.Lambda2Configuration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.lambda.Lambda2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointConfigurer.java b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointConfigurer.java
index 9135aaa..741549f 100644
--- a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointConfigurer.java
+++ b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointConfigurer.java
@@ -35,7 +35,7 @@ public class Lambda2EndpointConfigurer extends PropertyConfigurerSupport impleme
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Lambda2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Lambda2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +77,39 @@ public class Lambda2EndpointConfigurer extends PropertyConfigurerSupport impleme
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "awslambdaclient":
+        case "awsLambdaClient": return software.amazon.awssdk.services.lambda.LambdaClient.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.lambda.Lambda2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2ComponentConfigurer.java b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2ComponentConfigurer.java
index ee428af..85a72a4 100644
--- a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2ComponentConfigurer.java
+++ b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2ComponentConfigurer.java
@@ -34,7 +34,7 @@ public class MQ2ComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(MQ2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(MQ2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.mq.MQ2Configuration getOrCreateConfiguration(MQ2Component target) {
@@ -83,10 +83,39 @@ public class MQ2ComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonmqclient":
+        case "amazonMqClient": return software.amazon.awssdk.services.mq.MqClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.mq.MQ2Configuration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.mq.MQ2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointConfigurer.java b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointConfigurer.java
index d9c8169..45f5714 100644
--- a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointConfigurer.java
+++ b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointConfigurer.java
@@ -35,7 +35,7 @@ public class MQ2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(MQ2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(MQ2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +77,39 @@ public class MQ2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonmqclient":
+        case "amazonMqClient": return software.amazon.awssdk.services.mq.MqClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.mq.MQ2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2ComponentConfigurer.java b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2ComponentConfigurer.java
index 280217e..ca9e63d 100644
--- a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2ComponentConfigurer.java
+++ b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2ComponentConfigurer.java
@@ -34,7 +34,7 @@ public class MSK2ComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(MSK2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(MSK2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.msk.MSK2Configuration getOrCreateConfiguration(MSK2Component target) {
@@ -83,10 +83,39 @@ public class MSK2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.msk.MSK2Configuration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "mskclient":
+        case "mskClient": return software.amazon.awssdk.services.kafka.KafkaClient.class;
+        case "operation": return org.apache.camel.component.aws2.msk.MSK2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointConfigurer.java b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointConfigurer.java
index 73606c1..63cd10d 100644
--- a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointConfigurer.java
+++ b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointConfigurer.java
@@ -35,7 +35,7 @@ public class MSK2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(MSK2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(MSK2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +77,39 @@ public class MSK2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "mskclient":
+        case "mskClient": return software.amazon.awssdk.services.kafka.KafkaClient.class;
+        case "operation": return org.apache.camel.component.aws2.msk.MSK2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java
index a8b3dda..84096a2 100644
--- a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java
+++ b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java
@@ -62,7 +62,7 @@ public class AWS2S3ComponentConfigurer extends PropertyConfigurerSupport impleme
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AWS2S3ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AWS2S3ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.s3.AWS2S3Configuration getOrCreateConfiguration(AWS2S3Component target) {
@@ -164,10 +164,92 @@ public class AWS2S3ComponentConfigurer extends PropertyConfigurerSupport impleme
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazons3client":
+        case "amazonS3Client": return software.amazon.awssdk.services.s3.S3Client.class;
+        case "autocreatebucket":
+        case "autoCreateBucket": return boolean.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "autoclosebody":
+        case "autocloseBody": return boolean.class;
+        case "awskmskeyid":
+        case "awsKMSKeyId": return java.lang.String.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.s3.AWS2S3Configuration.class;
+        case "customeralgorithm":
+        case "customerAlgorithm": return java.lang.String.class;
+        case "customerkeyid":
+        case "customerKeyId": return java.lang.String.class;
+        case "customerkeymd5":
+        case "customerKeyMD5": return java.lang.String.class;
+        case "deleteafterread":
+        case "deleteAfterRead": return boolean.class;
+        case "deleteafterwrite":
+        case "deleteAfterWrite": return boolean.class;
+        case "delimiter": return java.lang.String.class;
+        case "destinationbucket":
+        case "destinationBucket": return java.lang.String.class;
+        case "destinationbucketprefix":
+        case "destinationBucketPrefix": return java.lang.String.class;
+        case "destinationbucketsuffix":
+        case "destinationBucketSuffix": return java.lang.String.class;
+        case "filename":
+        case "fileName": return java.lang.String.class;
+        case "includebody":
+        case "includeBody": return boolean.class;
+        case "includefolders":
+        case "includeFolders": return boolean.class;
+        case "keyname":
+        case "keyName": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "moveafterread":
+        case "moveAfterRead": return boolean.class;
+        case "multipartupload":
+        case "multiPartUpload": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.s3.AWS2S3Operations.class;
+        case "overrideendpoint":
+        case "overrideEndpoint": return boolean.class;
+        case "partsize":
+        case "partSize": return long.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "policy": return java.lang.String.class;
+        case "prefix": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "storageclass":
+        case "storageClass": return java.lang.String.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        case "uriendpointoverride":
+        case "uriEndpointOverride": return java.lang.String.class;
+        case "useawskms":
+        case "useAwsKMS": return boolean.class;
+        case "usecustomerkey":
+        case "useCustomerKey": return boolean.class;
+        case "useiamcredentials":
+        case "useIAMCredentials": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java
index b576e40..1eff936 100644
--- a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java
+++ b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java
@@ -83,7 +83,7 @@ public class AWS2S3EndpointConfigurer extends PropertyConfigurerSupport implemen
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(AWS2S3EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(AWS2S3EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -215,10 +215,129 @@ public class AWS2S3EndpointConfigurer extends PropertyConfigurerSupport implemen
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazons3client":
+        case "amazonS3Client": return software.amazon.awssdk.services.s3.S3Client.class;
+        case "autocreatebucket":
+        case "autoCreateBucket": return boolean.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "autoclosebody":
+        case "autocloseBody": return boolean.class;
+        case "awskmskeyid":
+        case "awsKMSKeyId": return java.lang.String.class;
+        case "backofferrorthreshold":
+        case "backoffErrorThreshold": return int.class;
+        case "backoffidlethreshold":
+        case "backoffIdleThreshold": return int.class;
+        case "backoffmultiplier":
+        case "backoffMultiplier": return int.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "customeralgorithm":
+        case "customerAlgorithm": return java.lang.String.class;
+        case "customerkeyid":
+        case "customerKeyId": return java.lang.String.class;
+        case "customerkeymd5":
+        case "customerKeyMD5": return java.lang.String.class;
+        case "delay": return long.class;
+        case "deleteafterread":
+        case "deleteAfterRead": return boolean.class;
+        case "deleteafterwrite":
+        case "deleteAfterWrite": return boolean.class;
+        case "delimiter": return java.lang.String.class;
+        case "destinationbucket":
+        case "destinationBucket": return java.lang.String.class;
+        case "destinationbucketprefix":
+        case "destinationBucketPrefix": return java.lang.String.class;
+        case "destinationbucketsuffix":
+        case "destinationBucketSuffix": return java.lang.String.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "filename":
+        case "fileName": return java.lang.String.class;
+        case "greedy": return boolean.class;
+        case "includebody":
+        case "includeBody": return boolean.class;
+        case "includefolders":
+        case "includeFolders": return boolean.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "keyname":
+        case "keyName": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxconnections":
+        case "maxConnections": return int.class;
+        case "maxmessagesperpoll":
+        case "maxMessagesPerPoll": return int.class;
+        case "moveafterread":
+        case "moveAfterRead": return boolean.class;
+        case "multipartupload":
+        case "multiPartUpload": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.s3.AWS2S3Operations.class;
+        case "overrideendpoint":
+        case "overrideEndpoint": return boolean.class;
+        case "partsize":
+        case "partSize": return long.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "policy": return java.lang.String.class;
+        case "pollstrategy":
+        case "pollStrategy": return org.apache.camel.spi.PollingConsumerPollStrategy.class;
+        case "prefix": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "repeatcount":
+        case "repeatCount": return long.class;
+        case "runlogginglevel":
+        case "runLoggingLevel": return org.apache.camel.LoggingLevel.class;
+        case "scheduledexecutorservice":
+        case "scheduledExecutorService": return java.util.concurrent.ScheduledExecutorService.class;
+        case "scheduler": return java.lang.Object.class;
+        case "schedulerproperties":
+        case "schedulerProperties": return java.util.Map.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sendemptymessagewhenidle":
+        case "sendEmptyMessageWhenIdle": return boolean.class;
+        case "startscheduler":
+        case "startScheduler": return boolean.class;
+        case "storageclass":
+        case "storageClass": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "timeunit":
+        case "timeUnit": return java.util.concurrent.TimeUnit.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        case "uriendpointoverride":
+        case "uriEndpointOverride": return java.lang.String.class;
+        case "useawskms":
+        case "useAwsKMS": return boolean.class;
+        case "usecustomerkey":
+        case "useCustomerKey": return boolean.class;
+        case "usefixeddelay":
+        case "useFixedDelay": return boolean.class;
+        case "useiamcredentials":
+        case "useIAMCredentials": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2ComponentConfigurer.java b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2ComponentConfigurer.java
index b3eb7ea..17bce0f 100644
--- a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2ComponentConfigurer.java
+++ b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2ComponentConfigurer.java
@@ -36,7 +36,7 @@ public class Ses2ComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Ses2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Ses2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.ses.Ses2Configuration getOrCreateConfiguration(Ses2Component target) {
@@ -88,10 +88,42 @@ public class Ses2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonsesclient":
+        case "amazonSESClient": return software.amazon.awssdk.services.ses.SesClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.ses.Ses2Configuration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "replytoaddresses":
+        case "replyToAddresses": return java.util.List.class;
+        case "returnpath":
+        case "returnPath": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "subject": return java.lang.String.class;
+        case "to": return java.util.List.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointConfigurer.java b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointConfigurer.java
index cd42ef9..3519dcd 100644
--- a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointConfigurer.java
+++ b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointConfigurer.java
@@ -37,7 +37,7 @@ public class Ses2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Ses2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Ses2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -82,10 +82,42 @@ public class Ses2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonsesclient":
+        case "amazonSESClient": return software.amazon.awssdk.services.ses.SesClient.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "replytoaddresses":
+        case "replyToAddresses": return java.util.List.class;
+        case "returnpath":
+        case "returnPath": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "subject": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "to": return java.util.List.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2ComponentConfigurer.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2ComponentConfigurer.java
index 26aad10..d64c483 100644
--- a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2ComponentConfigurer.java
+++ b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2ComponentConfigurer.java
@@ -40,7 +40,7 @@ public class Sns2ComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Sns2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Sns2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.sns.Sns2Configuration getOrCreateConfiguration(Sns2Component target) {
@@ -100,10 +100,50 @@ public class Sns2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonsnsclient":
+        case "amazonSNSClient": return software.amazon.awssdk.services.sns.SnsClient.class;
+        case "autocreatetopic":
+        case "autoCreateTopic": return boolean.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.sns.Sns2Configuration.class;
+        case "kmsmasterkeyid":
+        case "kmsMasterKeyId": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "messagestructure":
+        case "messageStructure": return java.lang.String.class;
+        case "policy": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "queueurl":
+        case "queueUrl": return java.lang.String.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "serversideencryptionenabled":
+        case "serverSideEncryptionEnabled": return boolean.class;
+        case "subject": return java.lang.String.class;
+        case "subscribesnstosqs":
+        case "subscribeSNStoSQS": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointConfigurer.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointConfigurer.java
index 41476eb..78212a7 100644
--- a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointConfigurer.java
+++ b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointConfigurer.java
@@ -42,7 +42,7 @@ public class Sns2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Sns2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Sns2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -97,10 +97,52 @@ public class Sns2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonsnsclient":
+        case "amazonSNSClient": return software.amazon.awssdk.services.sns.SnsClient.class;
+        case "autocreatetopic":
+        case "autoCreateTopic": return boolean.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "headerfilterstrategy":
+        case "headerFilterStrategy": return org.apache.camel.spi.HeaderFilterStrategy.class;
+        case "kmsmasterkeyid":
+        case "kmsMasterKeyId": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "messagestructure":
+        case "messageStructure": return java.lang.String.class;
+        case "policy": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "queueurl":
+        case "queueUrl": return java.lang.String.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "serversideencryptionenabled":
+        case "serverSideEncryptionEnabled": return boolean.class;
+        case "subject": return java.lang.String.class;
+        case "subscribesnstosqs":
+        case "subscribeSNStoSQS": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentConfigurer.java b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentConfigurer.java
index be95943..a2a7dee 100644
--- a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentConfigurer.java
+++ b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentConfigurer.java
@@ -61,7 +61,7 @@ public class Sqs2ComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Sqs2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Sqs2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.sqs.Sqs2Configuration getOrCreateConfiguration(Sqs2Component target) {
@@ -162,10 +162,91 @@ public class Sqs2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonawshost":
+        case "amazonAWSHost": return java.lang.String.class;
+        case "amazonsqsclient":
+        case "amazonSQSClient": return software.amazon.awssdk.services.sqs.SqsClient.class;
+        case "attributenames":
+        case "attributeNames": return java.lang.String.class;
+        case "autocreatequeue":
+        case "autoCreateQueue": return boolean.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "concurrentconsumers":
+        case "concurrentConsumers": return int.class;
+        case "configuration": return org.apache.camel.component.aws2.sqs.Sqs2Configuration.class;
+        case "defaultvisibilitytimeout":
+        case "defaultVisibilityTimeout": return java.lang.Integer.class;
+        case "delayqueue":
+        case "delayQueue": return boolean.class;
+        case "delayseconds":
+        case "delaySeconds": return java.lang.Integer.class;
+        case "deleteafterread":
+        case "deleteAfterRead": return boolean.class;
+        case "deleteiffiltered":
+        case "deleteIfFiltered": return boolean.class;
+        case "extendmessagevisibility":
+        case "extendMessageVisibility": return boolean.class;
+        case "kmsdatakeyreuseperiodseconds":
+        case "kmsDataKeyReusePeriodSeconds": return java.lang.Integer.class;
+        case "kmsmasterkeyid":
+        case "kmsMasterKeyId": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maximummessagesize":
+        case "maximumMessageSize": return java.lang.Integer.class;
+        case "messageattributenames":
+        case "messageAttributeNames": return java.lang.String.class;
+        case "messagededuplicationidstrategy":
+        case "messageDeduplicationIdStrategy": return java.lang.String.class;
+        case "messagegroupidstrategy":
+        case "messageGroupIdStrategy": return java.lang.String.class;
+        case "messageretentionperiod":
+        case "messageRetentionPeriod": return java.lang.Integer.class;
+        case "operation": return org.apache.camel.component.aws2.sqs.Sqs2Operations.class;
+        case "policy": return java.lang.String.class;
+        case "protocol": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "queueownerawsaccountid":
+        case "queueOwnerAWSAccountId": return java.lang.String.class;
+        case "queueurl":
+        case "queueUrl": return java.lang.String.class;
+        case "receivemessagewaittimeseconds":
+        case "receiveMessageWaitTimeSeconds": return java.lang.Integer.class;
+        case "redrivepolicy":
+        case "redrivePolicy": return java.lang.String.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "serversideencryptionenabled":
+        case "serverSideEncryptionEnabled": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        case "useiamcredentials":
+        case "useIAMCredentials": return boolean.class;
+        case "visibilitytimeout":
+        case "visibilityTimeout": return java.lang.Integer.class;
+        case "waittimeseconds":
+        case "waitTimeSeconds": return java.lang.Integer.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointConfigurer.java b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointConfigurer.java
index a6b602d..56333db 100644
--- a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointConfigurer.java
+++ b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointConfigurer.java
@@ -82,7 +82,7 @@ public class Sqs2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Sqs2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Sqs2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -213,10 +213,128 @@ public class Sqs2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "amazonawshost":
+        case "amazonAWSHost": return java.lang.String.class;
+        case "amazonsqsclient":
+        case "amazonSQSClient": return software.amazon.awssdk.services.sqs.SqsClient.class;
+        case "attributenames":
+        case "attributeNames": return java.lang.String.class;
+        case "autocreatequeue":
+        case "autoCreateQueue": return boolean.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "backofferrorthreshold":
+        case "backoffErrorThreshold": return int.class;
+        case "backoffidlethreshold":
+        case "backoffIdleThreshold": return int.class;
+        case "backoffmultiplier":
+        case "backoffMultiplier": return int.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "concurrentconsumers":
+        case "concurrentConsumers": return int.class;
+        case "defaultvisibilitytimeout":
+        case "defaultVisibilityTimeout": return java.lang.Integer.class;
+        case "delay": return long.class;
+        case "delayqueue":
+        case "delayQueue": return boolean.class;
+        case "delayseconds":
+        case "delaySeconds": return java.lang.Integer.class;
+        case "deleteafterread":
+        case "deleteAfterRead": return boolean.class;
+        case "deleteiffiltered":
+        case "deleteIfFiltered": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "extendmessagevisibility":
+        case "extendMessageVisibility": return boolean.class;
+        case "greedy": return boolean.class;
+        case "headerfilterstrategy":
+        case "headerFilterStrategy": return org.apache.camel.spi.HeaderFilterStrategy.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "kmsdatakeyreuseperiodseconds":
+        case "kmsDataKeyReusePeriodSeconds": return java.lang.Integer.class;
+        case "kmsmasterkeyid":
+        case "kmsMasterKeyId": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxmessagesperpoll":
+        case "maxMessagesPerPoll": return int.class;
+        case "maximummessagesize":
+        case "maximumMessageSize": return java.lang.Integer.class;
+        case "messageattributenames":
+        case "messageAttributeNames": return java.lang.String.class;
+        case "messagededuplicationidstrategy":
+        case "messageDeduplicationIdStrategy": return java.lang.String.class;
+        case "messagegroupidstrategy":
+        case "messageGroupIdStrategy": return java.lang.String.class;
+        case "messageretentionperiod":
+        case "messageRetentionPeriod": return java.lang.Integer.class;
+        case "operation": return org.apache.camel.component.aws2.sqs.Sqs2Operations.class;
+        case "policy": return java.lang.String.class;
+        case "pollstrategy":
+        case "pollStrategy": return org.apache.camel.spi.PollingConsumerPollStrategy.class;
+        case "protocol": return java.lang.String.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "queueownerawsaccountid":
+        case "queueOwnerAWSAccountId": return java.lang.String.class;
+        case "queueurl":
+        case "queueUrl": return java.lang.String.class;
+        case "receivemessagewaittimeseconds":
+        case "receiveMessageWaitTimeSeconds": return java.lang.Integer.class;
+        case "redrivepolicy":
+        case "redrivePolicy": return java.lang.String.class;
+        case "region": return java.lang.String.class;
+        case "repeatcount":
+        case "repeatCount": return long.class;
+        case "runlogginglevel":
+        case "runLoggingLevel": return org.apache.camel.LoggingLevel.class;
+        case "scheduledexecutorservice":
+        case "scheduledExecutorService": return java.util.concurrent.ScheduledExecutorService.class;
+        case "scheduler": return java.lang.Object.class;
+        case "schedulerproperties":
+        case "schedulerProperties": return java.util.Map.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sendemptymessagewhenidle":
+        case "sendEmptyMessageWhenIdle": return boolean.class;
+        case "serversideencryptionenabled":
+        case "serverSideEncryptionEnabled": return boolean.class;
+        case "startscheduler":
+        case "startScheduler": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "timeunit":
+        case "timeUnit": return java.util.concurrent.TimeUnit.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        case "usefixeddelay":
+        case "useFixedDelay": return boolean.class;
+        case "useiamcredentials":
+        case "useIAMCredentials": return boolean.class;
+        case "visibilitytimeout":
+        case "visibilityTimeout": return java.lang.Integer.class;
+        case "waittimeseconds":
+        case "waitTimeSeconds": return java.lang.Integer.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurer.java b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurer.java
index ff94037..d880093 100644
--- a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurer.java
+++ b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurer.java
@@ -34,7 +34,7 @@ public class STS2ComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(STS2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(STS2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.sts.STS2Configuration getOrCreateConfiguration(STS2Component target) {
@@ -83,10 +83,39 @@ public class STS2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.sts.STS2Configuration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.sts.STS2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "stsclient":
+        case "stsClient": return software.amazon.awssdk.services.sts.StsClient.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointConfigurer.java b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointConfigurer.java
index 8206d7e..f3af500 100644
--- a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointConfigurer.java
+++ b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointConfigurer.java
@@ -35,7 +35,7 @@ public class STS2EndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(STS2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(STS2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -77,10 +77,39 @@ public class STS2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.sts.STS2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "stsclient":
+        case "stsClient": return software.amazon.awssdk.services.sts.StsClient.class;
+        case "synchronous": return boolean.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2ComponentConfigurer.java b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2ComponentConfigurer.java
index 8aee89d..566261b 100644
--- a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2ComponentConfigurer.java
+++ b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2ComponentConfigurer.java
@@ -37,7 +37,7 @@ public class Translate2ComponentConfigurer extends PropertyConfigurerSupport imp
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Translate2ComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Translate2ComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.aws2.translate.Translate2Configuration getOrCreateConfiguration(Translate2Component target) {
@@ -92,10 +92,45 @@ public class Translate2ComponentConfigurer extends PropertyConfigurerSupport imp
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "autodetectsourcelanguage":
+        case "autodetectSourceLanguage": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "configuration": return org.apache.camel.component.aws2.translate.Translate2Configuration.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.translate.Translate2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sourcelanguage":
+        case "sourceLanguage": return java.lang.String.class;
+        case "targetlanguage":
+        case "targetLanguage": return java.lang.String.class;
+        case "translateclient":
+        case "translateClient": return software.amazon.awssdk.services.translate.TranslateClient.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointConfigurer.java b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointConfigurer.java
index 0da9711..598909c 100644
--- a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointConfigurer.java
+++ b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointConfigurer.java
@@ -38,7 +38,7 @@ public class Translate2EndpointConfigurer extends PropertyConfigurerSupport impl
         map.put("accessKey", java.lang.String.class);
         map.put("secretKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(Translate2EndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(Translate2EndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -86,10 +86,45 @@ public class Translate2EndpointConfigurer extends PropertyConfigurerSupport impl
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "autodetectsourcelanguage":
+        case "autodetectSourceLanguage": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.aws2.translate.Translate2Operations.class;
+        case "pojorequest":
+        case "pojoRequest": return boolean.class;
+        case "proxyhost":
+        case "proxyHost": return java.lang.String.class;
+        case "proxyport":
+        case "proxyPort": return java.lang.Integer.class;
+        case "proxyprotocol":
+        case "proxyProtocol": return software.amazon.awssdk.core.Protocol.class;
+        case "region": return java.lang.String.class;
+        case "secretkey":
+        case "secretKey": return java.lang.String.class;
+        case "sourcelanguage":
+        case "sourceLanguage": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "targetlanguage":
+        case "targetLanguage": return java.lang.String.class;
+        case "translateclient":
+        case "translateClient": return software.amazon.awssdk.services.translate.TranslateClient.class;
+        case "trustallcertificates":
+        case "trustAllCertificates": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
index 15d5651..64372928 100644
--- a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
+++ b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
@@ -41,7 +41,7 @@ public class EventHubsComponentConfigurer extends PropertyConfigurerSupport impl
         map.put("sharedAccessKey", java.lang.String.class);
         map.put("sharedAccessName", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(EventHubsComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(EventHubsComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.azure.eventhubs.EventHubsConfiguration getOrCreateConfiguration(EventHubsComponent target) {
@@ -106,10 +106,55 @@ public class EventHubsComponentConfigurer extends PropertyConfigurerSupport impl
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "amqpretryoptions":
+        case "amqpRetryOptions": return com.azure.core.amqp.AmqpRetryOptions.class;
+        case "amqptransporttype":
+        case "amqpTransportType": return com.azure.core.amqp.AmqpTransportType.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "blobaccesskey":
+        case "blobAccessKey": return java.lang.String.class;
+        case "blobaccountname":
+        case "blobAccountName": return java.lang.String.class;
+        case "blobcontainername":
+        case "blobContainerName": return java.lang.String.class;
+        case "blobstoragesharedkeycredential":
+        case "blobStorageSharedKeyCredential": return com.azure.storage.common.StorageSharedKeyCredential.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "checkpointstore":
+        case "checkpointStore": return com.azure.messaging.eventhubs.CheckpointStore.class;
+        case "configuration": return org.apache.camel.component.azure.eventhubs.EventHubsConfiguration.class;
+        case "connectionstring":
+        case "connectionString": return java.lang.String.class;
+        case "consumergroupname":
+        case "consumerGroupName": return java.lang.String.class;
+        case "eventposition":
+        case "eventPosition": return java.util.Map.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "partitionid":
+        case "partitionId": return java.lang.String.class;
+        case "partitionkey":
+        case "partitionKey": return java.lang.String.class;
+        case "prefetchcount":
+        case "prefetchCount": return int.class;
+        case "producerasyncclient":
+        case "producerAsyncClient": return com.azure.messaging.eventhubs.EventHubProducerAsyncClient.class;
+        case "sharedaccesskey":
+        case "sharedAccessKey": return java.lang.String.class;
+        case "sharedaccessname":
+        case "sharedAccessName": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointConfigurer.java b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointConfigurer.java
index f1c3bb2..a68860d 100644
--- a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointConfigurer.java
+++ b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointConfigurer.java
@@ -45,7 +45,7 @@ public class EventHubsEndpointConfigurer extends PropertyConfigurerSupport imple
         map.put("sharedAccessKey", java.lang.String.class);
         map.put("sharedAccessName", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(EventHubsEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(EventHubsEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -107,10 +107,59 @@ public class EventHubsEndpointConfigurer extends PropertyConfigurerSupport imple
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "amqpretryoptions":
+        case "amqpRetryOptions": return com.azure.core.amqp.AmqpRetryOptions.class;
+        case "amqptransporttype":
+        case "amqpTransportType": return com.azure.core.amqp.AmqpTransportType.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "blobaccesskey":
+        case "blobAccessKey": return java.lang.String.class;
+        case "blobaccountname":
+        case "blobAccountName": return java.lang.String.class;
+        case "blobcontainername":
+        case "blobContainerName": return java.lang.String.class;
+        case "blobstoragesharedkeycredential":
+        case "blobStorageSharedKeyCredential": return com.azure.storage.common.StorageSharedKeyCredential.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "checkpointstore":
+        case "checkpointStore": return com.azure.messaging.eventhubs.CheckpointStore.class;
+        case "connectionstring":
+        case "connectionString": return java.lang.String.class;
+        case "consumergroupname":
+        case "consumerGroupName": return java.lang.String.class;
+        case "eventposition":
+        case "eventPosition": return java.util.Map.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "partitionid":
+        case "partitionId": return java.lang.String.class;
+        case "partitionkey":
+        case "partitionKey": return java.lang.String.class;
+        case "prefetchcount":
+        case "prefetchCount": return int.class;
+        case "producerasyncclient":
+        case "producerAsyncClient": return com.azure.messaging.eventhubs.EventHubProducerAsyncClient.class;
+        case "sharedaccesskey":
+        case "sharedAccessKey": return java.lang.String.class;
+        case "sharedaccessname":
+        case "sharedAccessName": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobComponentConfigurer.java b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobComponentConfigurer.java
index 432c959..99b0032 100644
--- a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobComponentConfigurer.java
+++ b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobComponentConfigurer.java
@@ -48,7 +48,7 @@ public class BlobComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("basicPropertyBinding", boolean.class);
         map.put("accessKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BlobComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BlobComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.azure.storage.blob.BlobConfiguration getOrCreateConfiguration(BlobComponent target) {
@@ -122,10 +122,64 @@ public class BlobComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "blobname":
+        case "blobName": return java.lang.String.class;
+        case "bloboffset":
+        case "blobOffset": return long.class;
+        case "blobsequencenumber":
+        case "blobSequenceNumber": return java.lang.Long.class;
+        case "blobtype":
+        case "blobType": return org.apache.camel.component.azure.storage.blob.BlobType.class;
+        case "blocklisttype":
+        case "blockListType": return com.azure.storage.blob.models.BlockListType.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "closestreamafterread":
+        case "closeStreamAfterRead": return boolean.class;
+        case "closestreamafterwrite":
+        case "closeStreamAfterWrite": return boolean.class;
+        case "commitblocklistlater":
+        case "commitBlockListLater": return boolean.class;
+        case "configuration": return org.apache.camel.component.azure.storage.blob.BlobConfiguration.class;
+        case "createappendblob":
+        case "createAppendBlob": return boolean.class;
+        case "createpageblob":
+        case "createPageBlob": return boolean.class;
+        case "credentials": return com.azure.storage.common.StorageSharedKeyCredential.class;
+        case "datacount":
+        case "dataCount": return java.lang.Long.class;
+        case "downloadlinkexpiration":
+        case "downloadLinkExpiration": return java.lang.Long.class;
+        case "filedir":
+        case "fileDir": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxresultsperpage":
+        case "maxResultsPerPage": return java.lang.Integer.class;
+        case "maxretryrequests":
+        case "maxRetryRequests": return int.class;
+        case "operation": return org.apache.camel.component.azure.storage.blob.BlobOperationsDefinition.class;
+        case "pageblobsize":
+        case "pageBlobSize": return java.lang.Long.class;
+        case "prefix": return java.lang.String.class;
+        case "regex": return java.lang.String.class;
+        case "serviceclient":
+        case "serviceClient": return com.azure.storage.blob.BlobServiceClient.class;
+        case "timeout": return java.time.Duration.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointConfigurer.java b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointConfigurer.java
index 9d9f3ac..7a42c0b 100644
--- a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointConfigurer.java
+++ b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointConfigurer.java
@@ -53,7 +53,7 @@ public class BlobEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("synchronous", boolean.class);
         map.put("accessKey", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BlobEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BlobEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -126,10 +126,70 @@ public class BlobEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "blobname":
+        case "blobName": return java.lang.String.class;
+        case "bloboffset":
+        case "blobOffset": return long.class;
+        case "blobsequencenumber":
+        case "blobSequenceNumber": return java.lang.Long.class;
+        case "blobserviceclient":
+        case "blobServiceClient": return com.azure.storage.blob.BlobServiceClient.class;
+        case "blobtype":
+        case "blobType": return org.apache.camel.component.azure.storage.blob.BlobType.class;
+        case "blocklisttype":
+        case "blockListType": return com.azure.storage.blob.models.BlockListType.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "closestreamafterread":
+        case "closeStreamAfterRead": return boolean.class;
+        case "closestreamafterwrite":
+        case "closeStreamAfterWrite": return boolean.class;
+        case "commitblocklistlater":
+        case "commitBlockListLater": return boolean.class;
+        case "createappendblob":
+        case "createAppendBlob": return boolean.class;
+        case "createpageblob":
+        case "createPageBlob": return boolean.class;
+        case "credentials": return com.azure.storage.common.StorageSharedKeyCredential.class;
+        case "datacount":
+        case "dataCount": return java.lang.Long.class;
+        case "downloadlinkexpiration":
+        case "downloadLinkExpiration": return java.lang.Long.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "filedir":
+        case "fileDir": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxresultsperpage":
+        case "maxResultsPerPage": return java.lang.Integer.class;
+        case "maxretryrequests":
+        case "maxRetryRequests": return int.class;
+        case "operation": return org.apache.camel.component.azure.storage.blob.BlobOperationsDefinition.class;
+        case "pageblobsize":
+        case "pageBlobSize": return java.lang.Long.class;
+        case "prefix": return java.lang.String.class;
+        case "regex": return java.lang.String.class;
+        case "serviceclient":
+        case "serviceClient": return com.azure.storage.blob.BlobServiceClient.class;
+        case "synchronous": return boolean.class;
+        case "timeout": return java.time.Duration.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueComponentConfigurer.java b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueComponentConfigurer.java
index 59ece26..b97a0ef 100644
--- a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueComponentConfigurer.java
+++ b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueComponentConfigurer.java
@@ -36,7 +36,7 @@ public class QueueComponentConfigurer extends PropertyConfigurerSupport implemen
         map.put("accessKey", java.lang.String.class);
         map.put("credentials", com.azure.storage.common.StorageSharedKeyCredential.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(QueueComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(QueueComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.azure.storage.queue.QueueConfiguration getOrCreateConfiguration(QueueComponent target) {
@@ -88,10 +88,42 @@ public class QueueComponentConfigurer extends PropertyConfigurerSupport implemen
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configuration": return org.apache.camel.component.azure.storage.queue.QueueConfiguration.class;
+        case "createqueue":
+        case "createQueue": return boolean.class;
+        case "credentials": return com.azure.storage.common.StorageSharedKeyCredential.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxmessages":
+        case "maxMessages": return java.lang.Integer.class;
+        case "messageid":
+        case "messageId": return java.lang.String.class;
+        case "operation": return org.apache.camel.component.azure.storage.queue.QueueOperationDefinition.class;
+        case "popreceipt":
+        case "popReceipt": return java.lang.String.class;
+        case "serviceclient":
+        case "serviceClient": return com.azure.storage.queue.QueueServiceClient.class;
+        case "timetolive":
+        case "timeToLive": return java.time.Duration.class;
+        case "timeout": return java.time.Duration.class;
+        case "visibilitytimeout":
+        case "visibilityTimeout": return java.time.Duration.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointConfigurer.java b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointConfigurer.java
index 31494aa..f5ebf9d 100644
--- a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointConfigurer.java
+++ b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointConfigurer.java
@@ -40,7 +40,7 @@ public class QueueEndpointConfigurer extends PropertyConfigurerSupport implement
         map.put("accessKey", java.lang.String.class);
         map.put("credentials", com.azure.storage.common.StorageSharedKeyCredential.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(QueueEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(QueueEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -89,10 +89,46 @@ public class QueueEndpointConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesskey":
+        case "accessKey": return java.lang.String.class;
+        case "autodiscoverclient":
+        case "autoDiscoverClient": return boolean.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "createqueue":
+        case "createQueue": return boolean.class;
+        case "credentials": return com.azure.storage.common.StorageSharedKeyCredential.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxmessages":
+        case "maxMessages": return java.lang.Integer.class;
+        case "messageid":
+        case "messageId": return java.lang.String.class;
+        case "operation": return org.apache.camel.component.azure.storage.queue.QueueOperationDefinition.class;
+        case "popreceipt":
+        case "popReceipt": return java.lang.String.class;
+        case "serviceclient":
+        case "serviceClient": return com.azure.storage.queue.QueueServiceClient.class;
+        case "synchronous": return boolean.class;
+        case "timetolive":
+        case "timeToLive": return java.time.Duration.class;
+        case "timeout": return java.time.Duration.class;
+        case "visibilitytimeout":
+        case "visibilityTimeout": return java.time.Duration.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurer.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurer.java
index ed44d37..9dc50be 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurer.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurer.java
@@ -42,7 +42,7 @@ public class BlobServiceComponentConfigurer extends PropertyConfigurerSupport im
         map.put("credentialsAccountKey", java.lang.String.class);
         map.put("credentialsAccountName", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BlobServiceComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BlobServiceComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.azure.blob.BlobServiceConfiguration getOrCreateConfiguration(BlobServiceComponent target) {
@@ -107,10 +107,55 @@ public class BlobServiceComponentConfigurer extends PropertyConfigurerSupport im
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "azureblobclient":
+        case "azureBlobClient": return com.microsoft.azure.storage.blob.CloudBlob.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "blobmetadata":
+        case "blobMetadata": return java.util.Map.class;
+        case "bloboffset":
+        case "blobOffset": return java.lang.Long.class;
+        case "blobprefix":
+        case "blobPrefix": return java.lang.String.class;
+        case "blobtype":
+        case "blobType": return org.apache.camel.component.azure.blob.BlobType.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "closestreamafterread":
+        case "closeStreamAfterRead": return boolean.class;
+        case "closestreamafterwrite":
+        case "closeStreamAfterWrite": return boolean.class;
+        case "configuration": return org.apache.camel.component.azure.blob.BlobServiceConfiguration.class;
+        case "credentials": return com.microsoft.azure.storage.StorageCredentials.class;
+        case "credentialsaccountkey":
+        case "credentialsAccountKey": return java.lang.String.class;
+        case "credentialsaccountname":
+        case "credentialsAccountName": return java.lang.String.class;
+        case "datalength":
+        case "dataLength": return java.lang.Long.class;
+        case "filedir":
+        case "fileDir": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.azure.blob.BlobServiceOperations.class;
+        case "publicforread":
+        case "publicForRead": return boolean.class;
+        case "streamreadsize":
+        case "streamReadSize": return int.class;
+        case "streamwritesize":
+        case "streamWriteSize": return int.class;
+        case "useflatlisting":
+        case "useFlatListing": return boolean.class;
+        case "validateclienturi":
+        case "validateClientURI": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointConfigurer.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointConfigurer.java
index 9dc645e..a322819 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointConfigurer.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointConfigurer.java
@@ -45,7 +45,7 @@ public class BlobServiceEndpointConfigurer extends PropertyConfigurerSupport imp
         map.put("credentialsAccountKey", java.lang.String.class);
         map.put("credentialsAccountName", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BlobServiceEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BlobServiceEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -107,10 +107,59 @@ public class BlobServiceEndpointConfigurer extends PropertyConfigurerSupport imp
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "azureblobclient":
+        case "azureBlobClient": return com.microsoft.azure.storage.blob.CloudBlob.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "blobmetadata":
+        case "blobMetadata": return java.util.Map.class;
+        case "bloboffset":
+        case "blobOffset": return java.lang.Long.class;
+        case "blobprefix":
+        case "blobPrefix": return java.lang.String.class;
+        case "blobtype":
+        case "blobType": return org.apache.camel.component.azure.blob.BlobType.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "closestreamafterread":
+        case "closeStreamAfterRead": return boolean.class;
+        case "closestreamafterwrite":
+        case "closeStreamAfterWrite": return boolean.class;
+        case "credentials": return com.microsoft.azure.storage.StorageCredentials.class;
+        case "credentialsaccountkey":
+        case "credentialsAccountKey": return java.lang.String.class;
+        case "credentialsaccountname":
+        case "credentialsAccountName": return java.lang.String.class;
+        case "datalength":
+        case "dataLength": return java.lang.Long.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "filedir":
+        case "fileDir": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "operation": return org.apache.camel.component.azure.blob.BlobServiceOperations.class;
+        case "publicforread":
+        case "publicForRead": return boolean.class;
+        case "streamreadsize":
+        case "streamReadSize": return int.class;
+        case "streamwritesize":
+        case "streamWriteSize": return int.class;
+        case "synchronous": return boolean.class;
+        case "useflatlisting":
+        case "useFlatListing": return boolean.class;
+        case "validateclienturi":
+        case "validateClientURI": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceComponentConfigurer.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceComponentConfigurer.java
index a00762c..47e07af 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceComponentConfigurer.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceComponentConfigurer.java
@@ -33,7 +33,7 @@ public class QueueServiceComponentConfigurer extends PropertyConfigurerSupport i
         map.put("credentialsAccountKey", java.lang.String.class);
         map.put("credentialsAccountName", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(QueueServiceComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(QueueServiceComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.azure.queue.QueueServiceConfiguration getOrCreateConfiguration(QueueServiceComponent target) {
@@ -80,10 +80,37 @@ public class QueueServiceComponentConfigurer extends PropertyConfigurerSupport i
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "azurequeueclient":
+        case "azureQueueClient": return com.microsoft.azure.storage.queue.CloudQueue.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "configuration": return org.apache.camel.component.azure.queue.QueueServiceConfiguration.class;
+        case "credentials": return com.microsoft.azure.storage.StorageCredentials.class;
+        case "credentialsaccountkey":
+        case "credentialsAccountKey": return java.lang.String.class;
+        case "credentialsaccountname":
+        case "credentialsAccountName": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "messagetimetolive":
+        case "messageTimeToLive": return int.class;
+        case "messagevisibilitydelay":
+        case "messageVisibilityDelay": return int.class;
+        case "operation": return org.apache.camel.component.azure.queue.QueueServiceOperations.class;
+        case "queueprefix":
+        case "queuePrefix": return java.lang.String.class;
+        case "validateclienturi":
+        case "validateClientURI": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointConfigurer.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointConfigurer.java
index 3223983..3ef5e42 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointConfigurer.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointConfigurer.java
@@ -36,7 +36,7 @@ public class QueueServiceEndpointConfigurer extends PropertyConfigurerSupport im
         map.put("credentialsAccountKey", java.lang.String.class);
         map.put("credentialsAccountName", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(QueueServiceEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(QueueServiceEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -80,10 +80,41 @@ public class QueueServiceEndpointConfigurer extends PropertyConfigurerSupport im
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "azurequeueclient":
+        case "azureQueueClient": return com.microsoft.azure.storage.queue.CloudQueue.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "credentials": return com.microsoft.azure.storage.StorageCredentials.class;
+        case "credentialsaccountkey":
+        case "credentialsAccountKey": return java.lang.String.class;
+        case "credentialsaccountname":
+        case "credentialsAccountName": return java.lang.String.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "messagetimetolive":
+        case "messageTimeToLive": return int.class;
+        case "messagevisibilitydelay":
+        case "messageVisibilityDelay": return int.class;
+        case "operation": return org.apache.camel.component.azure.queue.QueueServiceOperations.class;
+        case "queueprefix":
+        case "queuePrefix": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "validateclienturi":
+        case "validateClientURI": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
index 8b6224b..3ab4ddb 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
@@ -28,7 +28,7 @@ public class BeanValidatorComponentConfigurer extends PropertyConfigurerSupport
         map.put("validationProviderResolver", javax.validation.ValidationProviderResolver.class);
         map.put("validatorFactory", javax.validation.ValidatorFactory.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BeanValidatorComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BeanValidatorComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -61,10 +61,30 @@ public class BeanValidatorComponentConfigurer extends PropertyConfigurerSupport
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "constraintvalidatorfactory":
+        case "constraintValidatorFactory": return javax.validation.ConstraintValidatorFactory.class;
+        case "ignorexmlconfiguration":
+        case "ignoreXmlConfiguration": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "messageinterpolator":
+        case "messageInterpolator": return javax.validation.MessageInterpolator.class;
+        case "traversableresolver":
+        case "traversableResolver": return javax.validation.TraversableResolver.class;
+        case "validationproviderresolver":
+        case "validationProviderResolver": return javax.validation.ValidationProviderResolver.class;
+        case "validatorfactory":
+        case "validatorFactory": return javax.validation.ValidatorFactory.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
index 50caa8b..20739e3 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
@@ -31,7 +31,7 @@ public class BeanValidatorEndpointConfigurer extends PropertyConfigurerSupport i
         map.put("validationProviderResolver", javax.validation.ValidationProviderResolver.class);
         map.put("validatorFactory", javax.validation.ValidatorFactory.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BeanValidatorEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BeanValidatorEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -66,10 +66,32 @@ public class BeanValidatorEndpointConfigurer extends PropertyConfigurerSupport i
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "constraintvalidatorfactory":
+        case "constraintValidatorFactory": return javax.validation.ConstraintValidatorFactory.class;
+        case "group": return java.lang.String.class;
+        case "ignorexmlconfiguration":
+        case "ignoreXmlConfiguration": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "messageinterpolator":
+        case "messageInterpolator": return javax.validation.MessageInterpolator.class;
+        case "synchronous": return boolean.class;
+        case "traversableresolver":
+        case "traversableResolver": return javax.validation.TraversableResolver.class;
+        case "validationproviderresolver":
+        case "validationProviderResolver": return javax.validation.ValidationProviderResolver.class;
+        case "validatorfactory":
+        case "validatorFactory": return javax.validation.ValidatorFactory.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanComponentConfigurer.java b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanComponentConfigurer.java
index ec98d3a..0e9966e 100644
--- a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanComponentConfigurer.java
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanComponentConfigurer.java
@@ -24,7 +24,7 @@ public class BeanComponentConfigurer extends PropertyConfigurerSupport implement
         map.put("scope", org.apache.camel.BeanScope.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BeanComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BeanComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -47,10 +47,20 @@ public class BeanComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "cache": return java.lang.Boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "scope": return org.apache.camel.BeanScope.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointConfigurer.java b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointConfigurer.java
index 48a79b1..add8319 100644
--- a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointConfigurer.java
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointConfigurer.java
@@ -28,7 +28,7 @@ public class BeanEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("parameters", java.util.Map.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BeanEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BeanEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -54,10 +54,23 @@ public class BeanEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "cache": return java.lang.Boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "method": return java.lang.String.class;
+        case "parameters": return java.util.Map.class;
+        case "scope": return org.apache.camel.BeanScope.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassComponentConfigurer.java b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassComponentConfigurer.java
index 774fb7d..cc80265 100644
--- a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassComponentConfigurer.java
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassComponentConfigurer.java
@@ -24,7 +24,7 @@ public class ClassComponentConfigurer extends BeanComponentConfigurer implements
         map.put("scope", org.apache.camel.BeanScope.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(ClassComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ClassComponentConfigurer::clearBootstrapConfigurers);
     }
 
 }
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointConfigurer.java b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointConfigurer.java
index 94ef297..c2a2907 100644
--- a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointConfigurer.java
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointConfigurer.java
@@ -28,7 +28,7 @@ public class ClassEndpointConfigurer extends BeanEndpointConfigurer implements G
         map.put("parameters", java.util.Map.class);
         map.put("synchronous", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(ClassEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(ClassEndpointConfigurer::clearBootstrapConfigurers);
     }
 
 }
diff --git a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkComponentConfigurer.java b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkComponentConfigurer.java
index 55ce70e..80510f1 100644
--- a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkComponentConfigurer.java
+++ b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkComponentConfigurer.java
@@ -24,7 +24,7 @@ public class BeanstalkComponentConfigurer extends PropertyConfigurerSupport impl
         map.put("basicPropertyBinding", boolean.class);
         map.put("connectionSettingsFactory", org.apache.camel.component.beanstalk.ConnectionSettingsFactory.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BeanstalkComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BeanstalkComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -49,10 +49,22 @@ public class BeanstalkComponentConfigurer extends PropertyConfigurerSupport impl
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "connectionsettingsfactory":
+        case "connectionSettingsFactory": return org.apache.camel.component.beanstalk.ConnectionSettingsFactory.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointConfigurer.java b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointConfigurer.java
index 5385dc2..4b26f05 100644
--- a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointConfigurer.java
+++ b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointConfigurer.java
@@ -50,7 +50,7 @@ public class BeanstalkEndpointConfigurer extends PropertyConfigurerSupport imple
         map.put("timeUnit", java.util.concurrent.TimeUnit.class);
         map.put("useFixedDelay", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BeanstalkEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BeanstalkEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -120,10 +120,67 @@ public class BeanstalkEndpointConfigurer extends PropertyConfigurerSupport imple
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "awaitjob":
+        case "awaitJob": return boolean.class;
+        case "backofferrorthreshold":
+        case "backoffErrorThreshold": return int.class;
+        case "backoffidlethreshold":
+        case "backoffIdleThreshold": return int.class;
+        case "backoffmultiplier":
+        case "backoffMultiplier": return int.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "command": return org.apache.camel.component.beanstalk.BeanstalkCommand.class;
+        case "delay": return long.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "greedy": return boolean.class;
+        case "initialdelay":
+        case "initialDelay": return long.class;
+        case "jobdelay":
+        case "jobDelay": return int.class;
+        case "jobpriority":
+        case "jobPriority": return long.class;
+        case "jobtimetorun":
+        case "jobTimeToRun": return int.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "onfailure":
+        case "onFailure": return org.apache.camel.component.beanstalk.BeanstalkCommand.class;
+        case "pollstrategy":
+        case "pollStrategy": return org.apache.camel.spi.PollingConsumerPollStrategy.class;
+        case "repeatcount":
+        case "repeatCount": return long.class;
+        case "runlogginglevel":
+        case "runLoggingLevel": return org.apache.camel.LoggingLevel.class;
+        case "scheduledexecutorservice":
+        case "scheduledExecutorService": return java.util.concurrent.ScheduledExecutorService.class;
+        case "scheduler": return java.lang.Object.class;
+        case "schedulerproperties":
+        case "schedulerProperties": return java.util.Map.class;
+        case "sendemptymessagewhenidle":
+        case "sendEmptyMessageWhenIdle": return boolean.class;
+        case "startscheduler":
+        case "startScheduler": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "timeunit":
+        case "timeUnit": return java.util.concurrent.TimeUnit.class;
+        case "useblockio":
+        case "useBlockIO": return boolean.class;
+        case "usefixeddelay":
+        case "useFixedDelay": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaComponentConfigurer.java b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaComponentConfigurer.java
index b8be88c..a4d385f 100644
--- a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaComponentConfigurer.java
+++ b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaComponentConfigurer.java
@@ -22,7 +22,7 @@ public class BonitaComponentConfigurer extends PropertyConfigurerSupport impleme
         map.put("lazyStartProducer", boolean.class);
         map.put("basicPropertyBinding", boolean.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BonitaComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BonitaComponentConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -43,10 +43,18 @@ public class BonitaComponentConfigurer extends PropertyConfigurerSupport impleme
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointConfigurer.java b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointConfigurer.java
index 423d169..72f5605 100644
--- a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointConfigurer.java
+++ b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointConfigurer.java
@@ -29,7 +29,7 @@ public class BonitaEndpointConfigurer extends PropertyConfigurerSupport implemen
         map.put("password", java.lang.String.class);
         map.put("username", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BonitaEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BonitaEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -57,10 +57,25 @@ public class BonitaEndpointConfigurer extends PropertyConfigurerSupport implemen
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "hostname": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "password": return java.lang.String.class;
+        case "port": return java.lang.String.class;
+        case "processname":
+        case "processName": return java.lang.String.class;
+        case "synchronous": return boolean.class;
+        case "username": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCollaborationsManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCollaborationsManagerEndpointConfiguration.java
index 5bf7715..10fa584 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCollaborationsManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCollaborationsManagerEndpointConfiguration.java
@@ -18,7 +18,7 @@ import org.apache.camel.spi.UriParams;
            description = "Provides operations to manage Box collaborations",
            apiMethods = {@ApiMethod(methodName = "addFolderCollaboration", description="Add a collaboration to this folder", signatures={"com.box.sdk.BoxCollaboration addFolderCollaboration(String folderId, com.box.sdk.BoxCollaborator collaborator, com.box.sdk.BoxCollaboration$Role role)"}), @ApiMethod(methodName = "addFolderCollaborationByEmail", description="Add a collaboration to this folder", signatures={"com.box.sdk.BoxCollaboration addFolderCollaborationByEmail(String folderId, Str [...]
 @UriParams
-@Configurer
+@Configurer(api = true)
 public final class BoxCollaborationsManagerEndpointConfiguration extends BoxConfiguration {
     @UriParam
     @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "deleteCollaboration", description="The id of comment to change"), @ApiMethod(methodName = "getCollaborationInfo", description="The id of collaboration"), @ApiMethod(methodName = "updateCollaborationInfo", description="The id of collaboration")})
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCollaborationsManagerEndpointConfigurationConfigurer.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCollaborationsManagerEndpointConfigurationConfigurer.java
index d24e4eb..0a8490e 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCollaborationsManagerEndpointConfigurationConfigurer.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCollaborationsManagerEndpointConfigurationConfigurer.java
@@ -43,7 +43,6 @@ public class BoxCollaborationsManagerEndpointConfigurationConfigurer extends org
         map.put("UserName", java.lang.String.class);
         map.put("UserPassword", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BoxCollaborationsManagerEndpointConfigurationConfigurer::clearConfigurers);
     }
 
     @Override
@@ -108,8 +107,57 @@ public class BoxCollaborationsManagerEndpointConfigurationConfigurer extends org
     public static void clearBootstrapConfigurers() {
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesstokencache":
+        case "AccessTokenCache": return com.box.sdk.IAccessTokenCache.class;
+        case "apiname":
+        case "ApiName": return org.apache.camel.component.box.internal.BoxApiName.class;
+        case "authenticationtype":
+        case "AuthenticationType": return java.lang.String.class;
+        case "clientid":
+        case "ClientId": return java.lang.String.class;
+        case "clientsecret":
+        case "ClientSecret": return java.lang.String.class;
+        case "collaborationid":
+        case "CollaborationId": return java.lang.String.class;
+        case "collaborator":
+        case "Collaborator": return com.box.sdk.BoxCollaborator.class;
+        case "email":
+        case "Email": return java.lang.String.class;
+        case "encryptionalgorithm":
+        case "EncryptionAlgorithm": return com.box.sdk.EncryptionAlgorithm.class;
+        case "enterpriseid":
+        case "EnterpriseId": return java.lang.String.class;
+        case "folderid":
+        case "FolderId": return java.lang.String.class;
+        case "httpparams":
+        case "HttpParams": return java.util.Map.class;
+        case "info":
+        case "Info": return com.box.sdk.BoxCollaboration.Info.class;
+        case "maxcacheentries":
+        case "MaxCacheEntries": return int.class;
+        case "methodname":
+        case "MethodName": return java.lang.String.class;
+        case "privatekeyfile":
+        case "PrivateKeyFile": return java.lang.String.class;
+        case "privatekeypassword":
+        case "PrivateKeyPassword": return java.lang.String.class;
+        case "publickeyid":
+        case "PublicKeyId": return java.lang.String.class;
+        case "role":
+        case "Role": return com.box.sdk.BoxCollaboration.Role.class;
+        case "sslcontextparameters":
+        case "SslContextParameters": return org.apache.camel.support.jsse.SSLContextParameters.class;
+        case "userid":
+        case "UserId": return java.lang.String.class;
+        case "username":
+        case "UserName": return java.lang.String.class;
+        case "userpassword":
+        case "UserPassword": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCommentsManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCommentsManagerEndpointConfiguration.java
index 3f02955..d84065e 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCommentsManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCommentsManagerEndpointConfiguration.java
@@ -18,7 +18,7 @@ import org.apache.camel.spi.UriParams;
            description = "Provides operations to manage Box comments",
            apiMethods = {@ApiMethod(methodName = "addFileComment", description="Add comment to file", signatures={"com.box.sdk.BoxFile addFileComment(String fileId, String message)"}), @ApiMethod(methodName = "changeCommentMessage", description="Change comment message", signatures={"com.box.sdk.BoxComment changeCommentMessage(String commentId, String message)"}), @ApiMethod(methodName = "deleteComment", description="Delete comment", signatures={"void deleteComment(String commentId)"}), @ [...]
 @UriParams
-@Configurer
+@Configurer(api = true)
 public final class BoxCommentsManagerEndpointConfiguration extends BoxConfiguration {
     @UriParam
     @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "changeCommentMessage", description="The id of comment to change"), @ApiMethod(methodName = "deleteComment", description="The id of comment to delete"), @ApiMethod(methodName = "getCommentInfo", description="The id of comment"), @ApiMethod(methodName = "replyToComment", description="The id of comment to reply to")})
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCommentsManagerEndpointConfigurationConfigurer.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCommentsManagerEndpointConfigurationConfigurer.java
index f929433..a5cdacb 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCommentsManagerEndpointConfigurationConfigurer.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxCommentsManagerEndpointConfigurationConfigurer.java
@@ -40,7 +40,6 @@ public class BoxCommentsManagerEndpointConfigurationConfigurer extends org.apach
         map.put("UserName", java.lang.String.class);
         map.put("UserPassword", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BoxCommentsManagerEndpointConfigurationConfigurer::clearConfigurers);
     }
 
     @Override
@@ -99,8 +98,51 @@ public class BoxCommentsManagerEndpointConfigurationConfigurer extends org.apach
     public static void clearBootstrapConfigurers() {
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesstokencache":
+        case "AccessTokenCache": return com.box.sdk.IAccessTokenCache.class;
+        case "apiname":
+        case "ApiName": return org.apache.camel.component.box.internal.BoxApiName.class;
+        case "authenticationtype":
+        case "AuthenticationType": return java.lang.String.class;
+        case "clientid":
+        case "ClientId": return java.lang.String.class;
+        case "clientsecret":
+        case "ClientSecret": return java.lang.String.class;
+        case "commentid":
+        case "CommentId": return java.lang.String.class;
+        case "encryptionalgorithm":
+        case "EncryptionAlgorithm": return com.box.sdk.EncryptionAlgorithm.class;
+        case "enterpriseid":
+        case "EnterpriseId": return java.lang.String.class;
+        case "fileid":
+        case "FileId": return java.lang.String.class;
+        case "httpparams":
+        case "HttpParams": return java.util.Map.class;
+        case "maxcacheentries":
+        case "MaxCacheEntries": return int.class;
+        case "message":
+        case "Message": return java.lang.String.class;
+        case "methodname":
+        case "MethodName": return java.lang.String.class;
+        case "privatekeyfile":
+        case "PrivateKeyFile": return java.lang.String.class;
+        case "privatekeypassword":
+        case "PrivateKeyPassword": return java.lang.String.class;
+        case "publickeyid":
+        case "PublicKeyId": return java.lang.String.class;
+        case "sslcontextparameters":
+        case "SslContextParameters": return org.apache.camel.support.jsse.SSLContextParameters.class;
+        case "userid":
+        case "UserId": return java.lang.String.class;
+        case "username":
+        case "UserName": return java.lang.String.class;
+        case "userpassword":
+        case "UserPassword": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxComponentConfigurer.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxComponentConfigurer.java
index 6260a8d..fee4f72 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxComponentConfigurer.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxComponentConfigurer.java
@@ -39,7 +39,7 @@ public class BoxComponentConfigurer extends PropertyConfigurerSupport implements
         map.put("userName", java.lang.String.class);
         map.put("userPassword", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BoxComponentConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BoxComponentConfigurer::clearBootstrapConfigurers);
     }
 
     private org.apache.camel.component.box.BoxConfiguration getOrCreateConfiguration(BoxComponent target) {
@@ -100,10 +100,51 @@ public class BoxComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesstokencache":
+        case "accessTokenCache": return com.box.sdk.IAccessTokenCache.class;
+        case "authenticationtype":
+        case "authenticationType": return java.lang.String.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "clientid":
+        case "clientId": return java.lang.String.class;
+        case "clientsecret":
+        case "clientSecret": return java.lang.String.class;
+        case "configuration": return org.apache.camel.component.box.BoxConfiguration.class;
+        case "encryptionalgorithm":
+        case "encryptionAlgorithm": return com.box.sdk.EncryptionAlgorithm.class;
+        case "enterpriseid":
+        case "enterpriseId": return java.lang.String.class;
+        case "httpparams":
+        case "httpParams": return java.util.Map.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxcacheentries":
+        case "maxCacheEntries": return int.class;
+        case "privatekeyfile":
+        case "privateKeyFile": return java.lang.String.class;
+        case "privatekeypassword":
+        case "privateKeyPassword": return java.lang.String.class;
+        case "publickeyid":
+        case "publicKeyId": return java.lang.String.class;
+        case "sslcontextparameters":
+        case "sslContextParameters": return org.apache.camel.support.jsse.SSLContextParameters.class;
+        case "userid":
+        case "userId": return java.lang.String.class;
+        case "username":
+        case "userName": return java.lang.String.class;
+        case "userpassword":
+        case "userPassword": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxConfigurationConfigurer.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxConfigurationConfigurer.java
index 385fbad..f660eca 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxConfigurationConfigurer.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxConfigurationConfigurer.java
@@ -37,7 +37,6 @@ public class BoxConfigurationConfigurer extends org.apache.camel.support.compone
         map.put("UserName", java.lang.String.class);
         map.put("UserPassword", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BoxConfigurationConfigurer::clearConfigurers);
     }
 
     @Override
@@ -90,8 +89,45 @@ public class BoxConfigurationConfigurer extends org.apache.camel.support.compone
     public static void clearBootstrapConfigurers() {
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesstokencache":
+        case "AccessTokenCache": return com.box.sdk.IAccessTokenCache.class;
+        case "apiname":
+        case "ApiName": return org.apache.camel.component.box.internal.BoxApiName.class;
+        case "authenticationtype":
+        case "AuthenticationType": return java.lang.String.class;
+        case "clientid":
+        case "ClientId": return java.lang.String.class;
+        case "clientsecret":
+        case "ClientSecret": return java.lang.String.class;
+        case "encryptionalgorithm":
+        case "EncryptionAlgorithm": return com.box.sdk.EncryptionAlgorithm.class;
+        case "enterpriseid":
+        case "EnterpriseId": return java.lang.String.class;
+        case "httpparams":
+        case "HttpParams": return java.util.Map.class;
+        case "maxcacheentries":
+        case "MaxCacheEntries": return int.class;
+        case "methodname":
+        case "MethodName": return java.lang.String.class;
+        case "privatekeyfile":
+        case "PrivateKeyFile": return java.lang.String.class;
+        case "privatekeypassword":
+        case "PrivateKeyPassword": return java.lang.String.class;
+        case "publickeyid":
+        case "PublicKeyId": return java.lang.String.class;
+        case "sslcontextparameters":
+        case "SslContextParameters": return org.apache.camel.support.jsse.SSLContextParameters.class;
+        case "userid":
+        case "UserId": return java.lang.String.class;
+        case "username":
+        case "UserName": return java.lang.String.class;
+        case "userpassword":
+        case "UserPassword": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointConfigurer.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointConfigurer.java
index 0efc0c4..006ad10 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointConfigurer.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointConfigurer.java
@@ -43,7 +43,7 @@ public class BoxEndpointConfigurer extends PropertyConfigurerSupport implements
         map.put("userName", java.lang.String.class);
         map.put("userPassword", java.lang.String.class);
         ALL_OPTIONS = map;
-        ConfigurerStrategy.addConfigurerClearer(BoxEndpointConfigurer::clearConfigurers);
+        ConfigurerStrategy.addBootstrapConfigurerClearer(BoxEndpointConfigurer::clearBootstrapConfigurers);
     }
 
     @Override
@@ -101,10 +101,55 @@ public class BoxEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     public static void clearBootstrapConfigurers() {
+        ALL_OPTIONS.clear();
     }
 
-    public static void clearConfigurers() {
-        ALL_OPTIONS.clear();
+    @Override
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "accesstokencache":
+        case "accessTokenCache": return com.box.sdk.IAccessTokenCache.class;
+        case "authenticationtype":
+        case "authenticationType": return java.lang.String.class;
+        case "basicpropertybinding":
+        case "basicPropertyBinding": return boolean.class;
+        case "clientid":
+        case "clientId": return java.lang.String.class;
+        case "clientsecret":
+        case "clientSecret": return java.lang.String.class;
+        case "encryptionalgorithm":
+        case "encryptionAlgorithm": return com.box.sdk.EncryptionAlgorithm.class;
+        case "enterpriseid":
+        case "enterpriseId": return java.lang.String.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "httpparams":
+        case "httpParams": return java.util.Map.class;
+        case "inbody":
+        case "inBody": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "maxcacheentries":
+        case "maxCacheEntries": return int.class;
+        case "privatekeyfile":
+        case "privateKeyFile": return java.lang.String.class;
+        case "privatekeypassword":
+        case "privateKeyPassword": return java.lang.String.class;
+        case "publickeyid":
+        case "publicKeyId": return java.lang.String.class;
+        case "sslcontextparameters":
+        case "sslContextParameters": return org.apache.camel.support.jsse.SSLContextParameters.class;
+        case "synchronous": return boolean.class;
+        case "userid":
+        case "userId": return java.lang.String.class;
+        case "username":
+        case "userName": return java.lang.String.class;
+        case "userpassword":
+        case "userPassword": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEventLogsManagerEndpointConfiguration.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEventLogsManagerEndpointConfiguration.java
index 6192af8..90dc327 100644
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEventLogsManagerEndpointConfiguration.java
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEventLogsManagerEndpointConfiguration.java
@@ -18,7 +18,7 @@ import org.apache.camel.spi.UriParams;
            description = "Provides operations to read Box enterprise (admin) event logs",
            apiMethods = {@ApiMethod(methodName = "getEnterpriseEvents", description="Create an event stream with optional starting initial position and add listener that will be notified when an event is received", signatures={"java.util.List<com.box.sdk.BoxEvent> getEnterpriseEvents(String position, java.util.Date after, java.util.Date before, com.box.sdk.BoxEvent$Type[] types)"})}, aliases = {"getEnterpriseEvents=events"})
 @UriParams
-@Configurer
+@Configurer(api = true)
 public final class BoxEventLogsManagerEndpointConfiguration extends BoxConfiguration {
... 42377 lines suppressed ...