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 2021/12/21 13:53:34 UTC

[camel] branch main updated (2825e99 -> 0668b87)

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

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


    from 2825e99  Update graceful-shutdown.adoc (#6579)
     new 1df8926  CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.
     new 96b4c89  CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.
     new c73b6ed  CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.
     new fb3b14b  CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.
     new 0668b87  CAMEL-17194: componentdsl - Prepare for generate only once during project build. WIP.

The 5 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:
 .../ROOT/pages/camel-3x-upgrade-guide-3_15.adoc    |  10 +
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   | 134 +++----
 .../endpoint/dsl/AS2EndpointBuilderFactory.java    | 176 ++-------
 .../dsl/AWS2EC2EndpointBuilderFactory.java         |  39 +-
 .../endpoint/dsl/AWS2S3EndpointBuilderFactory.java |  86 ++---
 .../dsl/ActiveMQEndpointBuilderFactory.java        | 131 +++----
 .../endpoint/dsl/AhcEndpointBuilderFactory.java    |  18 +-
 .../dsl/ArangoDbEndpointBuilderFactory.java        |  27 +-
 .../dsl/AsteriskEndpointBuilderFactory.java        |  23 +-
 .../dsl/Athena2EndpointBuilderFactory.java         |  59 +--
 .../dsl/AtlasMapEndpointBuilderFactory.java        |  20 +-
 .../endpoint/dsl/AtmosEndpointBuilderFactory.java  |  10 +-
 .../AtmosphereWebsocketEndpointBuilderFactory.java |  23 +-
 .../endpoint/dsl/AtomEndpointBuilderFactory.java   |  20 +-
 .../dsl/AtomixMapEndpointBuilderFactory.java       | 154 ++------
 .../dsl/AtomixMessagingEndpointBuilderFactory.java | 172 +++------
 .../dsl/AtomixMultiMapEndpointBuilderFactory.java  |  70 +---
 .../dsl/AtomixQueueEndpointBuilderFactory.java     | 153 ++------
 .../dsl/AtomixSetEndpointBuilderFactory.java       | 148 ++------
 .../dsl/AtomixValueEndpointBuilderFactory.java     | 148 ++------
 .../endpoint/dsl/AvroEndpointBuilderFactory.java   |  18 +-
 .../endpoint/dsl/BeanEndpointBuilderFactory.java   |   7 +-
 .../dsl/BeanValidatorEndpointBuilderFactory.java   |  14 +-
 .../dsl/BeanstalkEndpointBuilderFactory.java       |  40 +-
 .../endpoint/dsl/BlobEndpointBuilderFactory.java   | 118 ++----
 .../endpoint/dsl/BonitaEndpointBuilderFactory.java |   4 +
 .../endpoint/dsl/BoxEndpointBuilderFactory.java    |  44 +--
 .../dsl/BraintreeEndpointBuilderFactory.java       |   4 +
 .../endpoint/dsl/BrowseEndpointBuilderFactory.java |  10 +-
 .../endpoint/dsl/CMEndpointBuilderFactory.java     |   4 +
 .../endpoint/dsl/CMISEndpointBuilderFactory.java   |  16 +-
 .../dsl/CaffeineCacheEndpointBuilderFactory.java   |  23 +-
 .../CaffeineLoadCacheEndpointBuilderFactory.java   |  22 +-
 .../dsl/CassandraEndpointBuilderFactory.java       |  58 +--
 .../dsl/ChatScriptEndpointBuilderFactory.java      |   4 +
 .../endpoint/dsl/ChunkEndpointBuilderFactory.java  |   4 +
 .../endpoint/dsl/CinderEndpointBuilderFactory.java |   7 +-
 .../endpoint/dsl/ClassEndpointBuilderFactory.java  |   7 +-
 .../endpoint/dsl/ClientEndpointBuilderFactory.java |  71 ++--
 .../endpoint/dsl/CoAPEndpointBuilderFactory.java   |  51 +--
 .../endpoint/dsl/CometdEndpointBuilderFactory.java |  10 +-
 .../endpoint/dsl/ConsulEndpointBuilderFactory.java | 123 +++---
 .../dsl/ControlBusEndpointBuilderFactory.java      |   8 +-
 .../endpoint/dsl/CordaEndpointBuilderFactory.java  |  21 +-
 .../dsl/CosmosDbEndpointBuilderFactory.java        |  71 +---
 .../dsl/CouchDbEndpointBuilderFactory.java         |  12 +-
 .../dsl/CouchbaseEndpointBuilderFactory.java       |  18 +-
 .../endpoint/dsl/CronEndpointBuilderFactory.java   |  10 +-
 .../endpoint/dsl/Cw2EndpointBuilderFactory.java    |  21 +-
 .../endpoint/dsl/CxfEndpointBuilderFactory.java    |  74 ++--
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  | 160 +++-----
 .../endpoint/dsl/DJLEndpointBuilderFactory.java    |   4 +
 .../endpoint/dsl/DMSEndpointBuilderFactory.java    |  11 +-
 .../dsl/DataFormatEndpointBuilderFactory.java      |   4 +
 .../dsl/DataLakeEndpointBuilderFactory.java        |  85 ++---
 .../dsl/DataSetEndpointBuilderFactory.java         |  18 +-
 .../dsl/DataSetTestEndpointBuilderFactory.java     |   4 +
 .../endpoint/dsl/Ddb2EndpointBuilderFactory.java   |  38 +-
 .../dsl/Ddb2StreamEndpointBuilderFactory.java      |  46 +--
 .../dsl/DebeziumMongodbEndpointBuilderFactory.java |  10 +-
 .../dsl/DebeziumMySqlEndpointBuilderFactory.java   |  10 +-
 .../DebeziumPostgresEndpointBuilderFactory.java    |  10 +-
 .../DebeziumSqlserverEndpointBuilderFactory.java   |  10 +-
 .../dsl/DigitalOceanEndpointBuilderFactory.java    |  26 +-
 .../DigitalSignatureEndpointBuilderFactory.java    |  23 +-
 .../endpoint/dsl/DirectEndpointBuilderFactory.java |  10 +-
 .../dsl/DirectVmEndpointBuilderFactory.java        |  13 +-
 .../dsl/DisruptorEndpointBuilderFactory.java       |  39 +-
 .../dsl/DisruptorVmEndpointBuilderFactory.java     |  39 +-
 .../endpoint/dsl/DnsEndpointBuilderFactory.java    |   4 +
 .../endpoint/dsl/DockerEndpointBuilderFactory.java |  17 +-
 .../endpoint/dsl/DozerEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/DrillEndpointBuilderFactory.java  |  16 +-
 .../dsl/DropboxEndpointBuilderFactory.java         |  36 +-
 .../endpoint/dsl/ECS2EndpointBuilderFactory.java   |  32 +-
 .../endpoint/dsl/EKS2EndpointBuilderFactory.java   |  32 +-
 .../dsl/EhcacheEndpointBuilderFactory.java         |  88 ++---
 .../dsl/ElasticsearchEndpointBuilderFactory.java   |  25 +-
 .../endpoint/dsl/ElsqlEndpointBuilderFactory.java  |  80 ++--
 .../dsl/EtcdKeysEndpointBuilderFactory.java        |   6 +-
 .../dsl/EtcdStatsEndpointBuilderFactory.java       |  24 +-
 .../dsl/EtcdWatchEndpointBuilderFactory.java       |  12 +-
 .../endpoint/dsl/EventEndpointBuilderFactory.java  |  10 +-
 .../dsl/EventHubsEndpointBuilderFactory.java       |  39 +-
 .../dsl/EventbridgeEndpointBuilderFactory.java     |  36 +-
 .../endpoint/dsl/ExecEndpointBuilderFactory.java   |  14 +-
 .../dsl/FacebookEndpointBuilderFactory.java        | 175 +++++----
 .../endpoint/dsl/FhirEndpointBuilderFactory.java   | 309 ++-------------
 .../endpoint/dsl/FileEndpointBuilderFactory.java   | 352 ++---------------
 .../dsl/FileWatchEndpointBuilderFactory.java       |  27 +-
 .../dsl/FlatpackEndpointBuilderFactory.java        |  18 +-
 .../endpoint/dsl/FlinkEndpointBuilderFactory.java  |  15 +-
 .../endpoint/dsl/FopEndpointBuilderFactory.java    |   7 +-
 .../dsl/FreemarkerEndpointBuilderFactory.java      |   7 +-
 .../endpoint/dsl/FtpEndpointBuilderFactory.java    | 402 +++-----------------
 .../endpoint/dsl/FtpsEndpointBuilderFactory.java   | 408 +++-----------------
 .../dsl/FunctionGraphEndpointBuilderFactory.java   |   7 +-
 .../dsl/GangliaEndpointBuilderFactory.java         |  54 +--
 .../dsl/GeoCoderEndpointBuilderFactory.java        |  16 +-
 .../endpoint/dsl/GitEndpointBuilderFactory.java    |  23 +-
 .../endpoint/dsl/GitHubEndpointBuilderFactory.java |  20 +-
 .../endpoint/dsl/GlanceEndpointBuilderFactory.java |   7 +-
 .../dsl/GoogleBigQueryEndpointBuilderFactory.java  |   6 +-
 .../GoogleBigQuerySQLEndpointBuilderFactory.java   |   6 +-
 .../dsl/GoogleCalendarEndpointBuilderFactory.java  |  18 +-
 ...GoogleCalendarStreamEndpointBuilderFactory.java |  22 +-
 ...GoogleCloudFunctionsEndpointBuilderFactory.java |  24 +-
 .../GoogleCloudStorageEndpointBuilderFactory.java  |  46 +--
 .../dsl/GoogleDriveEndpointBuilderFactory.java     |  34 +-
 .../dsl/GoogleMailEndpointBuilderFactory.java      |  18 +-
 .../GoogleMailStreamEndpointBuilderFactory.java    |  18 +-
 .../dsl/GooglePubsubEndpointBuilderFactory.java    |  28 +-
 .../dsl/GoogleSheetsEndpointBuilderFactory.java    |  18 +-
 .../GoogleSheetsStreamEndpointBuilderFactory.java  |  22 +-
 .../endpoint/dsl/GoraEndpointBuilderFactory.java   |  19 +-
 .../endpoint/dsl/GrapeEndpointBuilderFactory.java  |   4 +
 .../dsl/GraphqlEndpointBuilderFactory.java         |   7 +-
 .../endpoint/dsl/GridFsEndpointBuilderFactory.java |  41 +-
 .../endpoint/dsl/GrpcEndpointBuilderFactory.java   |  80 +---
 .../dsl/GuavaEventBusEndpointBuilderFactory.java   |  23 +-
 .../endpoint/dsl/HBaseEndpointBuilderFactory.java  |  44 ++-
 ...azelcastAtomicnumberEndpointBuilderFactory.java |  52 +--
 .../HazelcastInstanceEndpointBuilderFactory.java   |  58 +--
 .../dsl/HazelcastListEndpointBuilderFactory.java   |  66 +---
 .../dsl/HazelcastMapEndpointBuilderFactory.java    |  66 +---
 .../HazelcastMultimapEndpointBuilderFactory.java   |  66 +---
 .../dsl/HazelcastQueueEndpointBuilderFactory.java  |  77 +---
 ...zelcastReplicatedmapEndpointBuilderFactory.java |  66 +---
 .../HazelcastRingbufferEndpointBuilderFactory.java |  52 +--
 .../dsl/HazelcastSedaEndpointBuilderFactory.java   |  66 +---
 .../dsl/HazelcastSetEndpointBuilderFactory.java    |  66 +---
 .../dsl/HazelcastTopicEndpointBuilderFactory.java  |  66 +---
 .../endpoint/dsl/HdfsEndpointBuilderFactory.java   | 132 ++-----
 .../endpoint/dsl/HttpEndpointBuilderFactory.java   |  58 ++-
 .../endpoint/dsl/IAM2EndpointBuilderFactory.java   |  41 +-
 .../endpoint/dsl/IAMEndpointBuilderFactory.java    |   7 +-
 .../endpoint/dsl/IOTAEndpointBuilderFactory.java   |   4 +
 .../endpoint/dsl/IPFSEndpointBuilderFactory.java   |   4 +
 .../dsl/IgniteCacheEndpointBuilderFactory.java     |  50 +--
 .../dsl/IgniteComputeEndpointBuilderFactory.java   |  22 +-
 .../dsl/IgniteEventsEndpointBuilderFactory.java    |  12 +-
 .../dsl/IgniteIdGenEndpointBuilderFactory.java     |  19 +-
 .../dsl/IgniteMessagingEndpointBuilderFactory.java |  23 +-
 .../dsl/IgniteQueueEndpointBuilderFactory.java     |  32 +-
 .../dsl/IgniteSetEndpointBuilderFactory.java       |  26 +-
 .../ImageRecognitionEndpointBuilderFactory.java    |   7 +-
 .../InfinispanEmbeddedEndpointBuilderFactory.java  | 159 +-------
 .../InfinispanRemoteEndpointBuilderFactory.java    | 141 ++-----
 .../dsl/InfluxDbEndpointBuilderFactory.java        |   4 +
 .../endpoint/dsl/IrcEndpointBuilderFactory.java    |  25 +-
 .../endpoint/dsl/IronMQEndpointBuilderFactory.java |  26 +-
 .../endpoint/dsl/JBPMEndpointBuilderFactory.java   |  41 +-
 .../endpoint/dsl/JCacheEndpointBuilderFactory.java |  56 +--
 .../dsl/JGroupsEndpointBuilderFactory.java         |  10 +-
 .../dsl/JGroupsRaftEndpointBuilderFactory.java     |  10 +-
 .../endpoint/dsl/JMXEndpointBuilderFactory.java    |  13 +-
 .../dsl/JSR356WebSocketEndpointBuilderFactory.java |  10 +-
 .../dsl/JcloudsEndpointBuilderFactory.java         |  10 +-
 .../endpoint/dsl/JcrEndpointBuilderFactory.java    |  10 +-
 .../endpoint/dsl/JdbcEndpointBuilderFactory.java   |  24 +-
 .../dsl/JettyHttpEndpointBuilderFactory.java       |  35 +-
 .../endpoint/dsl/JingEndpointBuilderFactory.java   |   4 +
 .../endpoint/dsl/JiraEndpointBuilderFactory.java   |  10 +-
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    | 134 +++----
 .../endpoint/dsl/JoltEndpointBuilderFactory.java   |  34 +-
 .../endpoint/dsl/JooqEndpointBuilderFactory.java   |  37 +-
 .../endpoint/dsl/JpaEndpointBuilderFactory.java    |  48 +--
 .../endpoint/dsl/JsltEndpointBuilderFactory.java   |   7 +-
 .../dsl/JsonPatchEndpointBuilderFactory.java       |   4 +
 .../dsl/JsonValidatorEndpointBuilderFactory.java   |   8 +-
 .../dsl/JsonataEndpointBuilderFactory.java         |  18 +-
 .../endpoint/dsl/Jt400EndpointBuilderFactory.java  |  85 ++---
 .../endpoint/dsl/KMS2EndpointBuilderFactory.java   |  34 +-
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  |  56 ++-
 .../dsl/KameletEndpointBuilderFactory.java         |  10 +-
 .../dsl/KameletReifyEndpointBuilderFactory.java    |  10 +-
 .../dsl/KeystoneEndpointBuilderFactory.java        |   7 +-
 .../dsl/Kinesis2EndpointBuilderFactory.java        |  68 +---
 .../KinesisFirehose2EndpointBuilderFactory.java    |  30 +-
 ...KubernetesConfigMapsEndpointBuilderFactory.java |   6 +-
 ...netesCustomResourcesEndpointBuilderFactory.java |  16 +-
 ...ubernetesDeploymentsEndpointBuilderFactory.java |  16 +-
 .../dsl/KubernetesHPAEndpointBuilderFactory.java   |  16 +-
 .../dsl/KubernetesJobEndpointBuilderFactory.java   |  16 +-
 ...KubernetesNamespacesEndpointBuilderFactory.java |  16 +-
 .../dsl/KubernetesNodesEndpointBuilderFactory.java |  16 +-
 ...sistentVolumesClaimsEndpointBuilderFactory.java |   6 +-
 ...tesPersistentVolumesEndpointBuilderFactory.java |   6 +-
 .../dsl/KubernetesPodsEndpointBuilderFactory.java  |  16 +-
 ...plicationControllersEndpointBuilderFactory.java |  16 +-
 ...rnetesResourcesQuotaEndpointBuilderFactory.java |   6 +-
 .../KubernetesSecretsEndpointBuilderFactory.java   |   6 +-
 ...netesServiceAccountsEndpointBuilderFactory.java |   6 +-
 .../KubernetesServicesEndpointBuilderFactory.java  |  16 +-
 .../endpoint/dsl/KuduEndpointBuilderFactory.java   |  17 +-
 .../dsl/Lambda2EndpointBuilderFactory.java         |  46 +--
 .../dsl/LanguageEndpointBuilderFactory.java        |   4 +
 .../endpoint/dsl/LdapEndpointBuilderFactory.java   |   4 +
 .../endpoint/dsl/LdifEndpointBuilderFactory.java   |   4 +
 .../endpoint/dsl/LogEndpointBuilderFactory.java    |  24 +-
 .../endpoint/dsl/LuceneEndpointBuilderFactory.java |  12 +-
 .../dsl/LumberjackEndpointBuilderFactory.java      |  12 +-
 .../endpoint/dsl/MQ2EndpointBuilderFactory.java    |  34 +-
 .../endpoint/dsl/MSK2EndpointBuilderFactory.java   |  32 +-
 .../endpoint/dsl/MailEndpointBuilderFactory.java   |  80 ++--
 .../endpoint/dsl/MasterEndpointBuilderFactory.java |  10 +-
 .../dsl/MetricsEndpointBuilderFactory.java         |  16 +-
 .../MicroProfileMetricsEndpointBuilderFactory.java |   4 +
 .../dsl/MicrometerEndpointBuilderFactory.java      |   4 +
 .../dsl/MiloClientEndpointBuilderFactory.java      | 108 +-----
 .../dsl/MiloServerEndpointBuilderFactory.java      |  10 +-
 .../endpoint/dsl/MinaEndpointBuilderFactory.java   |  56 ++-
 .../endpoint/dsl/MinioEndpointBuilderFactory.java  |  69 ++--
 .../endpoint/dsl/MllpEndpointBuilderFactory.java   |  22 +-
 .../endpoint/dsl/MockEndpointBuilderFactory.java   |   4 +
 .../dsl/MongoDbEndpointBuilderFactory.java         |  62 +--
 .../endpoint/dsl/MsvEndpointBuilderFactory.java    |  14 +-
 .../dsl/MustacheEndpointBuilderFactory.java        |   4 +
 .../endpoint/dsl/MvelEndpointBuilderFactory.java   |   4 +
 .../dsl/MyBatisBeanEndpointBuilderFactory.java     |  15 +-
 .../dsl/MyBatisEndpointBuilderFactory.java         |  48 +--
 .../endpoint/dsl/NagiosEndpointBuilderFactory.java |  21 +-
 .../endpoint/dsl/NatsEndpointBuilderFactory.java   |  32 +-
 .../dsl/NetWeaverEndpointBuilderFactory.java       |   4 +
 .../endpoint/dsl/NettyEndpointBuilderFactory.java  | 109 +++---
 .../dsl/NettyHttpEndpointBuilderFactory.java       | 113 +++---
 .../dsl/NeutronEndpointBuilderFactory.java         |   7 +-
 .../dsl/NitriteEndpointBuilderFactory.java         |  16 +-
 .../endpoint/dsl/NovaEndpointBuilderFactory.java   |   7 +-
 .../endpoint/dsl/NsqEndpointBuilderFactory.java    |  18 +-
 .../endpoint/dsl/OAIPMHEndpointBuilderFactory.java |  18 +-
 .../endpoint/dsl/OBSEndpointBuilderFactory.java    |  27 +-
 .../dsl/Olingo2EndpointBuilderFactory.java         |  62 +--
 .../dsl/Olingo4EndpointBuilderFactory.java         |  50 +--
 ...penshiftBuildConfigsEndpointBuilderFactory.java |   6 +-
 .../dsl/OpenshiftBuildsEndpointBuilderFactory.java |   6 +-
 .../dsl/OptaPlannerEndpointBuilderFactory.java     |  10 +-
 .../endpoint/dsl/PahoEndpointBuilderFactory.java   |  51 ++-
 .../dsl/PahoMqtt5EndpointBuilderFactory.java       |  62 ++-
 .../endpoint/dsl/PdfEndpointBuilderFactory.java    |  15 +-
 .../dsl/PgEventEndpointBuilderFactory.java         |  19 +-
 .../PgReplicationSlotEndpointBuilderFactory.java   |  18 +-
 .../dsl/PlatformHttpEndpointBuilderFactory.java    |  15 +-
 .../dsl/PrinterEndpointBuilderFactory.java         |   6 +-
 .../endpoint/dsl/PubNubEndpointBuilderFactory.java |  19 +-
 .../endpoint/dsl/PulsarEndpointBuilderFactory.java |  77 +---
 .../endpoint/dsl/QuartzEndpointBuilderFactory.java |  12 +-
 .../endpoint/dsl/QueueEndpointBuilderFactory.java  |  75 ++--
 .../dsl/QuickfixjEndpointBuilderFactory.java       |  10 +-
 .../dsl/RabbitMQEndpointBuilderFactory.java        |  41 +-
 .../dsl/ReactiveStreamsEndpointBuilderFactory.java |  22 +-
 .../endpoint/dsl/RedisEndpointBuilderFactory.java  | 182 ++-------
 .../endpoint/dsl/RefEndpointBuilderFactory.java    |  10 +-
 .../dsl/RestApiEndpointBuilderFactory.java         |  10 +-
 .../endpoint/dsl/RestEndpointBuilderFactory.java   |  28 +-
 .../dsl/RestOpenApiEndpointBuilderFactory.java     |   4 +
 .../dsl/RestSwaggerEndpointBuilderFactory.java     |   6 +-
 .../dsl/ResteasyEndpointBuilderFactory.java        |  36 +-
 .../dsl/RobotFrameworkEndpointBuilderFactory.java  |  74 ++--
 .../endpoint/dsl/RssEndpointBuilderFactory.java    |  20 +-
 .../endpoint/dsl/STS2EndpointBuilderFactory.java   |  31 +-
 .../endpoint/dsl/SagaEndpointBuilderFactory.java   |   4 +
 .../dsl/SalesforceEndpointBuilderFactory.java      | 135 +++----
 .../dsl/SchedulerEndpointBuilderFactory.java       |  18 +-
 .../dsl/SchematronEndpointBuilderFactory.java      |  10 +-
 .../endpoint/dsl/ScpEndpointBuilderFactory.java    |  42 +--
 .../dsl/SecretsManagerEndpointBuilderFactory.java  |  34 +-
 .../endpoint/dsl/SedaEndpointBuilderFactory.java   |  14 +-
 .../endpoint/dsl/ServerEndpointBuilderFactory.java |  71 ++--
 .../dsl/ServiceBusEndpointBuilderFactory.java      | 119 ++----
 .../dsl/ServiceEndpointBuilderFactory.java         |  10 +-
 .../dsl/ServiceNowEndpointBuilderFactory.java      |  27 +-
 .../dsl/ServletEndpointBuilderFactory.java         |  16 +-
 .../endpoint/dsl/Ses2EndpointBuilderFactory.java   |  18 +-
 .../endpoint/dsl/SftpEndpointBuilderFactory.java   | 416 ++++-----------------
 .../SimpleNotificationEndpointBuilderFactory.java  |   7 +-
 .../endpoint/dsl/SipEndpointBuilderFactory.java    | 136 ++++---
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  |  77 ++--
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |  77 ++--
 .../endpoint/dsl/SlackEndpointBuilderFactory.java  |  30 +-
 .../endpoint/dsl/SmppEndpointBuilderFactory.java   |  39 +-
 .../endpoint/dsl/SnmpEndpointBuilderFactory.java   |  46 +--
 .../endpoint/dsl/Sns2EndpointBuilderFactory.java   |  66 +---
 .../endpoint/dsl/SolrEndpointBuilderFactory.java   |  10 +-
 .../dsl/SoroushBotEndpointBuilderFactory.java      |  10 +-
 .../endpoint/dsl/SparkEndpointBuilderFactory.java  |  16 +-
 .../endpoint/dsl/SplunkEndpointBuilderFactory.java |  34 +-
 .../dsl/SplunkHECEndpointBuilderFactory.java       |   4 +
 .../dsl/SpringBatchEndpointBuilderFactory.java     |  10 +-
 .../SpringIntegrationEndpointBuilderFactory.java   |  10 +-
 .../dsl/SpringJdbcEndpointBuilderFactory.java      |  23 +-
 .../dsl/SpringLdapEndpointBuilderFactory.java      |  20 +-
 .../dsl/SpringRabbitMQEndpointBuilderFactory.java  |  57 ++-
 .../SpringWebserviceEndpointBuilderFactory.java    |  51 +--
 .../endpoint/dsl/SqlEndpointBuilderFactory.java    |  53 ++-
 .../dsl/SqlStoredEndpointBuilderFactory.java       |   7 +-
 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java   | 109 ++----
 .../endpoint/dsl/SshEndpointBuilderFactory.java    |  25 +-
 .../endpoint/dsl/StAXEndpointBuilderFactory.java   |   4 +
 .../endpoint/dsl/StitchEndpointBuilderFactory.java |  27 +-
 .../endpoint/dsl/StompEndpointBuilderFactory.java  |  24 +-
 .../endpoint/dsl/StreamEndpointBuilderFactory.java |  13 +-
 .../dsl/StringTemplateEndpointBuilderFactory.java  |   4 +
 .../endpoint/dsl/StubEndpointBuilderFactory.java   |  14 +-
 .../endpoint/dsl/SwiftEndpointBuilderFactory.java  |   7 +-
 .../dsl/TelegramEndpointBuilderFactory.java        |  42 +--
 .../endpoint/dsl/ThriftEndpointBuilderFactory.java |  70 ++--
 .../endpoint/dsl/TikaEndpointBuilderFactory.java   |  20 +-
 .../endpoint/dsl/TimerEndpointBuilderFactory.java  |  12 +-
 .../dsl/Translate2EndpointBuilderFactory.java      |  28 +-
 .../endpoint/dsl/TwilioEndpointBuilderFactory.java |  18 +-
 ...TwitterDirectMessageEndpointBuilderFactory.java |  29 +-
 .../dsl/TwitterSearchEndpointBuilderFactory.java   |  30 +-
 .../dsl/TwitterTimelineEndpointBuilderFactory.java |  30 +-
 .../dsl/UndertowEndpointBuilderFactory.java        |  78 ++--
 .../dsl/ValidatorEndpointBuilderFactory.java       |  12 +-
 .../dsl/VelocityEndpointBuilderFactory.java        |   4 +
 .../endpoint/dsl/VertxEndpointBuilderFactory.java  |  10 +-
 .../dsl/VertxHttpEndpointBuilderFactory.java       |  31 +-
 .../dsl/VertxKafkaEndpointBuilderFactory.java      |  17 +-
 .../dsl/VertxWebsocketEndpointBuilderFactory.java  |  23 +-
 .../endpoint/dsl/VmEndpointBuilderFactory.java     |  14 +-
 .../dsl/WeatherEndpointBuilderFactory.java         | 185 +++------
 .../endpoint/dsl/Web3jEndpointBuilderFactory.java  | 120 ++----
 .../dsl/WebhookEndpointBuilderFactory.java         |  10 +-
 .../dsl/WebsocketEndpointBuilderFactory.java       |  16 +-
 .../endpoint/dsl/WekaEndpointBuilderFactory.java   |   4 +
 .../dsl/WordpressEndpointBuilderFactory.java       |  17 +-
 .../dsl/WorkdayEndpointBuilderFactory.java         |   6 +-
 .../endpoint/dsl/WsEndpointBuilderFactory.java     |  42 ++-
 .../dsl/XChangeEndpointBuilderFactory.java         |  46 +--
 .../endpoint/dsl/XJEndpointBuilderFactory.java     |  69 +---
 .../endpoint/dsl/XQueryEndpointBuilderFactory.java |  84 ++---
 .../dsl/XmlSignerEndpointBuilderFactory.java       |  25 +-
 .../dsl/XmlVerifierEndpointBuilderFactory.java     |  18 +-
 .../endpoint/dsl/XmppEndpointBuilderFactory.java   |  23 +-
 .../endpoint/dsl/XsltEndpointBuilderFactory.java   |  33 +-
 .../dsl/XsltSaxonEndpointBuilderFactory.java       |  56 +--
 .../endpoint/dsl/YammerEndpointBuilderFactory.java |  27 +-
 .../dsl/ZendeskEndpointBuilderFactory.java         |  18 +-
 .../dsl/ZooKeeperEndpointBuilderFactory.java       |  10 +-
 .../dsl/ZooKeeperMasterEndpointBuilderFactory.java |  10 +-
 .../camel/maven/packaging/ComponentDslMojo.java    |  12 +-
 .../camel/maven/packaging/EndpointDslMojo.java     | 244 ++----------
 344 files changed, 4686 insertions(+), 9242 deletions(-)

[camel] 04/05: CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.

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

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

commit fb3b14b1929971e1a48eca45208d9f81d879faa2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 21 14:33:13 2021 +0100

    CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.
---
 .../modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc        | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
index 11c130c..c54dc68 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
@@ -10,6 +10,16 @@ from both 3.0 to 3.1 and 3.1 to 3.2.
 
 Added `getScheme` method to `org.apache.camel.spi.Resource`.
 
+=== camel-endpointdsl
+
+The Endpoint DSL is now more type-safe, where previously an option would be declared as `Object` type,
+is now declared using its actual type, such as `javax.sql.DataSource`.
+
+Option that are enums is now using the real enum FQN class name, instead of a duplicate enum
+class that was embedded inside the Endpoint DSL. For example when using `aws2sq` the
+namingStrategy enum is changed from `org.apache.camel.builder.endpoint.dsl.AWS2S3EndpointBuilderFactory`
+to `org.apache.camel.component.aws2.s3.stream.AWSS3NamingStrategyEnum` class name.
+
 === camel-management
 
 The route controller MBeans are moved from `routecontrollers` to the existing `services`

[camel] 03/05: CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.

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

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

commit c73b6ed0db1db3bddee4c6f9f067a60677191181
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 21 14:18:59 2021 +0100

    CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.
---
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   | 134 +++----
 .../endpoint/dsl/AS2EndpointBuilderFactory.java    | 176 ++-------
 .../dsl/AWS2EC2EndpointBuilderFactory.java         |  39 +-
 .../endpoint/dsl/AWS2S3EndpointBuilderFactory.java |  86 ++---
 .../dsl/ActiveMQEndpointBuilderFactory.java        | 131 +++----
 .../endpoint/dsl/AhcEndpointBuilderFactory.java    |  18 +-
 .../dsl/ArangoDbEndpointBuilderFactory.java        |  27 +-
 .../dsl/AsteriskEndpointBuilderFactory.java        |  23 +-
 .../dsl/Athena2EndpointBuilderFactory.java         |  59 +--
 .../dsl/AtlasMapEndpointBuilderFactory.java        |  20 +-
 .../endpoint/dsl/AtmosEndpointBuilderFactory.java  |  10 +-
 .../AtmosphereWebsocketEndpointBuilderFactory.java |  23 +-
 .../endpoint/dsl/AtomEndpointBuilderFactory.java   |  20 +-
 .../dsl/AtomixMapEndpointBuilderFactory.java       | 154 ++------
 .../dsl/AtomixMessagingEndpointBuilderFactory.java | 172 +++------
 .../dsl/AtomixMultiMapEndpointBuilderFactory.java  |  70 +---
 .../dsl/AtomixQueueEndpointBuilderFactory.java     | 153 ++------
 .../dsl/AtomixSetEndpointBuilderFactory.java       | 148 ++------
 .../dsl/AtomixValueEndpointBuilderFactory.java     | 148 ++------
 .../endpoint/dsl/AvroEndpointBuilderFactory.java   |  18 +-
 .../endpoint/dsl/BeanEndpointBuilderFactory.java   |   7 +-
 .../dsl/BeanValidatorEndpointBuilderFactory.java   |  14 +-
 .../dsl/BeanstalkEndpointBuilderFactory.java       |  40 +-
 .../endpoint/dsl/BlobEndpointBuilderFactory.java   | 118 ++----
 .../endpoint/dsl/BonitaEndpointBuilderFactory.java |   4 +
 .../endpoint/dsl/BoxEndpointBuilderFactory.java    |  44 +--
 .../dsl/BraintreeEndpointBuilderFactory.java       |   4 +
 .../endpoint/dsl/BrowseEndpointBuilderFactory.java |  10 +-
 .../endpoint/dsl/CMEndpointBuilderFactory.java     |   4 +
 .../endpoint/dsl/CMISEndpointBuilderFactory.java   |  16 +-
 .../dsl/CaffeineCacheEndpointBuilderFactory.java   |  23 +-
 .../CaffeineLoadCacheEndpointBuilderFactory.java   |  22 +-
 .../dsl/CassandraEndpointBuilderFactory.java       |  58 +--
 .../dsl/ChatScriptEndpointBuilderFactory.java      |   4 +
 .../endpoint/dsl/ChunkEndpointBuilderFactory.java  |   4 +
 .../endpoint/dsl/CinderEndpointBuilderFactory.java |   7 +-
 .../endpoint/dsl/ClassEndpointBuilderFactory.java  |   7 +-
 .../endpoint/dsl/ClientEndpointBuilderFactory.java |  71 ++--
 .../endpoint/dsl/CoAPEndpointBuilderFactory.java   |  51 +--
 .../endpoint/dsl/CometdEndpointBuilderFactory.java |  10 +-
 .../endpoint/dsl/ConsulEndpointBuilderFactory.java | 123 +++---
 .../dsl/ControlBusEndpointBuilderFactory.java      |   8 +-
 .../endpoint/dsl/CordaEndpointBuilderFactory.java  |  21 +-
 .../dsl/CosmosDbEndpointBuilderFactory.java        |  71 +---
 .../dsl/CouchDbEndpointBuilderFactory.java         |  12 +-
 .../dsl/CouchbaseEndpointBuilderFactory.java       |  18 +-
 .../endpoint/dsl/CronEndpointBuilderFactory.java   |  10 +-
 .../endpoint/dsl/Cw2EndpointBuilderFactory.java    |  21 +-
 .../endpoint/dsl/CxfEndpointBuilderFactory.java    |  74 ++--
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  | 160 +++-----
 .../endpoint/dsl/DJLEndpointBuilderFactory.java    |   4 +
 .../endpoint/dsl/DMSEndpointBuilderFactory.java    |  11 +-
 .../dsl/DataFormatEndpointBuilderFactory.java      |   4 +
 .../dsl/DataLakeEndpointBuilderFactory.java        |  85 ++---
 .../dsl/DataSetEndpointBuilderFactory.java         |  18 +-
 .../dsl/DataSetTestEndpointBuilderFactory.java     |   4 +
 .../endpoint/dsl/Ddb2EndpointBuilderFactory.java   |  38 +-
 .../dsl/Ddb2StreamEndpointBuilderFactory.java      |  46 +--
 .../dsl/DebeziumMongodbEndpointBuilderFactory.java |  10 +-
 .../dsl/DebeziumMySqlEndpointBuilderFactory.java   |  10 +-
 .../DebeziumPostgresEndpointBuilderFactory.java    |  10 +-
 .../DebeziumSqlserverEndpointBuilderFactory.java   |  10 +-
 .../dsl/DigitalOceanEndpointBuilderFactory.java    |  26 +-
 .../DigitalSignatureEndpointBuilderFactory.java    |  23 +-
 .../endpoint/dsl/DirectEndpointBuilderFactory.java |  10 +-
 .../dsl/DirectVmEndpointBuilderFactory.java        |  13 +-
 .../dsl/DisruptorEndpointBuilderFactory.java       |  39 +-
 .../dsl/DisruptorVmEndpointBuilderFactory.java     |  39 +-
 .../endpoint/dsl/DnsEndpointBuilderFactory.java    |   4 +
 .../endpoint/dsl/DockerEndpointBuilderFactory.java |  17 +-
 .../endpoint/dsl/DozerEndpointBuilderFactory.java  |   6 +-
 .../endpoint/dsl/DrillEndpointBuilderFactory.java  |  16 +-
 .../dsl/DropboxEndpointBuilderFactory.java         |  36 +-
 .../endpoint/dsl/ECS2EndpointBuilderFactory.java   |  32 +-
 .../endpoint/dsl/EKS2EndpointBuilderFactory.java   |  32 +-
 .../dsl/EhcacheEndpointBuilderFactory.java         |  88 ++---
 .../dsl/ElasticsearchEndpointBuilderFactory.java   |  25 +-
 .../endpoint/dsl/ElsqlEndpointBuilderFactory.java  |  80 ++--
 .../dsl/EtcdKeysEndpointBuilderFactory.java        |   6 +-
 .../dsl/EtcdStatsEndpointBuilderFactory.java       |  24 +-
 .../dsl/EtcdWatchEndpointBuilderFactory.java       |  12 +-
 .../endpoint/dsl/EventEndpointBuilderFactory.java  |  10 +-
 .../dsl/EventHubsEndpointBuilderFactory.java       |  39 +-
 .../dsl/EventbridgeEndpointBuilderFactory.java     |  36 +-
 .../endpoint/dsl/ExecEndpointBuilderFactory.java   |  14 +-
 .../dsl/FacebookEndpointBuilderFactory.java        | 175 +++++----
 .../endpoint/dsl/FhirEndpointBuilderFactory.java   | 309 ++-------------
 .../endpoint/dsl/FileEndpointBuilderFactory.java   | 352 ++---------------
 .../dsl/FileWatchEndpointBuilderFactory.java       |  27 +-
 .../dsl/FlatpackEndpointBuilderFactory.java        |  18 +-
 .../endpoint/dsl/FlinkEndpointBuilderFactory.java  |  15 +-
 .../endpoint/dsl/FopEndpointBuilderFactory.java    |   7 +-
 .../dsl/FreemarkerEndpointBuilderFactory.java      |   7 +-
 .../endpoint/dsl/FtpEndpointBuilderFactory.java    | 402 +++-----------------
 .../endpoint/dsl/FtpsEndpointBuilderFactory.java   | 408 +++-----------------
 .../dsl/FunctionGraphEndpointBuilderFactory.java   |   7 +-
 .../dsl/GangliaEndpointBuilderFactory.java         |  54 +--
 .../dsl/GeoCoderEndpointBuilderFactory.java        |  16 +-
 .../endpoint/dsl/GitEndpointBuilderFactory.java    |  23 +-
 .../endpoint/dsl/GitHubEndpointBuilderFactory.java |  20 +-
 .../endpoint/dsl/GlanceEndpointBuilderFactory.java |   7 +-
 .../dsl/GoogleBigQueryEndpointBuilderFactory.java  |   6 +-
 .../GoogleBigQuerySQLEndpointBuilderFactory.java   |   6 +-
 .../dsl/GoogleCalendarEndpointBuilderFactory.java  |  18 +-
 ...GoogleCalendarStreamEndpointBuilderFactory.java |  22 +-
 ...GoogleCloudFunctionsEndpointBuilderFactory.java |  24 +-
 .../GoogleCloudStorageEndpointBuilderFactory.java  |  46 +--
 .../dsl/GoogleDriveEndpointBuilderFactory.java     |  34 +-
 .../dsl/GoogleMailEndpointBuilderFactory.java      |  18 +-
 .../GoogleMailStreamEndpointBuilderFactory.java    |  18 +-
 .../dsl/GooglePubsubEndpointBuilderFactory.java    |  28 +-
 .../dsl/GoogleSheetsEndpointBuilderFactory.java    |  18 +-
 .../GoogleSheetsStreamEndpointBuilderFactory.java  |  22 +-
 .../endpoint/dsl/GoraEndpointBuilderFactory.java   |  19 +-
 .../endpoint/dsl/GrapeEndpointBuilderFactory.java  |   4 +
 .../dsl/GraphqlEndpointBuilderFactory.java         |   7 +-
 .../endpoint/dsl/GridFsEndpointBuilderFactory.java |  41 +-
 .../endpoint/dsl/GrpcEndpointBuilderFactory.java   |  80 +---
 .../dsl/GuavaEventBusEndpointBuilderFactory.java   |  23 +-
 .../endpoint/dsl/HBaseEndpointBuilderFactory.java  |  44 ++-
 ...azelcastAtomicnumberEndpointBuilderFactory.java |  52 +--
 .../HazelcastInstanceEndpointBuilderFactory.java   |  58 +--
 .../dsl/HazelcastListEndpointBuilderFactory.java   |  66 +---
 .../dsl/HazelcastMapEndpointBuilderFactory.java    |  66 +---
 .../HazelcastMultimapEndpointBuilderFactory.java   |  66 +---
 .../dsl/HazelcastQueueEndpointBuilderFactory.java  |  77 +---
 ...zelcastReplicatedmapEndpointBuilderFactory.java |  66 +---
 .../HazelcastRingbufferEndpointBuilderFactory.java |  52 +--
 .../dsl/HazelcastSedaEndpointBuilderFactory.java   |  66 +---
 .../dsl/HazelcastSetEndpointBuilderFactory.java    |  66 +---
 .../dsl/HazelcastTopicEndpointBuilderFactory.java  |  66 +---
 .../endpoint/dsl/HdfsEndpointBuilderFactory.java   | 132 ++-----
 .../endpoint/dsl/HttpEndpointBuilderFactory.java   |  58 ++-
 .../endpoint/dsl/IAM2EndpointBuilderFactory.java   |  41 +-
 .../endpoint/dsl/IAMEndpointBuilderFactory.java    |   7 +-
 .../endpoint/dsl/IOTAEndpointBuilderFactory.java   |   4 +
 .../endpoint/dsl/IPFSEndpointBuilderFactory.java   |   4 +
 .../dsl/IgniteCacheEndpointBuilderFactory.java     |  50 +--
 .../dsl/IgniteComputeEndpointBuilderFactory.java   |  22 +-
 .../dsl/IgniteEventsEndpointBuilderFactory.java    |  12 +-
 .../dsl/IgniteIdGenEndpointBuilderFactory.java     |  19 +-
 .../dsl/IgniteMessagingEndpointBuilderFactory.java |  23 +-
 .../dsl/IgniteQueueEndpointBuilderFactory.java     |  32 +-
 .../dsl/IgniteSetEndpointBuilderFactory.java       |  26 +-
 .../ImageRecognitionEndpointBuilderFactory.java    |   7 +-
 .../InfinispanEmbeddedEndpointBuilderFactory.java  | 159 +-------
 .../InfinispanRemoteEndpointBuilderFactory.java    | 141 ++-----
 .../dsl/InfluxDbEndpointBuilderFactory.java        |   4 +
 .../endpoint/dsl/IrcEndpointBuilderFactory.java    |  25 +-
 .../endpoint/dsl/IronMQEndpointBuilderFactory.java |  26 +-
 .../endpoint/dsl/JBPMEndpointBuilderFactory.java   |  41 +-
 .../endpoint/dsl/JCacheEndpointBuilderFactory.java |  56 +--
 .../dsl/JGroupsEndpointBuilderFactory.java         |  10 +-
 .../dsl/JGroupsRaftEndpointBuilderFactory.java     |  10 +-
 .../endpoint/dsl/JMXEndpointBuilderFactory.java    |  13 +-
 .../dsl/JSR356WebSocketEndpointBuilderFactory.java |  10 +-
 .../dsl/JcloudsEndpointBuilderFactory.java         |  10 +-
 .../endpoint/dsl/JcrEndpointBuilderFactory.java    |  10 +-
 .../endpoint/dsl/JdbcEndpointBuilderFactory.java   |  24 +-
 .../dsl/JettyHttpEndpointBuilderFactory.java       |  35 +-
 .../endpoint/dsl/JingEndpointBuilderFactory.java   |   4 +
 .../endpoint/dsl/JiraEndpointBuilderFactory.java   |  10 +-
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    | 134 +++----
 .../endpoint/dsl/JoltEndpointBuilderFactory.java   |  34 +-
 .../endpoint/dsl/JooqEndpointBuilderFactory.java   |  37 +-
 .../endpoint/dsl/JpaEndpointBuilderFactory.java    |  48 +--
 .../endpoint/dsl/JsltEndpointBuilderFactory.java   |   7 +-
 .../dsl/JsonPatchEndpointBuilderFactory.java       |   4 +
 .../dsl/JsonValidatorEndpointBuilderFactory.java   |   8 +-
 .../dsl/JsonataEndpointBuilderFactory.java         |  18 +-
 .../endpoint/dsl/Jt400EndpointBuilderFactory.java  |  85 ++---
 .../endpoint/dsl/KMS2EndpointBuilderFactory.java   |  34 +-
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  |  56 ++-
 .../dsl/KameletEndpointBuilderFactory.java         |  10 +-
 .../dsl/KameletReifyEndpointBuilderFactory.java    |  10 +-
 .../dsl/KeystoneEndpointBuilderFactory.java        |   7 +-
 .../dsl/Kinesis2EndpointBuilderFactory.java        |  68 +---
 .../KinesisFirehose2EndpointBuilderFactory.java    |  30 +-
 ...KubernetesConfigMapsEndpointBuilderFactory.java |   6 +-
 ...netesCustomResourcesEndpointBuilderFactory.java |  16 +-
 ...ubernetesDeploymentsEndpointBuilderFactory.java |  16 +-
 .../dsl/KubernetesHPAEndpointBuilderFactory.java   |  16 +-
 .../dsl/KubernetesJobEndpointBuilderFactory.java   |  16 +-
 ...KubernetesNamespacesEndpointBuilderFactory.java |  16 +-
 .../dsl/KubernetesNodesEndpointBuilderFactory.java |  16 +-
 ...sistentVolumesClaimsEndpointBuilderFactory.java |   6 +-
 ...tesPersistentVolumesEndpointBuilderFactory.java |   6 +-
 .../dsl/KubernetesPodsEndpointBuilderFactory.java  |  16 +-
 ...plicationControllersEndpointBuilderFactory.java |  16 +-
 ...rnetesResourcesQuotaEndpointBuilderFactory.java |   6 +-
 .../KubernetesSecretsEndpointBuilderFactory.java   |   6 +-
 ...netesServiceAccountsEndpointBuilderFactory.java |   6 +-
 .../KubernetesServicesEndpointBuilderFactory.java  |  16 +-
 .../endpoint/dsl/KuduEndpointBuilderFactory.java   |  17 +-
 .../dsl/Lambda2EndpointBuilderFactory.java         |  46 +--
 .../dsl/LanguageEndpointBuilderFactory.java        |   4 +
 .../endpoint/dsl/LdapEndpointBuilderFactory.java   |   4 +
 .../endpoint/dsl/LdifEndpointBuilderFactory.java   |   4 +
 .../endpoint/dsl/LogEndpointBuilderFactory.java    |  24 +-
 .../endpoint/dsl/LuceneEndpointBuilderFactory.java |  12 +-
 .../dsl/LumberjackEndpointBuilderFactory.java      |  12 +-
 .../endpoint/dsl/MQ2EndpointBuilderFactory.java    |  34 +-
 .../endpoint/dsl/MSK2EndpointBuilderFactory.java   |  32 +-
 .../endpoint/dsl/MailEndpointBuilderFactory.java   |  80 ++--
 .../endpoint/dsl/MasterEndpointBuilderFactory.java |  10 +-
 .../dsl/MetricsEndpointBuilderFactory.java         |  16 +-
 .../MicroProfileMetricsEndpointBuilderFactory.java |   4 +
 .../dsl/MicrometerEndpointBuilderFactory.java      |   4 +
 .../dsl/MiloClientEndpointBuilderFactory.java      | 108 +-----
 .../dsl/MiloServerEndpointBuilderFactory.java      |  10 +-
 .../endpoint/dsl/MinaEndpointBuilderFactory.java   |  56 ++-
 .../endpoint/dsl/MinioEndpointBuilderFactory.java  |  69 ++--
 .../endpoint/dsl/MllpEndpointBuilderFactory.java   |  22 +-
 .../endpoint/dsl/MockEndpointBuilderFactory.java   |   4 +
 .../dsl/MongoDbEndpointBuilderFactory.java         |  62 +--
 .../endpoint/dsl/MsvEndpointBuilderFactory.java    |  14 +-
 .../dsl/MustacheEndpointBuilderFactory.java        |   4 +
 .../endpoint/dsl/MvelEndpointBuilderFactory.java   |   4 +
 .../dsl/MyBatisBeanEndpointBuilderFactory.java     |  15 +-
 .../dsl/MyBatisEndpointBuilderFactory.java         |  48 +--
 .../endpoint/dsl/NagiosEndpointBuilderFactory.java |  21 +-
 .../endpoint/dsl/NatsEndpointBuilderFactory.java   |  32 +-
 .../dsl/NetWeaverEndpointBuilderFactory.java       |   4 +
 .../endpoint/dsl/NettyEndpointBuilderFactory.java  | 109 +++---
 .../dsl/NettyHttpEndpointBuilderFactory.java       | 113 +++---
 .../dsl/NeutronEndpointBuilderFactory.java         |   7 +-
 .../dsl/NitriteEndpointBuilderFactory.java         |  16 +-
 .../endpoint/dsl/NovaEndpointBuilderFactory.java   |   7 +-
 .../endpoint/dsl/NsqEndpointBuilderFactory.java    |  18 +-
 .../endpoint/dsl/OAIPMHEndpointBuilderFactory.java |  18 +-
 .../endpoint/dsl/OBSEndpointBuilderFactory.java    |  27 +-
 .../dsl/Olingo2EndpointBuilderFactory.java         |  62 +--
 .../dsl/Olingo4EndpointBuilderFactory.java         |  50 +--
 ...penshiftBuildConfigsEndpointBuilderFactory.java |   6 +-
 .../dsl/OpenshiftBuildsEndpointBuilderFactory.java |   6 +-
 .../dsl/OptaPlannerEndpointBuilderFactory.java     |  10 +-
 .../endpoint/dsl/PahoEndpointBuilderFactory.java   |  51 ++-
 .../dsl/PahoMqtt5EndpointBuilderFactory.java       |  62 ++-
 .../endpoint/dsl/PdfEndpointBuilderFactory.java    |  15 +-
 .../dsl/PgEventEndpointBuilderFactory.java         |  19 +-
 .../PgReplicationSlotEndpointBuilderFactory.java   |  18 +-
 .../dsl/PlatformHttpEndpointBuilderFactory.java    |  15 +-
 .../dsl/PrinterEndpointBuilderFactory.java         |   6 +-
 .../endpoint/dsl/PubNubEndpointBuilderFactory.java |  19 +-
 .../endpoint/dsl/PulsarEndpointBuilderFactory.java |  77 +---
 .../endpoint/dsl/QuartzEndpointBuilderFactory.java |  12 +-
 .../endpoint/dsl/QueueEndpointBuilderFactory.java  |  75 ++--
 .../dsl/QuickfixjEndpointBuilderFactory.java       |  10 +-
 .../dsl/RabbitMQEndpointBuilderFactory.java        |  41 +-
 .../dsl/ReactiveStreamsEndpointBuilderFactory.java |  22 +-
 .../endpoint/dsl/RedisEndpointBuilderFactory.java  | 182 ++-------
 .../endpoint/dsl/RefEndpointBuilderFactory.java    |  10 +-
 .../dsl/RestApiEndpointBuilderFactory.java         |  10 +-
 .../endpoint/dsl/RestEndpointBuilderFactory.java   |  28 +-
 .../dsl/RestOpenApiEndpointBuilderFactory.java     |   4 +
 .../dsl/RestSwaggerEndpointBuilderFactory.java     |   6 +-
 .../dsl/ResteasyEndpointBuilderFactory.java        |  36 +-
 .../dsl/RobotFrameworkEndpointBuilderFactory.java  |  74 ++--
 .../endpoint/dsl/RssEndpointBuilderFactory.java    |  20 +-
 .../endpoint/dsl/STS2EndpointBuilderFactory.java   |  31 +-
 .../endpoint/dsl/SagaEndpointBuilderFactory.java   |   4 +
 .../dsl/SalesforceEndpointBuilderFactory.java      | 135 +++----
 .../dsl/SchedulerEndpointBuilderFactory.java       |  18 +-
 .../dsl/SchematronEndpointBuilderFactory.java      |  10 +-
 .../endpoint/dsl/ScpEndpointBuilderFactory.java    |  42 +--
 .../dsl/SecretsManagerEndpointBuilderFactory.java  |  34 +-
 .../endpoint/dsl/SedaEndpointBuilderFactory.java   |  14 +-
 .../endpoint/dsl/ServerEndpointBuilderFactory.java |  71 ++--
 .../dsl/ServiceBusEndpointBuilderFactory.java      | 119 ++----
 .../dsl/ServiceEndpointBuilderFactory.java         |  10 +-
 .../dsl/ServiceNowEndpointBuilderFactory.java      |  27 +-
 .../dsl/ServletEndpointBuilderFactory.java         |  16 +-
 .../endpoint/dsl/Ses2EndpointBuilderFactory.java   |  18 +-
 .../endpoint/dsl/SftpEndpointBuilderFactory.java   | 416 ++++-----------------
 .../SimpleNotificationEndpointBuilderFactory.java  |   7 +-
 .../endpoint/dsl/SipEndpointBuilderFactory.java    | 136 ++++---
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  |  77 ++--
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |  77 ++--
 .../endpoint/dsl/SlackEndpointBuilderFactory.java  |  30 +-
 .../endpoint/dsl/SmppEndpointBuilderFactory.java   |  39 +-
 .../endpoint/dsl/SnmpEndpointBuilderFactory.java   |  46 +--
 .../endpoint/dsl/Sns2EndpointBuilderFactory.java   |  66 +---
 .../endpoint/dsl/SolrEndpointBuilderFactory.java   |  10 +-
 .../dsl/SoroushBotEndpointBuilderFactory.java      |  10 +-
 .../endpoint/dsl/SparkEndpointBuilderFactory.java  |  16 +-
 .../endpoint/dsl/SplunkEndpointBuilderFactory.java |  34 +-
 .../dsl/SplunkHECEndpointBuilderFactory.java       |   4 +
 .../dsl/SpringBatchEndpointBuilderFactory.java     |  10 +-
 .../SpringIntegrationEndpointBuilderFactory.java   |  10 +-
 .../dsl/SpringJdbcEndpointBuilderFactory.java      |  23 +-
 .../dsl/SpringLdapEndpointBuilderFactory.java      |  20 +-
 .../dsl/SpringRabbitMQEndpointBuilderFactory.java  |  57 ++-
 .../SpringWebserviceEndpointBuilderFactory.java    |  51 +--
 .../endpoint/dsl/SqlEndpointBuilderFactory.java    |  53 ++-
 .../dsl/SqlStoredEndpointBuilderFactory.java       |   7 +-
 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java   | 109 ++----
 .../endpoint/dsl/SshEndpointBuilderFactory.java    |  25 +-
 .../endpoint/dsl/StAXEndpointBuilderFactory.java   |   4 +
 .../endpoint/dsl/StitchEndpointBuilderFactory.java |  27 +-
 .../endpoint/dsl/StompEndpointBuilderFactory.java  |  24 +-
 .../endpoint/dsl/StreamEndpointBuilderFactory.java |  13 +-
 .../dsl/StringTemplateEndpointBuilderFactory.java  |   4 +
 .../endpoint/dsl/StubEndpointBuilderFactory.java   |  14 +-
 .../endpoint/dsl/SwiftEndpointBuilderFactory.java  |   7 +-
 .../dsl/TelegramEndpointBuilderFactory.java        |  42 +--
 .../endpoint/dsl/ThriftEndpointBuilderFactory.java |  70 ++--
 .../endpoint/dsl/TikaEndpointBuilderFactory.java   |  20 +-
 .../endpoint/dsl/TimerEndpointBuilderFactory.java  |  12 +-
 .../dsl/Translate2EndpointBuilderFactory.java      |  28 +-
 .../endpoint/dsl/TwilioEndpointBuilderFactory.java |  18 +-
 ...TwitterDirectMessageEndpointBuilderFactory.java |  29 +-
 .../dsl/TwitterSearchEndpointBuilderFactory.java   |  30 +-
 .../dsl/TwitterTimelineEndpointBuilderFactory.java |  30 +-
 .../dsl/UndertowEndpointBuilderFactory.java        |  78 ++--
 .../dsl/ValidatorEndpointBuilderFactory.java       |  12 +-
 .../dsl/VelocityEndpointBuilderFactory.java        |   4 +
 .../endpoint/dsl/VertxEndpointBuilderFactory.java  |  10 +-
 .../dsl/VertxHttpEndpointBuilderFactory.java       |  31 +-
 .../dsl/VertxKafkaEndpointBuilderFactory.java      |  17 +-
 .../dsl/VertxWebsocketEndpointBuilderFactory.java  |  23 +-
 .../endpoint/dsl/VmEndpointBuilderFactory.java     |  14 +-
 .../dsl/WeatherEndpointBuilderFactory.java         | 185 +++------
 .../endpoint/dsl/Web3jEndpointBuilderFactory.java  | 120 ++----
 .../dsl/WebhookEndpointBuilderFactory.java         |  10 +-
 .../dsl/WebsocketEndpointBuilderFactory.java       |  16 +-
 .../endpoint/dsl/WekaEndpointBuilderFactory.java   |   4 +
 .../dsl/WordpressEndpointBuilderFactory.java       |  17 +-
 .../dsl/WorkdayEndpointBuilderFactory.java         |   6 +-
 .../endpoint/dsl/WsEndpointBuilderFactory.java     |  42 ++-
 .../dsl/XChangeEndpointBuilderFactory.java         |  46 +--
 .../endpoint/dsl/XJEndpointBuilderFactory.java     |  69 +---
 .../endpoint/dsl/XQueryEndpointBuilderFactory.java |  84 ++---
 .../dsl/XmlSignerEndpointBuilderFactory.java       |  25 +-
 .../dsl/XmlVerifierEndpointBuilderFactory.java     |  18 +-
 .../endpoint/dsl/XmppEndpointBuilderFactory.java   |  23 +-
 .../endpoint/dsl/XsltEndpointBuilderFactory.java   |  33 +-
 .../dsl/XsltSaxonEndpointBuilderFactory.java       |  56 +--
 .../endpoint/dsl/YammerEndpointBuilderFactory.java |  27 +-
 .../dsl/ZendeskEndpointBuilderFactory.java         |  18 +-
 .../dsl/ZooKeeperEndpointBuilderFactory.java       |  10 +-
 .../dsl/ZooKeeperMasterEndpointBuilderFactory.java |  10 +-
 341 files changed, 4642 insertions(+), 9020 deletions(-)

diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
index bd6fe38..e1902d8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.HeaderFilterStrategy;
 
 /**
  * Messaging with AMQP protocol using Apache QPid Client.
@@ -74,7 +74,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AMQPEndpointConsumerBuilder connectionFactory(
-                Object connectionFactory) {
+                javax.jms.ConnectionFactory connectionFactory) {
             doSetProperty("connectionFactory", connectionFactory);
             return this;
         }
@@ -173,7 +173,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AMQPEndpointConsumerBuilder jmsMessageType(
-                JmsMessageType jmsMessageType) {
+                org.apache.camel.component.jms.JmsMessageType jmsMessageType) {
             doSetProperty("jmsMessageType", jmsMessageType);
             return this;
         }
@@ -710,7 +710,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AMQPEndpointConsumerBuilder errorHandlerLoggingLevel(
-                LoggingLevel errorHandlerLoggingLevel) {
+                org.apache.camel.LoggingLevel errorHandlerLoggingLevel) {
             doSetProperty("errorHandlerLoggingLevel", errorHandlerLoggingLevel);
             return this;
         }
@@ -1019,7 +1019,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder consumerType(
-                ConsumerType consumerType) {
+                org.apache.camel.component.jms.ConsumerType consumerType) {
             doSetProperty("consumerType", consumerType);
             return this;
         }
@@ -1071,7 +1071,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder defaultTaskExecutorType(
-                DefaultTaskExecutorType defaultTaskExecutorType) {
+                org.apache.camel.component.jms.DefaultTaskExecutorType defaultTaskExecutorType) {
             doSetProperty("defaultTaskExecutorType", defaultTaskExecutorType);
             return this;
         }
@@ -1177,7 +1177,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -1212,7 +1212,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -1319,7 +1319,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder taskExecutor(
-                Object taskExecutor) {
+                org.springframework.core.task.TaskExecutor taskExecutor) {
             doSetProperty("taskExecutor", taskExecutor);
             return this;
         }
@@ -1517,7 +1517,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder destinationResolver(
-                Object destinationResolver) {
+                org.springframework.jms.support.destination.DestinationResolver destinationResolver) {
             doSetProperty("destinationResolver", destinationResolver);
             return this;
         }
@@ -1558,7 +1558,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder errorHandler(
-                Object errorHandler) {
+                org.springframework.util.ErrorHandler errorHandler) {
             doSetProperty("errorHandler", errorHandler);
             return this;
         }
@@ -1597,7 +1597,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder exceptionListener(
-                Object exceptionListener) {
+                javax.jms.ExceptionListener exceptionListener) {
             doSetProperty("exceptionListener", exceptionListener);
             return this;
         }
@@ -1632,7 +1632,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -1787,7 +1787,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder jmsKeyFormatStrategy(
-                Object jmsKeyFormatStrategy) {
+                org.apache.camel.component.jms.JmsKeyFormatStrategy jmsKeyFormatStrategy) {
             doSetProperty("jmsKeyFormatStrategy", jmsKeyFormatStrategy);
             return this;
         }
@@ -1902,7 +1902,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder messageConverter(
-                Object messageConverter) {
+                org.springframework.jms.support.converter.MessageConverter messageConverter) {
             doSetProperty("messageConverter", messageConverter);
             return this;
         }
@@ -1938,7 +1938,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder messageCreatedStrategy(
-                Object messageCreatedStrategy) {
+                org.apache.camel.component.jms.MessageCreatedStrategy messageCreatedStrategy) {
             doSetProperty("messageCreatedStrategy", messageCreatedStrategy);
             return this;
         }
@@ -2017,7 +2017,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder messageListenerContainerFactory(
-                Object messageListenerContainerFactory) {
+                org.apache.camel.component.jms.MessageListenerContainerFactory messageListenerContainerFactory) {
             doSetProperty("messageListenerContainerFactory", messageListenerContainerFactory);
             return this;
         }
@@ -2526,7 +2526,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointConsumerBuilder transactionManager(
-                Object transactionManager) {
+                org.springframework.transaction.PlatformTransactionManager transactionManager) {
             doSetProperty("transactionManager", transactionManager);
             return this;
         }
@@ -2637,7 +2637,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AMQPEndpointProducerBuilder connectionFactory(
-                Object connectionFactory) {
+                javax.jms.ConnectionFactory connectionFactory) {
             doSetProperty("connectionFactory", connectionFactory);
             return this;
         }
@@ -2736,7 +2736,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AMQPEndpointProducerBuilder jmsMessageType(
-                JmsMessageType jmsMessageType) {
+                org.apache.camel.component.jms.JmsMessageType jmsMessageType) {
             doSetProperty("jmsMessageType", jmsMessageType);
             return this;
         }
@@ -3267,7 +3267,8 @@ public interface AMQPEndpointBuilderFactory {
          * @param replyToType the value to set
          * @return the dsl builder
          */
-        default AMQPEndpointProducerBuilder replyToType(ReplyToType replyToType) {
+        default AMQPEndpointProducerBuilder replyToType(
+                org.apache.camel.component.jms.ReplyToType replyToType) {
             doSetProperty("replyToType", replyToType);
             return this;
         }
@@ -4007,7 +4008,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointProducerBuilder destinationResolver(
-                Object destinationResolver) {
+                org.springframework.jms.support.destination.DestinationResolver destinationResolver) {
             doSetProperty("destinationResolver", destinationResolver);
             return this;
         }
@@ -4048,7 +4049,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointProducerBuilder errorHandler(
-                Object errorHandler) {
+                org.springframework.util.ErrorHandler errorHandler) {
             doSetProperty("errorHandler", errorHandler);
             return this;
         }
@@ -4087,7 +4088,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointProducerBuilder exceptionListener(
-                Object exceptionListener) {
+                javax.jms.ExceptionListener exceptionListener) {
             doSetProperty("exceptionListener", exceptionListener);
             return this;
         }
@@ -4122,7 +4123,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointProducerBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -4277,7 +4278,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointProducerBuilder jmsKeyFormatStrategy(
-                Object jmsKeyFormatStrategy) {
+                org.apache.camel.component.jms.JmsKeyFormatStrategy jmsKeyFormatStrategy) {
             doSetProperty("jmsKeyFormatStrategy", jmsKeyFormatStrategy);
             return this;
         }
@@ -4392,7 +4393,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointProducerBuilder messageConverter(
-                Object messageConverter) {
+                org.springframework.jms.support.converter.MessageConverter messageConverter) {
             doSetProperty("messageConverter", messageConverter);
             return this;
         }
@@ -4428,7 +4429,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointProducerBuilder messageCreatedStrategy(
-                Object messageCreatedStrategy) {
+                org.apache.camel.component.jms.MessageCreatedStrategy messageCreatedStrategy) {
             doSetProperty("messageCreatedStrategy", messageCreatedStrategy);
             return this;
         }
@@ -4507,7 +4508,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointProducerBuilder messageListenerContainerFactory(
-                Object messageListenerContainerFactory) {
+                org.apache.camel.component.jms.MessageListenerContainerFactory messageListenerContainerFactory) {
             doSetProperty("messageListenerContainerFactory", messageListenerContainerFactory);
             return this;
         }
@@ -5016,7 +5017,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointProducerBuilder transactionManager(
-                Object transactionManager) {
+                org.springframework.transaction.PlatformTransactionManager transactionManager) {
             doSetProperty("transactionManager", transactionManager);
             return this;
         }
@@ -5127,7 +5128,8 @@ public interface AMQPEndpointBuilderFactory {
          * @param connectionFactory the value to set
          * @return the dsl builder
          */
-        default AMQPEndpointBuilder connectionFactory(Object connectionFactory) {
+        default AMQPEndpointBuilder connectionFactory(
+                javax.jms.ConnectionFactory connectionFactory) {
             doSetProperty("connectionFactory", connectionFactory);
             return this;
         }
@@ -5223,7 +5225,8 @@ public interface AMQPEndpointBuilderFactory {
          * @param jmsMessageType the value to set
          * @return the dsl builder
          */
-        default AMQPEndpointBuilder jmsMessageType(JmsMessageType jmsMessageType) {
+        default AMQPEndpointBuilder jmsMessageType(
+                org.apache.camel.component.jms.JmsMessageType jmsMessageType) {
             doSetProperty("jmsMessageType", jmsMessageType);
             return this;
         }
@@ -5615,7 +5618,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointBuilder destinationResolver(
-                Object destinationResolver) {
+                org.springframework.jms.support.destination.DestinationResolver destinationResolver) {
             doSetProperty("destinationResolver", destinationResolver);
             return this;
         }
@@ -5655,7 +5658,8 @@ public interface AMQPEndpointBuilderFactory {
          * @param errorHandler the value to set
          * @return the dsl builder
          */
-        default AdvancedAMQPEndpointBuilder errorHandler(Object errorHandler) {
+        default AdvancedAMQPEndpointBuilder errorHandler(
+                org.springframework.util.ErrorHandler errorHandler) {
             doSetProperty("errorHandler", errorHandler);
             return this;
         }
@@ -5693,7 +5697,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointBuilder exceptionListener(
-                Object exceptionListener) {
+                javax.jms.ExceptionListener exceptionListener) {
             doSetProperty("exceptionListener", exceptionListener);
             return this;
         }
@@ -5728,7 +5732,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -5883,7 +5887,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointBuilder jmsKeyFormatStrategy(
-                Object jmsKeyFormatStrategy) {
+                org.apache.camel.component.jms.JmsKeyFormatStrategy jmsKeyFormatStrategy) {
             doSetProperty("jmsKeyFormatStrategy", jmsKeyFormatStrategy);
             return this;
         }
@@ -5996,7 +6000,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointBuilder messageConverter(
-                Object messageConverter) {
+                org.springframework.jms.support.converter.MessageConverter messageConverter) {
             doSetProperty("messageConverter", messageConverter);
             return this;
         }
@@ -6032,7 +6036,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointBuilder messageCreatedStrategy(
-                Object messageCreatedStrategy) {
+                org.apache.camel.component.jms.MessageCreatedStrategy messageCreatedStrategy) {
             doSetProperty("messageCreatedStrategy", messageCreatedStrategy);
             return this;
         }
@@ -6111,7 +6115,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointBuilder messageListenerContainerFactory(
-                Object messageListenerContainerFactory) {
+                org.apache.camel.component.jms.MessageListenerContainerFactory messageListenerContainerFactory) {
             doSetProperty("messageListenerContainerFactory", messageListenerContainerFactory);
             return this;
         }
@@ -6614,7 +6618,7 @@ public interface AMQPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAMQPEndpointBuilder transactionManager(
-                Object transactionManager) {
+                org.springframework.transaction.PlatformTransactionManager transactionManager) {
             doSetProperty("transactionManager", transactionManager);
             return this;
         }
@@ -6685,48 +6689,6 @@ public interface AMQPEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for <code>org.apache.camel.component.jms.JmsMessageType</code>
-     * enum.
-     */
-    enum JmsMessageType {
-        Bytes,
-        Map,
-        Object,
-        Stream,
-        Text,
-        Blob;
-    }
-
-    /**
-     * Proxy enum for <code>org.apache.camel.component.jms.ConsumerType</code>
-     * enum.
-     */
-    enum ConsumerType {
-        Simple,
-        Default,
-        Custom;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.jms.DefaultTaskExecutorType</code> enum.
-     */
-    enum DefaultTaskExecutorType {
-        ThreadPool,
-        SimpleAsync;
-    }
-
-    /**
-     * Proxy enum for <code>org.apache.camel.component.jms.ReplyToType</code>
-     * enum.
-     */
-    enum ReplyToType {
-        Temporary,
-        Shared,
-        Exclusive;
-    }
-
     public interface AMQPBuilders {
         /**
          * AMQP (camel-amqp)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java
index afc50bb..91222218 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.security.PrivateKey;
-import java.security.cert.Certificate;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Transfer data securely and reliably using the AS2 protocol (RFC4130).
@@ -71,7 +71,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointConsumerBuilder as2MessageStructure(
-                AS2MessageStructure as2MessageStructure) {
+                org.apache.camel.component.as2.api.AS2MessageStructure as2MessageStructure) {
             doSetProperty("as2MessageStructure", as2MessageStructure);
             return this;
         }
@@ -165,7 +165,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointConsumerBuilder compressionAlgorithm(
-                AS2CompressionAlgorithm compressionAlgorithm) {
+                org.apache.camel.component.as2.api.AS2CompressionAlgorithm compressionAlgorithm) {
             doSetProperty("compressionAlgorithm", compressionAlgorithm);
             return this;
         }
@@ -197,7 +197,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointConsumerBuilder decryptingPrivateKey(
-                PrivateKey decryptingPrivateKey) {
+                java.security.PrivateKey decryptingPrivateKey) {
             doSetProperty("decryptingPrivateKey", decryptingPrivateKey);
             return this;
         }
@@ -261,7 +261,8 @@ public interface AS2EndpointBuilderFactory {
          * @param ediMessageType the value to set
          * @return the dsl builder
          */
-        default AS2EndpointConsumerBuilder ediMessageType(Object ediMessageType) {
+        default AS2EndpointConsumerBuilder ediMessageType(
+                org.apache.http.entity.ContentType ediMessageType) {
             doSetProperty("ediMessageType", ediMessageType);
             return this;
         }
@@ -293,7 +294,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointConsumerBuilder encryptingAlgorithm(
-                AS2EncryptionAlgorithm encryptingAlgorithm) {
+                org.apache.camel.component.as2.api.AS2EncryptionAlgorithm encryptingAlgorithm) {
             doSetProperty("encryptingAlgorithm", encryptingAlgorithm);
             return this;
         }
@@ -325,7 +326,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointConsumerBuilder encryptingCertificateChain(
-                Certificate[] encryptingCertificateChain) {
+                java.security.cert.Certificate[] encryptingCertificateChain) {
             doSetProperty("encryptingCertificateChain", encryptingCertificateChain);
             return this;
         }
@@ -513,7 +514,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointConsumerBuilder signingAlgorithm(
-                AS2SignatureAlgorithm signingAlgorithm) {
+                org.apache.camel.component.as2.api.AS2SignatureAlgorithm signingAlgorithm) {
             doSetProperty("signingAlgorithm", signingAlgorithm);
             return this;
         }
@@ -545,7 +546,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointConsumerBuilder signingCertificateChain(
-                Certificate[] signingCertificateChain) {
+                java.security.cert.Certificate[] signingCertificateChain) {
             doSetProperty("signingCertificateChain", signingCertificateChain);
             return this;
         }
@@ -577,7 +578,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointConsumerBuilder signingPrivateKey(
-                PrivateKey signingPrivateKey) {
+                java.security.PrivateKey signingPrivateKey) {
             doSetProperty("signingPrivateKey", signingPrivateKey);
             return this;
         }
@@ -698,7 +699,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAS2EndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -733,7 +734,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAS2EndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -792,7 +793,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointProducerBuilder as2MessageStructure(
-                AS2MessageStructure as2MessageStructure) {
+                org.apache.camel.component.as2.api.AS2MessageStructure as2MessageStructure) {
             doSetProperty("as2MessageStructure", as2MessageStructure);
             return this;
         }
@@ -886,7 +887,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointProducerBuilder compressionAlgorithm(
-                AS2CompressionAlgorithm compressionAlgorithm) {
+                org.apache.camel.component.as2.api.AS2CompressionAlgorithm compressionAlgorithm) {
             doSetProperty("compressionAlgorithm", compressionAlgorithm);
             return this;
         }
@@ -918,7 +919,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointProducerBuilder decryptingPrivateKey(
-                PrivateKey decryptingPrivateKey) {
+                java.security.PrivateKey decryptingPrivateKey) {
             doSetProperty("decryptingPrivateKey", decryptingPrivateKey);
             return this;
         }
@@ -982,7 +983,8 @@ public interface AS2EndpointBuilderFactory {
          * @param ediMessageType the value to set
          * @return the dsl builder
          */
-        default AS2EndpointProducerBuilder ediMessageType(Object ediMessageType) {
+        default AS2EndpointProducerBuilder ediMessageType(
+                org.apache.http.entity.ContentType ediMessageType) {
             doSetProperty("ediMessageType", ediMessageType);
             return this;
         }
@@ -1014,7 +1016,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointProducerBuilder encryptingAlgorithm(
-                AS2EncryptionAlgorithm encryptingAlgorithm) {
+                org.apache.camel.component.as2.api.AS2EncryptionAlgorithm encryptingAlgorithm) {
             doSetProperty("encryptingAlgorithm", encryptingAlgorithm);
             return this;
         }
@@ -1046,7 +1048,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointProducerBuilder encryptingCertificateChain(
-                Certificate[] encryptingCertificateChain) {
+                java.security.cert.Certificate[] encryptingCertificateChain) {
             doSetProperty("encryptingCertificateChain", encryptingCertificateChain);
             return this;
         }
@@ -1234,7 +1236,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointProducerBuilder signingAlgorithm(
-                AS2SignatureAlgorithm signingAlgorithm) {
+                org.apache.camel.component.as2.api.AS2SignatureAlgorithm signingAlgorithm) {
             doSetProperty("signingAlgorithm", signingAlgorithm);
             return this;
         }
@@ -1266,7 +1268,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointProducerBuilder signingCertificateChain(
-                Certificate[] signingCertificateChain) {
+                java.security.cert.Certificate[] signingCertificateChain) {
             doSetProperty("signingCertificateChain", signingCertificateChain);
             return this;
         }
@@ -1298,7 +1300,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointProducerBuilder signingPrivateKey(
-                PrivateKey signingPrivateKey) {
+                java.security.PrivateKey signingPrivateKey) {
             doSetProperty("signingPrivateKey", signingPrivateKey);
             return this;
         }
@@ -1493,7 +1495,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointBuilder as2MessageStructure(
-                AS2MessageStructure as2MessageStructure) {
+                org.apache.camel.component.as2.api.AS2MessageStructure as2MessageStructure) {
             doSetProperty("as2MessageStructure", as2MessageStructure);
             return this;
         }
@@ -1586,7 +1588,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointBuilder compressionAlgorithm(
-                AS2CompressionAlgorithm compressionAlgorithm) {
+                org.apache.camel.component.as2.api.AS2CompressionAlgorithm compressionAlgorithm) {
             doSetProperty("compressionAlgorithm", compressionAlgorithm);
             return this;
         }
@@ -1618,7 +1620,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointBuilder decryptingPrivateKey(
-                PrivateKey decryptingPrivateKey) {
+                java.security.PrivateKey decryptingPrivateKey) {
             doSetProperty("decryptingPrivateKey", decryptingPrivateKey);
             return this;
         }
@@ -1682,7 +1684,8 @@ public interface AS2EndpointBuilderFactory {
          * @param ediMessageType the value to set
          * @return the dsl builder
          */
-        default AS2EndpointBuilder ediMessageType(Object ediMessageType) {
+        default AS2EndpointBuilder ediMessageType(
+                org.apache.http.entity.ContentType ediMessageType) {
             doSetProperty("ediMessageType", ediMessageType);
             return this;
         }
@@ -1714,7 +1717,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointBuilder encryptingAlgorithm(
-                AS2EncryptionAlgorithm encryptingAlgorithm) {
+                org.apache.camel.component.as2.api.AS2EncryptionAlgorithm encryptingAlgorithm) {
             doSetProperty("encryptingAlgorithm", encryptingAlgorithm);
             return this;
         }
@@ -1746,7 +1749,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointBuilder encryptingCertificateChain(
-                Certificate[] encryptingCertificateChain) {
+                java.security.cert.Certificate[] encryptingCertificateChain) {
             doSetProperty("encryptingCertificateChain", encryptingCertificateChain);
             return this;
         }
@@ -1931,7 +1934,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointBuilder signingAlgorithm(
-                AS2SignatureAlgorithm signingAlgorithm) {
+                org.apache.camel.component.as2.api.AS2SignatureAlgorithm signingAlgorithm) {
             doSetProperty("signingAlgorithm", signingAlgorithm);
             return this;
         }
@@ -1962,7 +1965,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointBuilder signingCertificateChain(
-                Certificate[] signingCertificateChain) {
+                java.security.cert.Certificate[] signingCertificateChain) {
             doSetProperty("signingCertificateChain", signingCertificateChain);
             return this;
         }
@@ -1994,7 +1997,7 @@ public interface AS2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AS2EndpointBuilder signingPrivateKey(
-                PrivateKey signingPrivateKey) {
+                java.security.PrivateKey signingPrivateKey) {
             doSetProperty("signingPrivateKey", signingPrivateKey);
             return this;
         }
@@ -2100,113 +2103,6 @@ public interface AS2EndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.as2.api.AS2MessageStructure</code> enum.
-     */
-    enum AS2MessageStructure {
-        PLAIN,
-        SIGNED,
-        ENCRYPTED,
-        SIGNED_ENCRYPTED,
-        PLAIN_COMPRESSED,
-        SIGNED_COMPRESSED,
-        ENCRYPTED_COMPRESSED,
-        ENCRYPTED_COMPRESSED_SIGNED;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.as2.api.AS2CompressionAlgorithm</code>
-     * enum.
-     */
-    enum AS2CompressionAlgorithm {
-        ZLIB;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.as2.api.AS2EncryptionAlgorithm</code>
-     * enum.
-     */
-    enum AS2EncryptionAlgorithm {
-        AES128_CBC,
-        AES192_CBC,
-        AES256_CBC,
-        AES128_CCM,
-        AES192_CCM,
-        AES256_CCM,
-        AES128_GCM,
-        AES192_GCM,
-        AES256_GCM,
-        CAMELLIA128_CBC,
-        CAMELLIA192_CBC,
-        CAMELLIA256_CBC,
-        CAST5_CBC,
-        DES_CBC,
-        DES_EDE3_CBC,
-        GOST28147_GCFB,
-        IDEA_CBC,
-        RC2_CBC,
-        RC4,
-        SEED_CBC;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.as2.api.AS2SignatureAlgorithm</code>
-     * enum.
-     */
-    enum AS2SignatureAlgorithm {
-        SHA3_224WITHRSA,
-        SHA3_256WITHRSA,
-        SHA3_384withRSA,
-        SHA3_512WITHRSA,
-        MD5WITHRSA,
-        SHA1WITHRSA,
-        MD2WITHRSA,
-        SHA224WITHRSA,
-        SHA256WITHRSA,
-        SHA384WITHRSA,
-        SHA512WITHRSA,
-        RIPEMD128WITHRSA,
-        RIPEMD160WITHRSA,
-        RIPEMD256WITHRSA,
-        SHA224WITHDSA,
-        SHA256WITHDSA,
-        SHA384WITHDSA,
-        SHA512WITHDSA,
-        SHA3_224WITHDSA,
-        SHA3_256WITHDSA,
-        SHA3_384WITHDSA,
-        SHA3_512WITHDSA,
-        SHA1WITHDSA,
-        SHA3_224WITHECDSA,
-        SHA3_256WITHECDSA,
-        SHA3_384WITHECDSA,
-        SHA3_512WITHECDSA,
-        SHA1WITHECDSA,
-        SHA224WITHECDSA,
-        SHA256WITHECDSA,
-        SHA384WITHECDSA,
-        SHA512WITHECDSA,
-        SHA1WITHPLAIN_ECDSA,
-        SHA224WITHPLAIN_ECDSA,
-        SHA256WITHPLAIN_ECDSA,
-        SHA384WITHPLAIN_ECDSA,
-        SHA512WITHPLAIN_ECDSA,
-        RIPEMD160WITHPLAIN_ECDSA,
-        SHA1WITHRSAANDMGF1,
-        SHA224WITHRSAANDMGF1,
-        SHA256WITHRSAANDMGF1,
-        SHA384WITHRSAANDMGF1,
-        SHA512WITHRSAANDMGF1,
-        SHA3_224WITHRSAANDMGF1,
-        SHA3_256WITHRSAANDMGF1,
-        SHA3_384WITHRSAANDMGF1,
-        SHA3_512WITHRSAANDMGF1;
-    }
-
     public interface AS2Builders {
         /**
          * AS2 (camel-as2)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
index 31aa71e..6a94a59 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -59,7 +63,8 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @param amazonEc2Client the value to set
          * @return the dsl builder
          */
-        default AWS2EC2EndpointBuilder amazonEc2Client(Object amazonEc2Client) {
+        default AWS2EC2EndpointBuilder amazonEc2Client(
+                software.amazon.awssdk.services.ec2.Ec2Client amazonEc2Client) {
             doSetProperty("amazonEc2Client", amazonEc2Client);
             return this;
         }
@@ -142,7 +147,8 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @param operation the value to set
          * @return the dsl builder
          */
-        default AWS2EC2EndpointBuilder operation(AWS2EC2Operations operation) {
+        default AWS2EC2EndpointBuilder operation(
+                org.apache.camel.component.aws2.ec2.AWS2EC2Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -284,7 +290,8 @@ public interface AWS2EC2EndpointBuilderFactory {
          * @param proxyProtocol the value to set
          * @return the dsl builder
          */
-        default AWS2EC2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default AWS2EC2EndpointBuilder proxyProtocol(
+                software.amazon.awssdk.core.Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -425,32 +432,6 @@ public interface AWS2EC2EndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.aws2.ec2.AWS2EC2Operations</code> enum.
-     */
-    enum AWS2EC2Operations {
-        createAndRunInstances,
-        startInstances,
-        stopInstances,
-        terminateInstances,
-        describeInstances,
-        describeInstancesStatus,
-        rebootInstances,
-        monitorInstances,
-        unmonitorInstances,
-        createTags,
-        deleteTags;
-    }
-
-    /**
-     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
-     */
-    enum Protocol {
-        HTTP,
-        HTTPS;
-    }
-
     public interface AWS2EC2Builders {
         /**
          * AWS Elastic Compute Cloud (EC2) (camel-aws2-ec2)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
index aa773e1..36bfcb7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java
@@ -16,17 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.PollingConsumerPollStrategy;
 
 /**
  * Store and retrieve objects from AWS S3 Storage Service using AWS SDK version
@@ -60,7 +58,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AWS2S3EndpointConsumerBuilder amazonS3Client(
-                Object amazonS3Client) {
+                software.amazon.awssdk.services.s3.S3Client amazonS3Client) {
             doSetProperty("amazonS3Client", amazonS3Client);
             return this;
         }
@@ -94,7 +92,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AWS2S3EndpointConsumerBuilder amazonS3Presigner(
-                Object amazonS3Presigner) {
+                software.amazon.awssdk.services.s3.presigner.S3Presigner amazonS3Presigner) {
             doSetProperty("amazonS3Presigner", amazonS3Presigner);
             return this;
         }
@@ -289,7 +287,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AWS2S3EndpointConsumerBuilder proxyProtocol(
-                Protocol proxyProtocol) {
+                software.amazon.awssdk.core.Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -1124,7 +1122,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AWS2S3EndpointConsumerBuilder runLoggingLevel(
-                LoggingLevel runLoggingLevel) {
+                org.apache.camel.LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
         }
@@ -1498,7 +1496,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAWS2S3EndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -1533,7 +1531,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAWS2S3EndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -1568,7 +1566,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAWS2S3EndpointConsumerBuilder pollStrategy(
-                PollingConsumerPollStrategy pollStrategy) {
+                org.apache.camel.spi.PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
         }
@@ -1615,7 +1613,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AWS2S3EndpointProducerBuilder amazonS3Client(
-                Object amazonS3Client) {
+                software.amazon.awssdk.services.s3.S3Client amazonS3Client) {
             doSetProperty("amazonS3Client", amazonS3Client);
             return this;
         }
@@ -1649,7 +1647,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AWS2S3EndpointProducerBuilder amazonS3Presigner(
-                Object amazonS3Presigner) {
+                software.amazon.awssdk.services.s3.presigner.S3Presigner amazonS3Presigner) {
             doSetProperty("amazonS3Presigner", amazonS3Presigner);
             return this;
         }
@@ -1844,7 +1842,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AWS2S3EndpointProducerBuilder proxyProtocol(
-                Protocol proxyProtocol) {
+                software.amazon.awssdk.core.Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -2176,7 +2174,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AWS2S3EndpointProducerBuilder namingStrategy(
-                AWSS3NamingStrategyEnum namingStrategy) {
+                org.apache.camel.component.aws2.s3.stream.AWSS3NamingStrategyEnum namingStrategy) {
             doSetProperty("namingStrategy", namingStrategy);
             return this;
         }
@@ -2209,7 +2207,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AWS2S3EndpointProducerBuilder operation(
-                AWS2S3Operations operation) {
+                org.apache.camel.component.aws2.s3.AWS2S3Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -2273,7 +2271,7 @@ public interface AWS2S3EndpointBuilderFactory {
          * @return the dsl builder
          */
         default AWS2S3EndpointProducerBuilder restartingPolicy(
-                AWSS3RestartingPolicyEnum restartingPolicy) {
+                org.apache.camel.component.aws2.s3.stream.AWSS3RestartingPolicyEnum restartingPolicy) {
             doSetProperty("restartingPolicy", restartingPolicy);
             return this;
         }
@@ -2565,7 +2563,8 @@ public interface AWS2S3EndpointBuilderFactory {
          * @param amazonS3Client the value to set
          * @return the dsl builder
          */
-        default AWS2S3EndpointBuilder amazonS3Client(Object amazonS3Client) {
+        default AWS2S3EndpointBuilder amazonS3Client(
+                software.amazon.awssdk.services.s3.S3Client amazonS3Client) {
             doSetProperty("amazonS3Client", amazonS3Client);
             return this;
         }
@@ -2597,7 +2596,8 @@ public interface AWS2S3EndpointBuilderFactory {
          * @param amazonS3Presigner the value to set
          * @return the dsl builder
          */
-        default AWS2S3EndpointBuilder amazonS3Presigner(Object amazonS3Presigner) {
+        default AWS2S3EndpointBuilder amazonS3Presigner(
+                software.amazon.awssdk.services.s3.presigner.S3Presigner amazonS3Presigner) {
             doSetProperty("amazonS3Presigner", amazonS3Presigner);
             return this;
         }
@@ -2786,7 +2786,8 @@ public interface AWS2S3EndpointBuilderFactory {
          * @param proxyProtocol the value to set
          * @return the dsl builder
          */
-        default AWS2S3EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default AWS2S3EndpointBuilder proxyProtocol(
+                software.amazon.awssdk.core.Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -2997,47 +2998,6 @@ public interface AWS2S3EndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
-     */
-    enum Protocol {
-        HTTP,
-        HTTPS;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.aws2.s3.stream.AWSS3NamingStrategyEnum</code> enum.
-     */
-    enum AWSS3NamingStrategyEnum {
-        progressive,
-        random;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.aws2.s3.AWS2S3Operations</code> enum.
-     */
-    enum AWS2S3Operations {
-        copyObject,
-        listObjects,
-        deleteObject,
-        deleteBucket,
-        listBuckets,
-        getObject,
-        getObjectRange,
-        createDownloadLink;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.aws2.s3.stream.AWSS3RestartingPolicyEnum</code> enum.
-     */
-    enum AWSS3RestartingPolicyEnum {
-        override,
-        lastPart;
-    }
-
     public interface AWS2S3Builders {
         /**
          * AWS S3 Storage Service (camel-aws2-s3)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
index 2b31238..841e1c6 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
@@ -16,15 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.HeaderFilterStrategy;
 
 /**
  * Send messages to (or consume from) Apache ActiveMQ. This component extends
@@ -76,7 +76,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ActiveMQEndpointConsumerBuilder connectionFactory(
-                Object connectionFactory) {
+                javax.jms.ConnectionFactory connectionFactory) {
             doSetProperty("connectionFactory", connectionFactory);
             return this;
         }
@@ -176,7 +176,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ActiveMQEndpointConsumerBuilder jmsMessageType(
-                JmsMessageType jmsMessageType) {
+                org.apache.camel.component.jms.JmsMessageType jmsMessageType) {
             doSetProperty("jmsMessageType", jmsMessageType);
             return this;
         }
@@ -717,7 +717,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ActiveMQEndpointConsumerBuilder errorHandlerLoggingLevel(
-                LoggingLevel errorHandlerLoggingLevel) {
+                org.apache.camel.LoggingLevel errorHandlerLoggingLevel) {
             doSetProperty("errorHandlerLoggingLevel", errorHandlerLoggingLevel);
             return this;
         }
@@ -1026,7 +1026,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder consumerType(
-                ConsumerType consumerType) {
+                org.apache.camel.component.jms.ConsumerType consumerType) {
             doSetProperty("consumerType", consumerType);
             return this;
         }
@@ -1078,7 +1078,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder defaultTaskExecutorType(
-                DefaultTaskExecutorType defaultTaskExecutorType) {
+                org.apache.camel.component.jms.DefaultTaskExecutorType defaultTaskExecutorType) {
             doSetProperty("defaultTaskExecutorType", defaultTaskExecutorType);
             return this;
         }
@@ -1232,7 +1232,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -1267,7 +1267,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -1374,7 +1374,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder taskExecutor(
-                Object taskExecutor) {
+                org.springframework.core.task.TaskExecutor taskExecutor) {
             doSetProperty("taskExecutor", taskExecutor);
             return this;
         }
@@ -1572,7 +1572,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder destinationResolver(
-                Object destinationResolver) {
+                org.springframework.jms.support.destination.DestinationResolver destinationResolver) {
             doSetProperty("destinationResolver", destinationResolver);
             return this;
         }
@@ -1613,7 +1613,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder errorHandler(
-                Object errorHandler) {
+                org.springframework.util.ErrorHandler errorHandler) {
             doSetProperty("errorHandler", errorHandler);
             return this;
         }
@@ -1652,7 +1652,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder exceptionListener(
-                Object exceptionListener) {
+                javax.jms.ExceptionListener exceptionListener) {
             doSetProperty("exceptionListener", exceptionListener);
             return this;
         }
@@ -1687,7 +1687,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -1842,7 +1842,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder jmsKeyFormatStrategy(
-                Object jmsKeyFormatStrategy) {
+                org.apache.camel.component.jms.JmsKeyFormatStrategy jmsKeyFormatStrategy) {
             doSetProperty("jmsKeyFormatStrategy", jmsKeyFormatStrategy);
             return this;
         }
@@ -1957,7 +1957,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder messageConverter(
-                Object messageConverter) {
+                org.springframework.jms.support.converter.MessageConverter messageConverter) {
             doSetProperty("messageConverter", messageConverter);
             return this;
         }
@@ -1993,7 +1993,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder messageCreatedStrategy(
-                Object messageCreatedStrategy) {
+                org.apache.camel.component.jms.MessageCreatedStrategy messageCreatedStrategy) {
             doSetProperty("messageCreatedStrategy", messageCreatedStrategy);
             return this;
         }
@@ -2072,7 +2072,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder messageListenerContainerFactory(
-                Object messageListenerContainerFactory) {
+                org.apache.camel.component.jms.MessageListenerContainerFactory messageListenerContainerFactory) {
             doSetProperty("messageListenerContainerFactory", messageListenerContainerFactory);
             return this;
         }
@@ -2581,7 +2581,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointConsumerBuilder transactionManager(
-                Object transactionManager) {
+                org.springframework.transaction.PlatformTransactionManager transactionManager) {
             doSetProperty("transactionManager", transactionManager);
             return this;
         }
@@ -2692,7 +2692,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ActiveMQEndpointProducerBuilder connectionFactory(
-                Object connectionFactory) {
+                javax.jms.ConnectionFactory connectionFactory) {
             doSetProperty("connectionFactory", connectionFactory);
             return this;
         }
@@ -2792,7 +2792,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ActiveMQEndpointProducerBuilder jmsMessageType(
-                JmsMessageType jmsMessageType) {
+                org.apache.camel.component.jms.JmsMessageType jmsMessageType) {
             doSetProperty("jmsMessageType", jmsMessageType);
             return this;
         }
@@ -3327,7 +3327,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ActiveMQEndpointProducerBuilder replyToType(
-                ReplyToType replyToType) {
+                org.apache.camel.component.jms.ReplyToType replyToType) {
             doSetProperty("replyToType", replyToType);
             return this;
         }
@@ -4069,7 +4069,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointProducerBuilder destinationResolver(
-                Object destinationResolver) {
+                org.springframework.jms.support.destination.DestinationResolver destinationResolver) {
             doSetProperty("destinationResolver", destinationResolver);
             return this;
         }
@@ -4110,7 +4110,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointProducerBuilder errorHandler(
-                Object errorHandler) {
+                org.springframework.util.ErrorHandler errorHandler) {
             doSetProperty("errorHandler", errorHandler);
             return this;
         }
@@ -4149,7 +4149,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointProducerBuilder exceptionListener(
-                Object exceptionListener) {
+                javax.jms.ExceptionListener exceptionListener) {
             doSetProperty("exceptionListener", exceptionListener);
             return this;
         }
@@ -4184,7 +4184,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointProducerBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -4339,7 +4339,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointProducerBuilder jmsKeyFormatStrategy(
-                Object jmsKeyFormatStrategy) {
+                org.apache.camel.component.jms.JmsKeyFormatStrategy jmsKeyFormatStrategy) {
             doSetProperty("jmsKeyFormatStrategy", jmsKeyFormatStrategy);
             return this;
         }
@@ -4454,7 +4454,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointProducerBuilder messageConverter(
-                Object messageConverter) {
+                org.springframework.jms.support.converter.MessageConverter messageConverter) {
             doSetProperty("messageConverter", messageConverter);
             return this;
         }
@@ -4490,7 +4490,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointProducerBuilder messageCreatedStrategy(
-                Object messageCreatedStrategy) {
+                org.apache.camel.component.jms.MessageCreatedStrategy messageCreatedStrategy) {
             doSetProperty("messageCreatedStrategy", messageCreatedStrategy);
             return this;
         }
@@ -4569,7 +4569,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointProducerBuilder messageListenerContainerFactory(
-                Object messageListenerContainerFactory) {
+                org.apache.camel.component.jms.MessageListenerContainerFactory messageListenerContainerFactory) {
             doSetProperty("messageListenerContainerFactory", messageListenerContainerFactory);
             return this;
         }
@@ -5078,7 +5078,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointProducerBuilder transactionManager(
-                Object transactionManager) {
+                org.springframework.transaction.PlatformTransactionManager transactionManager) {
             doSetProperty("transactionManager", transactionManager);
             return this;
         }
@@ -5190,7 +5190,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ActiveMQEndpointBuilder connectionFactory(
-                Object connectionFactory) {
+                javax.jms.ConnectionFactory connectionFactory) {
             doSetProperty("connectionFactory", connectionFactory);
             return this;
         }
@@ -5288,7 +5288,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ActiveMQEndpointBuilder jmsMessageType(
-                JmsMessageType jmsMessageType) {
+                org.apache.camel.component.jms.JmsMessageType jmsMessageType) {
             doSetProperty("jmsMessageType", jmsMessageType);
             return this;
         }
@@ -5680,7 +5680,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointBuilder destinationResolver(
-                Object destinationResolver) {
+                org.springframework.jms.support.destination.DestinationResolver destinationResolver) {
             doSetProperty("destinationResolver", destinationResolver);
             return this;
         }
@@ -5720,7 +5720,8 @@ public interface ActiveMQEndpointBuilderFactory {
          * @param errorHandler the value to set
          * @return the dsl builder
          */
-        default AdvancedActiveMQEndpointBuilder errorHandler(Object errorHandler) {
+        default AdvancedActiveMQEndpointBuilder errorHandler(
+                org.springframework.util.ErrorHandler errorHandler) {
             doSetProperty("errorHandler", errorHandler);
             return this;
         }
@@ -5758,7 +5759,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointBuilder exceptionListener(
-                Object exceptionListener) {
+                javax.jms.ExceptionListener exceptionListener) {
             doSetProperty("exceptionListener", exceptionListener);
             return this;
         }
@@ -5793,7 +5794,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -5948,7 +5949,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointBuilder jmsKeyFormatStrategy(
-                Object jmsKeyFormatStrategy) {
+                org.apache.camel.component.jms.JmsKeyFormatStrategy jmsKeyFormatStrategy) {
             doSetProperty("jmsKeyFormatStrategy", jmsKeyFormatStrategy);
             return this;
         }
@@ -6063,7 +6064,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointBuilder messageConverter(
-                Object messageConverter) {
+                org.springframework.jms.support.converter.MessageConverter messageConverter) {
             doSetProperty("messageConverter", messageConverter);
             return this;
         }
@@ -6099,7 +6100,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointBuilder messageCreatedStrategy(
-                Object messageCreatedStrategy) {
+                org.apache.camel.component.jms.MessageCreatedStrategy messageCreatedStrategy) {
             doSetProperty("messageCreatedStrategy", messageCreatedStrategy);
             return this;
         }
@@ -6178,7 +6179,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointBuilder messageListenerContainerFactory(
-                Object messageListenerContainerFactory) {
+                org.apache.camel.component.jms.MessageListenerContainerFactory messageListenerContainerFactory) {
             doSetProperty("messageListenerContainerFactory", messageListenerContainerFactory);
             return this;
         }
@@ -6685,7 +6686,7 @@ public interface ActiveMQEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedActiveMQEndpointBuilder transactionManager(
-                Object transactionManager) {
+                org.springframework.transaction.PlatformTransactionManager transactionManager) {
             doSetProperty("transactionManager", transactionManager);
             return this;
         }
@@ -6756,48 +6757,6 @@ public interface ActiveMQEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for <code>org.apache.camel.component.jms.JmsMessageType</code>
-     * enum.
-     */
-    enum JmsMessageType {
-        Bytes,
-        Map,
-        Object,
-        Stream,
-        Text,
-        Blob;
-    }
-
-    /**
-     * Proxy enum for <code>org.apache.camel.component.jms.ConsumerType</code>
-     * enum.
-     */
-    enum ConsumerType {
-        Simple,
-        Default,
-        Custom;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.jms.DefaultTaskExecutorType</code> enum.
-     */
-    enum DefaultTaskExecutorType {
-        ThreadPool,
-        SimpleAsync;
-    }
-
-    /**
-     * Proxy enum for <code>org.apache.camel.component.jms.ReplyToType</code>
-     * enum.
-     */
-    enum ReplyToType {
-        Temporary,
-        Shared,
-        Exclusive;
-    }
-
     public interface ActiveMQBuilders {
         /**
          * ActiveMQ (camel-activemq)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java
index 10e3b6f..7b9185d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AhcEndpointBuilderFactory.java
@@ -16,12 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.HeaderFilterStrategy;
 
 /**
  * Call external HTTP services using Async Http Client.
@@ -152,7 +155,8 @@ public interface AhcEndpointBuilderFactory {
          * @param cookieHandler the value to set
          * @return the dsl builder
          */
-        default AhcEndpointBuilder cookieHandler(Object cookieHandler) {
+        default AhcEndpointBuilder cookieHandler(
+                org.apache.camel.http.base.cookie.CookieHandler cookieHandler) {
             doSetProperty("cookieHandler", cookieHandler);
             return this;
         }
@@ -185,7 +189,7 @@ public interface AhcEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AhcEndpointBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -355,7 +359,7 @@ public interface AhcEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AhcEndpointBuilder sslContextParameters(
-                Object sslContextParameters) {
+                org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
@@ -404,7 +408,8 @@ public interface AhcEndpointBuilderFactory {
          * @param binding the value to set
          * @return the dsl builder
          */
-        default AdvancedAhcEndpointBuilder binding(Object binding) {
+        default AdvancedAhcEndpointBuilder binding(
+                org.apache.camel.component.ahc.AhcBinding binding) {
             doSetProperty("binding", binding);
             return this;
         }
@@ -438,7 +443,8 @@ public interface AhcEndpointBuilderFactory {
          * @param clientConfig the value to set
          * @return the dsl builder
          */
-        default AdvancedAhcEndpointBuilder clientConfig(Object clientConfig) {
+        default AdvancedAhcEndpointBuilder clientConfig(
+                org.asynchttpclient.AsyncHttpClientConfig clientConfig) {
             doSetProperty("clientConfig", clientConfig);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ArangoDbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ArangoDbEndpointBuilderFactory.java
index e0ee0fd..3e8ed1b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ArangoDbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ArangoDbEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -161,7 +165,8 @@ public interface ArangoDbEndpointBuilderFactory {
          * @param operation the value to set
          * @return the dsl builder
          */
-        default ArangoDbEndpointBuilder operation(ArangoDbOperation operation) {
+        default ArangoDbEndpointBuilder operation(
+                org.apache.camel.component.arangodb.ArangoDbOperation operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -260,26 +265,6 @@ public interface ArangoDbEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.arangodb.ArangoDbOperation</code> enum.
-     */
-    enum ArangoDbOperation {
-        SAVE_DOCUMENT,
-        FIND_DOCUMENT_BY_KEY,
-        UPDATE_DOCUMENT,
-        DELETE_DOCUMENT,
-        AQL_QUERY,
-        SAVE_VERTEX,
-        FIND_VERTEX_BY_KEY,
-        UPDATE_VERTEX,
-        DELETE_VERTEX,
-        SAVE_EDGE,
-        FIND_EDGE_BY_KEY,
-        UPDATE_EDGE,
-        DELETE_EDGE;
-    }
-
     public interface ArangoDbBuilders {
         /**
          * ArangoDb (camel-arangodb)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
index d14fc99..64195c2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Interact with Asterisk PBX Server.
@@ -157,7 +159,7 @@ public interface AsteriskEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAsteriskEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -192,7 +194,7 @@ public interface AsteriskEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAsteriskEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -280,7 +282,8 @@ public interface AsteriskEndpointBuilderFactory {
          * @param action the value to set
          * @return the dsl builder
          */
-        default AsteriskEndpointProducerBuilder action(AsteriskAction action) {
+        default AsteriskEndpointProducerBuilder action(
+                org.apache.camel.component.asterisk.AsteriskAction action) {
             doSetProperty("action", action);
             return this;
         }
@@ -431,16 +434,6 @@ public interface AsteriskEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.asterisk.AsteriskAction</code> enum.
-     */
-    enum AsteriskAction {
-        QUEUE_STATUS,
-        SIP_PEERS,
-        EXTENSION_STATE;
-    }
-
     public interface AsteriskBuilders {
         /**
          * Asterisk (camel-asterisk)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java
index 5b589b2..c2db67c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Athena2EndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -63,7 +67,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default Athena2EndpointBuilder amazonAthenaClient(
-                Object amazonAthenaClient) {
+                software.amazon.awssdk.services.athena.AthenaClient amazonAthenaClient) {
             doSetProperty("amazonAthenaClient", amazonAthenaClient);
             return this;
         }
@@ -144,7 +148,7 @@ public interface Athena2EndpointBuilderFactory {
          * @return the dsl builder
          */
         default Athena2EndpointBuilder encryptionOption(
-                EncryptionOption encryptionOption) {
+                software.amazon.awssdk.services.athena.model.EncryptionOption encryptionOption) {
             doSetProperty("encryptionOption", encryptionOption);
             return this;
         }
@@ -388,7 +392,8 @@ public interface Athena2EndpointBuilderFactory {
          * @param operation the value to set
          * @return the dsl builder
          */
-        default Athena2EndpointBuilder operation(Athena2Operations operation) {
+        default Athena2EndpointBuilder operation(
+                org.apache.camel.component.aws2.athena.Athena2Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -440,7 +445,8 @@ public interface Athena2EndpointBuilderFactory {
          * @param outputType the value to set
          * @return the dsl builder
          */
-        default Athena2EndpointBuilder outputType(Athena2OutputType outputType) {
+        default Athena2EndpointBuilder outputType(
+                org.apache.camel.component.aws2.athena.Athena2OutputType outputType) {
             doSetProperty("outputType", outputType);
             return this;
         }
@@ -519,7 +525,8 @@ public interface Athena2EndpointBuilderFactory {
          * @param proxyProtocol the value to set
          * @return the dsl builder
          */
-        default Athena2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default Athena2EndpointBuilder proxyProtocol(
+                software.amazon.awssdk.core.Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -776,48 +783,6 @@ public interface Athena2EndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>software.amazon.awssdk.services.athena.model.EncryptionOption</code> enum.
-     */
-    enum EncryptionOption {
-        SSE_S3,
-        SSE_KMS,
-        CSE_KMS,
-        UNKNOWN_TO_SDK_VERSION;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.aws2.athena.Athena2Operations</code>
-     * enum.
-     */
-    enum Athena2Operations {
-        getQueryExecution,
-        getQueryResults,
-        listQueryExecutions,
-        startQueryExecution;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.aws2.athena.Athena2OutputType</code>
-     * enum.
-     */
-    enum Athena2OutputType {
-        StreamList,
-        SelectList,
-        S3Pointer;
-    }
-
-    /**
-     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
-     */
-    enum Protocol {
-        HTTP,
-        HTTPS;
-    }
-
     public interface Athena2Builders {
         /**
          * AWS Athena (camel-aws2-athena)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
index 31b006a..996cfd3 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -221,7 +225,7 @@ public interface AtlasMapEndpointBuilderFactory {
          * properties. ).
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atlasmap.AtlasMapEndpoint$TargetMapMode&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atlasmap.AtlasMapEndpoint.TargetMapMode&lt;/code&gt; type.
          * 
          * Default: MAP
          * Group: producer
@@ -230,7 +234,7 @@ public interface AtlasMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtlasMapEndpointBuilder targetMapMode(
-                TargetMapMode targetMapMode) {
+                org.apache.camel.component.atlasmap.AtlasMapEndpoint.TargetMapMode targetMapMode) {
             doSetProperty("targetMapMode", targetMapMode);
             return this;
         }
@@ -243,7 +247,7 @@ public interface AtlasMapEndpointBuilderFactory {
          * properties. ).
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atlasmap.AtlasMapEndpoint$TargetMapMode&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atlasmap.AtlasMapEndpoint.TargetMapMode&lt;/code&gt; type.
          * 
          * Default: MAP
          * Group: producer
@@ -274,16 +278,6 @@ public interface AtlasMapEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.atlasmap.AtlasMapEndpoint$TargetMapMode</code> enum.
-     */
-    enum TargetMapMode {
-        MAP,
-        MESSAGE_HEADER,
-        EXCHANGE_PROPERTY;
-    }
-
     public interface AtlasMapBuilders {
         /**
          * AtlasMap (camel-atlasmap)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java
index 79dc7ba..4a4b77b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Integrate with EMC's ViPR object data services using the Atmos Client.
@@ -228,7 +230,7 @@ public interface AtmosEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtmosEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -263,7 +265,7 @@ public interface AtmosEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtmosEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
index 5ba1149..c282a83 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
@@ -16,13 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.HeaderFilterStrategy;
 
 /**
  * Expose WebSocket endpoints using the Atmosphere framework.
@@ -154,7 +155,7 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtmosphereWebsocketEndpointConsumerBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -527,7 +528,7 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtmosphereWebsocketEndpointConsumerBuilder httpBinding(
-                Object httpBinding) {
+                org.apache.camel.http.common.HttpBinding httpBinding) {
             doSetProperty("httpBinding", httpBinding);
             return this;
         }
@@ -644,7 +645,7 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtmosphereWebsocketEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -679,7 +680,7 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtmosphereWebsocketEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -1020,7 +1021,7 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtmosphereWebsocketEndpointProducerBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -1271,7 +1272,7 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtmosphereWebsocketEndpointProducerBuilder httpBinding(
-                Object httpBinding) {
+                org.apache.camel.http.common.HttpBinding httpBinding) {
             doSetProperty("httpBinding", httpBinding);
             return this;
         }
@@ -1415,7 +1416,7 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtmosphereWebsocketEndpointBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -1576,7 +1577,7 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtmosphereWebsocketEndpointBuilder httpBinding(
-                Object httpBinding) {
+                org.apache.camel.http.common.HttpBinding httpBinding) {
             doSetProperty("httpBinding", httpBinding);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
index 6826f36..0acfce1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomEndpointBuilderFactory.java
@@ -16,18 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.Date;
+import java.util.*;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.PollingConsumerPollStrategy;
 
 /**
  * Poll Atom RSS feeds.
@@ -590,7 +587,8 @@ public interface AtomEndpointBuilderFactory {
          * @param runLoggingLevel the value to set
          * @return the dsl builder
          */
-        default AtomEndpointBuilder runLoggingLevel(LoggingLevel runLoggingLevel) {
+        default AtomEndpointBuilder runLoggingLevel(
+                org.apache.camel.LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
         }
@@ -841,7 +839,7 @@ public interface AtomEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomEndpointBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -876,7 +874,7 @@ public interface AtomEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomEndpointBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -911,7 +909,7 @@ public interface AtomEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomEndpointBuilder pollStrategy(
-                PollingConsumerPollStrategy pollStrategy) {
+                org.apache.camel.spi.PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixMapEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixMapEndpointBuilderFactory.java
index 62c3513..a13b7ac 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixMapEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixMapEndpointBuilderFactory.java
@@ -16,15 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Access Atomix's distributed map.
@@ -47,15 +46,14 @@ public interface AtomixMapEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixMapEndpointConsumerBuilder atomix(Object atomix) {
+        default AtomixMapEndpointConsumerBuilder atomix(io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -63,7 +61,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -93,7 +91,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.map.AtomixMap$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.map.AtomixMap.Action&lt;/code&gt; type.
          * 
          * Default: PUT
          * Group: common
@@ -102,7 +100,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixMapEndpointConsumerBuilder defaultAction(
-                Action defaultAction) {
+                org.apache.camel.component.atomix.client.map.AtomixMap.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -110,7 +108,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.map.AtomixMap$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.map.AtomixMap.Action&lt;/code&gt; type.
          * 
          * Default: PUT
          * Group: common
@@ -157,23 +155,7 @@ public interface AtomixMapEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixMapEndpointConsumerBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -314,7 +296,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMapEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -349,7 +331,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMapEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -480,7 +462,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMapEndpointConsumerBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -512,7 +494,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMapEndpointConsumerBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -545,7 +527,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMapEndpointConsumerBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -580,15 +562,14 @@ public interface AtomixMapEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixMapEndpointProducerBuilder atomix(Object atomix) {
+        default AtomixMapEndpointProducerBuilder atomix(io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -596,7 +577,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -626,7 +607,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.map.AtomixMap$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.map.AtomixMap.Action&lt;/code&gt; type.
          * 
          * Default: PUT
          * Group: common
@@ -635,7 +616,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixMapEndpointProducerBuilder defaultAction(
-                Action defaultAction) {
+                org.apache.camel.component.atomix.client.map.AtomixMap.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -643,7 +624,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.map.AtomixMap$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.map.AtomixMap.Action&lt;/code&gt; type.
          * 
          * Default: PUT
          * Group: common
@@ -690,23 +671,7 @@ public interface AtomixMapEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixMapEndpointProducerBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -947,7 +912,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMapEndpointProducerBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -979,7 +944,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMapEndpointProducerBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -1012,7 +977,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMapEndpointProducerBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -1048,15 +1013,14 @@ public interface AtomixMapEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixMapEndpointBuilder atomix(Object atomix) {
+        default AtomixMapEndpointBuilder atomix(io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -1064,7 +1028,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -1094,7 +1058,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.map.AtomixMap$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.map.AtomixMap.Action&lt;/code&gt; type.
          * 
          * Default: PUT
          * Group: common
@@ -1102,7 +1066,8 @@ public interface AtomixMapEndpointBuilderFactory {
          * @param defaultAction the value to set
          * @return the dsl builder
          */
-        default AtomixMapEndpointBuilder defaultAction(Action defaultAction) {
+        default AtomixMapEndpointBuilder defaultAction(
+                org.apache.camel.component.atomix.client.map.AtomixMap.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -1110,7 +1075,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.map.AtomixMap$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.map.AtomixMap.Action&lt;/code&gt; type.
          * 
          * Default: PUT
          * Group: common
@@ -1156,23 +1121,7 @@ public interface AtomixMapEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixMapEndpointBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -1362,7 +1311,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMapEndpointBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -1394,7 +1343,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMapEndpointBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -1427,7 +1376,7 @@ public interface AtomixMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMapEndpointBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -1450,35 +1399,6 @@ public interface AtomixMapEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.atomix.client.map.AtomixMap$Action</code> enum.
-     */
-    enum Action {
-        PUT,
-        PUT_IF_ABSENT,
-        GET,
-        CLEAR,
-        SIZE,
-        CONTAINS_KEY,
-        CONTAINS_VALUE,
-        IS_EMPTY,
-        ENTRY_SET,
-        REMOVE,
-        REPLACE,
-        VALUES;
-    }
-
-    /**
-     * Proxy enum for <code>io.atomix.resource.ReadConsistency</code> enum.
-     */
-    enum ReadConsistency {
-        ATOMIC,
-        ATOMIC_LEASE,
-        SEQUENTIAL,
-        LOCAL;
-    }
-
     public interface AtomixMapBuilders {
         /**
          * Atomix Map (camel-atomix)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixMessagingEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixMessagingEndpointBuilderFactory.java
index 1e0d61a..845007f 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixMessagingEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixMessagingEndpointBuilderFactory.java
@@ -16,15 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Access Atomix's group messaging.
@@ -47,15 +46,15 @@ public interface AtomixMessagingEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixMessagingEndpointConsumerBuilder atomix(Object atomix) {
+        default AtomixMessagingEndpointConsumerBuilder atomix(
+                io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -63,7 +62,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -78,7 +77,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The broadcast type.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging$BroadcastType&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType&lt;/code&gt; type.
          * 
          * Default: ALL
          * Group: common
@@ -87,7 +86,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixMessagingEndpointConsumerBuilder broadcastType(
-                BroadcastType broadcastType) {
+                org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType broadcastType) {
             doSetProperty("broadcastType", broadcastType);
             return this;
         }
@@ -95,7 +94,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The broadcast type.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging$BroadcastType&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType&lt;/code&gt; type.
          * 
          * Default: ALL
          * Group: common
@@ -142,7 +141,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action&lt;/code&gt; type.
          * 
          * Default: DIRECT
          * Group: common
@@ -151,7 +150,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixMessagingEndpointConsumerBuilder defaultAction(
-                Action defaultAction) {
+                org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -159,7 +158,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action&lt;/code&gt; type.
          * 
          * Default: DIRECT
          * Group: common
@@ -190,23 +189,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixMessagingEndpointConsumerBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -320,7 +303,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMessagingEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -355,7 +338,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMessagingEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -486,7 +469,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMessagingEndpointConsumerBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -518,7 +501,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMessagingEndpointConsumerBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -551,7 +534,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMessagingEndpointConsumerBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -586,15 +569,15 @@ public interface AtomixMessagingEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixMessagingEndpointProducerBuilder atomix(Object atomix) {
+        default AtomixMessagingEndpointProducerBuilder atomix(
+                io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -602,7 +585,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -617,7 +600,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The broadcast type.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging$BroadcastType&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType&lt;/code&gt; type.
          * 
          * Default: ALL
          * Group: common
@@ -626,7 +609,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixMessagingEndpointProducerBuilder broadcastType(
-                BroadcastType broadcastType) {
+                org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType broadcastType) {
             doSetProperty("broadcastType", broadcastType);
             return this;
         }
@@ -634,7 +617,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The broadcast type.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging$BroadcastType&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType&lt;/code&gt; type.
          * 
          * Default: ALL
          * Group: common
@@ -681,7 +664,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action&lt;/code&gt; type.
          * 
          * Default: DIRECT
          * Group: common
@@ -690,7 +673,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixMessagingEndpointProducerBuilder defaultAction(
-                Action defaultAction) {
+                org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -698,7 +681,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action&lt;/code&gt; type.
          * 
          * Default: DIRECT
          * Group: common
@@ -729,23 +712,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixMessagingEndpointProducerBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -959,7 +926,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMessagingEndpointProducerBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -991,7 +958,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMessagingEndpointProducerBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -1024,7 +991,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMessagingEndpointProducerBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -1060,15 +1027,14 @@ public interface AtomixMessagingEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixMessagingEndpointBuilder atomix(Object atomix) {
+        default AtomixMessagingEndpointBuilder atomix(io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -1076,7 +1042,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -1091,7 +1057,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The broadcast type.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging$BroadcastType&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType&lt;/code&gt; type.
          * 
          * Default: ALL
          * Group: common
@@ -1100,7 +1066,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixMessagingEndpointBuilder broadcastType(
-                BroadcastType broadcastType) {
+                org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType broadcastType) {
             doSetProperty("broadcastType", broadcastType);
             return this;
         }
@@ -1108,7 +1074,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The broadcast type.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging$BroadcastType&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType&lt;/code&gt; type.
          * 
          * Default: ALL
          * Group: common
@@ -1154,7 +1120,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action&lt;/code&gt; type.
          * 
          * Default: DIRECT
          * Group: common
@@ -1163,7 +1129,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixMessagingEndpointBuilder defaultAction(
-                Action defaultAction) {
+                org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -1171,7 +1137,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action&lt;/code&gt; type.
          * 
          * Default: DIRECT
          * Group: common
@@ -1201,23 +1167,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixMessagingEndpointBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -1381,7 +1331,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMessagingEndpointBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -1413,7 +1363,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMessagingEndpointBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -1446,7 +1396,7 @@ public interface AtomixMessagingEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMessagingEndpointBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -1469,34 +1419,6 @@ public interface AtomixMessagingEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.atomix.client.messaging.AtomixMessaging$BroadcastType</code> enum.
-     */
-    enum BroadcastType {
-        ALL,
-        RANDOM;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.atomix.client.messaging.AtomixMessaging$Action</code> enum.
-     */
-    enum Action {
-        DIRECT,
-        BROADCAST;
-    }
-
-    /**
-     * Proxy enum for <code>io.atomix.resource.ReadConsistency</code> enum.
-     */
-    enum ReadConsistency {
-        ATOMIC,
-        ATOMIC_LEASE,
-        SEQUENTIAL,
-        LOCAL;
-    }
-
     public interface AtomixMessagingBuilders {
         /**
          * Atomix Messaging (camel-atomix)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java
index 8cab0f4..30e33dc 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixMultiMapEndpointBuilderFactory.java
@@ -16,9 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -45,15 +46,14 @@ public interface AtomixMultiMapEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: producer
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixMultiMapEndpointBuilder atomix(Object atomix) {
+        default AtomixMultiMapEndpointBuilder atomix(io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -61,7 +61,7 @@ public interface AtomixMultiMapEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: producer
          * 
@@ -91,7 +91,7 @@ public interface AtomixMultiMapEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.multimap.AtomixMultiMap$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.multimap.AtomixMultiMap.Action&lt;/code&gt; type.
          * 
          * Default: PUT
          * Group: producer
@@ -99,7 +99,8 @@ public interface AtomixMultiMapEndpointBuilderFactory {
          * @param defaultAction the value to set
          * @return the dsl builder
          */
-        default AtomixMultiMapEndpointBuilder defaultAction(Action defaultAction) {
+        default AtomixMultiMapEndpointBuilder defaultAction(
+                org.apache.camel.component.atomix.client.multimap.AtomixMultiMap.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -107,7 +108,7 @@ public interface AtomixMultiMapEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.multimap.AtomixMultiMap$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.multimap.AtomixMultiMap.Action&lt;/code&gt; type.
          * 
          * Default: PUT
          * Group: producer
@@ -202,23 +203,7 @@ public interface AtomixMultiMapEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: producer
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixMultiMapEndpointBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: producer
          * 
@@ -408,7 +393,7 @@ public interface AtomixMultiMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMultiMapEndpointBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -440,7 +425,7 @@ public interface AtomixMultiMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMultiMapEndpointBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -473,7 +458,7 @@ public interface AtomixMultiMapEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixMultiMapEndpointBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -496,31 +481,6 @@ public interface AtomixMultiMapEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.atomix.client.multimap.AtomixMultiMap$Action</code> enum.
-     */
-    enum Action {
-        PUT,
-        GET,
-        CLEAR,
-        SIZE,
-        CONTAINS_KEY,
-        IS_EMPTY,
-        REMOVE,
-        REMOVE_VALUE;
-    }
-
-    /**
-     * Proxy enum for <code>io.atomix.resource.ReadConsistency</code> enum.
-     */
-    enum ReadConsistency {
-        ATOMIC,
-        ATOMIC_LEASE,
-        SEQUENTIAL,
-        LOCAL;
-    }
-
     public interface AtomixMultiMapBuilders {
         /**
          * Atomix MultiMap (camel-atomix)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixQueueEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixQueueEndpointBuilderFactory.java
index 44b14cb..7237330 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixQueueEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixQueueEndpointBuilderFactory.java
@@ -16,15 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Access Atomix's distributed queue.
@@ -47,15 +46,15 @@ public interface AtomixQueueEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixQueueEndpointConsumerBuilder atomix(Object atomix) {
+        default AtomixQueueEndpointConsumerBuilder atomix(
+                io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -63,7 +62,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -93,7 +92,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.queue.AtomixQueue$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.queue.AtomixQueue.Action&lt;/code&gt; type.
          * 
          * Default: ADD
          * Group: common
@@ -102,7 +101,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixQueueEndpointConsumerBuilder defaultAction(
-                Action defaultAction) {
+                org.apache.camel.component.atomix.client.queue.AtomixQueue.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -110,7 +109,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.queue.AtomixQueue$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.queue.AtomixQueue.Action&lt;/code&gt; type.
          * 
          * Default: ADD
          * Group: common
@@ -126,23 +125,7 @@ public interface AtomixQueueEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixQueueEndpointConsumerBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -255,7 +238,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixQueueEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -290,7 +273,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixQueueEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -421,7 +404,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixQueueEndpointConsumerBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -453,7 +436,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixQueueEndpointConsumerBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -486,7 +469,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixQueueEndpointConsumerBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -521,15 +504,15 @@ public interface AtomixQueueEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixQueueEndpointProducerBuilder atomix(Object atomix) {
+        default AtomixQueueEndpointProducerBuilder atomix(
+                io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -537,7 +520,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -567,7 +550,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.queue.AtomixQueue$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.queue.AtomixQueue.Action&lt;/code&gt; type.
          * 
          * Default: ADD
          * Group: common
@@ -576,7 +559,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixQueueEndpointProducerBuilder defaultAction(
-                Action defaultAction) {
+                org.apache.camel.component.atomix.client.queue.AtomixQueue.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -584,7 +567,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.queue.AtomixQueue$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.queue.AtomixQueue.Action&lt;/code&gt; type.
          * 
          * Default: ADD
          * Group: common
@@ -600,23 +583,7 @@ public interface AtomixQueueEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixQueueEndpointProducerBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -829,7 +796,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixQueueEndpointProducerBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -861,7 +828,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixQueueEndpointProducerBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -894,7 +861,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixQueueEndpointProducerBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -930,15 +897,14 @@ public interface AtomixQueueEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixQueueEndpointBuilder atomix(Object atomix) {
+        default AtomixQueueEndpointBuilder atomix(io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -946,7 +912,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -976,7 +942,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.queue.AtomixQueue$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.queue.AtomixQueue.Action&lt;/code&gt; type.
          * 
          * Default: ADD
          * Group: common
@@ -984,7 +950,8 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @param defaultAction the value to set
          * @return the dsl builder
          */
-        default AtomixQueueEndpointBuilder defaultAction(Action defaultAction) {
+        default AtomixQueueEndpointBuilder defaultAction(
+                org.apache.camel.component.atomix.client.queue.AtomixQueue.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -992,7 +959,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.queue.AtomixQueue$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.queue.AtomixQueue.Action&lt;/code&gt; type.
          * 
          * Default: ADD
          * Group: common
@@ -1007,23 +974,7 @@ public interface AtomixQueueEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixQueueEndpointBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -1185,7 +1136,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixQueueEndpointBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -1217,7 +1168,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixQueueEndpointBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -1250,7 +1201,7 @@ public interface AtomixQueueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixQueueEndpointBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -1273,32 +1224,6 @@ public interface AtomixQueueEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.atomix.client.queue.AtomixQueue$Action</code> enum.
-     */
-    enum Action {
-        ADD,
-        OFFER,
-        PEEK,
-        POLL,
-        CLEAR,
-        CONTAINS,
-        IS_EMPTY,
-        REMOVE,
-        SIZE;
-    }
-
-    /**
-     * Proxy enum for <code>io.atomix.resource.ReadConsistency</code> enum.
-     */
-    enum ReadConsistency {
-        ATOMIC,
-        ATOMIC_LEASE,
-        SEQUENTIAL,
-        LOCAL;
-    }
-
     public interface AtomixQueueBuilders {
         /**
          * Atomix Queue (camel-atomix)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixSetEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixSetEndpointBuilderFactory.java
index 1dde65f..e12263a 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixSetEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixSetEndpointBuilderFactory.java
@@ -16,15 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Access Atomix's distributed set.
@@ -47,15 +46,14 @@ public interface AtomixSetEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixSetEndpointConsumerBuilder atomix(Object atomix) {
+        default AtomixSetEndpointConsumerBuilder atomix(io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -63,7 +61,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -93,7 +91,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.set.AtomixSet$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.set.AtomixSet.Action&lt;/code&gt; type.
          * 
          * Default: ADD
          * Group: common
@@ -102,7 +100,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixSetEndpointConsumerBuilder defaultAction(
-                Action defaultAction) {
+                org.apache.camel.component.atomix.client.set.AtomixSet.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -110,7 +108,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.set.AtomixSet$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.set.AtomixSet.Action&lt;/code&gt; type.
          * 
          * Default: ADD
          * Group: common
@@ -126,23 +124,7 @@ public interface AtomixSetEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixSetEndpointConsumerBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -283,7 +265,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixSetEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -318,7 +300,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixSetEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -449,7 +431,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixSetEndpointConsumerBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -481,7 +463,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixSetEndpointConsumerBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -514,7 +496,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixSetEndpointConsumerBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -549,15 +531,14 @@ public interface AtomixSetEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixSetEndpointProducerBuilder atomix(Object atomix) {
+        default AtomixSetEndpointProducerBuilder atomix(io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -565,7 +546,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -595,7 +576,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.set.AtomixSet$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.set.AtomixSet.Action&lt;/code&gt; type.
          * 
          * Default: ADD
          * Group: common
@@ -604,7 +585,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixSetEndpointProducerBuilder defaultAction(
-                Action defaultAction) {
+                org.apache.camel.component.atomix.client.set.AtomixSet.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -612,7 +593,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.set.AtomixSet$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.set.AtomixSet.Action&lt;/code&gt; type.
          * 
          * Default: ADD
          * Group: common
@@ -628,23 +609,7 @@ public interface AtomixSetEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixSetEndpointProducerBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -885,7 +850,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixSetEndpointProducerBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -917,7 +882,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixSetEndpointProducerBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -950,7 +915,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixSetEndpointProducerBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -986,15 +951,14 @@ public interface AtomixSetEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixSetEndpointBuilder atomix(Object atomix) {
+        default AtomixSetEndpointBuilder atomix(io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -1002,7 +966,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -1032,7 +996,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.set.AtomixSet$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.set.AtomixSet.Action&lt;/code&gt; type.
          * 
          * Default: ADD
          * Group: common
@@ -1040,7 +1004,8 @@ public interface AtomixSetEndpointBuilderFactory {
          * @param defaultAction the value to set
          * @return the dsl builder
          */
-        default AtomixSetEndpointBuilder defaultAction(Action defaultAction) {
+        default AtomixSetEndpointBuilder defaultAction(
+                org.apache.camel.component.atomix.client.set.AtomixSet.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -1048,7 +1013,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.set.AtomixSet$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.set.AtomixSet.Action&lt;/code&gt; type.
          * 
          * Default: ADD
          * Group: common
@@ -1063,23 +1028,7 @@ public interface AtomixSetEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixSetEndpointBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -1269,7 +1218,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixSetEndpointBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -1301,7 +1250,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixSetEndpointBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -1334,7 +1283,7 @@ public interface AtomixSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixSetEndpointBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -1357,29 +1306,6 @@ public interface AtomixSetEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.atomix.client.set.AtomixSet$Action</code> enum.
-     */
-    enum Action {
-        ADD,
-        CLEAR,
-        CONTAINS,
-        IS_EMPTY,
-        REMOVE,
-        SIZE;
-    }
-
-    /**
-     * Proxy enum for <code>io.atomix.resource.ReadConsistency</code> enum.
-     */
-    enum ReadConsistency {
-        ATOMIC,
-        ATOMIC_LEASE,
-        SEQUENTIAL,
-        LOCAL;
-    }
-
     public interface AtomixSetBuilders {
         /**
          * Atomix Set (camel-atomix)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixValueEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixValueEndpointBuilderFactory.java
index c7666a4..85f001b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixValueEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtomixValueEndpointBuilderFactory.java
@@ -16,15 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Access Atomix's distributed value.
@@ -47,15 +46,15 @@ public interface AtomixValueEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixValueEndpointConsumerBuilder atomix(Object atomix) {
+        default AtomixValueEndpointConsumerBuilder atomix(
+                io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -63,7 +62,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -93,7 +92,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.value.AtomixValue$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.value.AtomixValue.Action&lt;/code&gt; type.
          * 
          * Default: SET
          * Group: common
@@ -102,7 +101,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixValueEndpointConsumerBuilder defaultAction(
-                Action defaultAction) {
+                org.apache.camel.component.atomix.client.value.AtomixValue.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -110,7 +109,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.value.AtomixValue$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.value.AtomixValue.Action&lt;/code&gt; type.
          * 
          * Default: SET
          * Group: common
@@ -126,23 +125,7 @@ public interface AtomixValueEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixValueEndpointConsumerBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -283,7 +266,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixValueEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -318,7 +301,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixValueEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -449,7 +432,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixValueEndpointConsumerBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -481,7 +464,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixValueEndpointConsumerBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -514,7 +497,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixValueEndpointConsumerBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -549,15 +532,15 @@ public interface AtomixValueEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixValueEndpointProducerBuilder atomix(Object atomix) {
+        default AtomixValueEndpointProducerBuilder atomix(
+                io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -565,7 +548,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -595,7 +578,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.value.AtomixValue$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.value.AtomixValue.Action&lt;/code&gt; type.
          * 
          * Default: SET
          * Group: common
@@ -604,7 +587,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AtomixValueEndpointProducerBuilder defaultAction(
-                Action defaultAction) {
+                org.apache.camel.component.atomix.client.value.AtomixValue.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -612,7 +595,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.value.AtomixValue$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.value.AtomixValue.Action&lt;/code&gt; type.
          * 
          * Default: SET
          * Group: common
@@ -628,23 +611,7 @@ public interface AtomixValueEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixValueEndpointProducerBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -885,7 +852,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixValueEndpointProducerBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -917,7 +884,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixValueEndpointProducerBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -950,7 +917,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixValueEndpointProducerBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -986,15 +953,14 @@ public interface AtomixValueEndpointBuilderFactory {
         /**
          * The Atomix instance to use.
          * 
-         * The option is a: &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt;
-         * type.
+         * The option is a: &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
          * @param atomix the value to set
          * @return the dsl builder
          */
-        default AtomixValueEndpointBuilder atomix(Object atomix) {
+        default AtomixValueEndpointBuilder atomix(io.atomix.Atomix atomix) {
             doSetProperty("atomix", atomix);
             return this;
         }
@@ -1002,7 +968,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * The Atomix instance to use.
          * 
          * The option will be converted to a
-         * &lt;code&gt;io.atomix.AtomixClient&lt;/code&gt; type.
+         * &lt;code&gt;io.atomix.Atomix&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -1032,7 +998,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * The default action.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.atomix.client.value.AtomixValue$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.value.AtomixValue.Action&lt;/code&gt; type.
          * 
          * Default: SET
          * Group: common
@@ -1040,7 +1006,8 @@ public interface AtomixValueEndpointBuilderFactory {
          * @param defaultAction the value to set
          * @return the dsl builder
          */
-        default AtomixValueEndpointBuilder defaultAction(Action defaultAction) {
+        default AtomixValueEndpointBuilder defaultAction(
+                org.apache.camel.component.atomix.client.value.AtomixValue.Action defaultAction) {
             doSetProperty("defaultAction", defaultAction);
             return this;
         }
@@ -1048,7 +1015,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * The default action.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.atomix.client.value.AtomixValue$Action&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.atomix.client.value.AtomixValue.Action&lt;/code&gt; type.
          * 
          * Default: SET
          * Group: common
@@ -1063,23 +1030,7 @@ public interface AtomixValueEndpointBuilderFactory {
         /**
          * The address of the nodes composing the cluster.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param nodes the value to set
-         * @return the dsl builder
-         */
-        default AtomixValueEndpointBuilder nodes(List<Object> nodes) {
-            doSetProperty("nodes", nodes);
-            return this;
-        }
-        /**
-         * The address of the nodes composing the cluster.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;io.atomix.catalyst.transport.Address&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -1269,7 +1220,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixValueEndpointBuilder readConsistency(
-                ReadConsistency readConsistency) {
+                io.atomix.resource.ReadConsistency readConsistency) {
             doSetProperty("readConsistency", readConsistency);
             return this;
         }
@@ -1301,7 +1252,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixValueEndpointBuilder resourceConfigs(
-                Map<String, Properties> resourceConfigs) {
+                Map<java.lang.String, java.util.Properties> resourceConfigs) {
             doSetProperty("resourceConfigs", resourceConfigs);
             return this;
         }
@@ -1334,7 +1285,7 @@ public interface AtomixValueEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAtomixValueEndpointBuilder resourceOptions(
-                Map<String, Properties> resourceOptions) {
+                Map<java.lang.String, java.util.Properties> resourceOptions) {
             doSetProperty("resourceOptions", resourceOptions);
             return this;
         }
@@ -1357,27 +1308,6 @@ public interface AtomixValueEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.atomix.client.value.AtomixValue$Action</code> enum.
-     */
-    enum Action {
-        SET,
-        GET,
-        GET_AND_SET,
-        COMPARE_AND_SET;
-    }
-
-    /**
-     * Proxy enum for <code>io.atomix.resource.ReadConsistency</code> enum.
-     */
-    enum ReadConsistency {
-        ATOMIC,
-        ATOMIC_LEASE,
-        SEQUENTIAL,
-        LOCAL;
-    }
-
     public interface AtomixValueBuilders {
         /**
          * Atomix Value (camel-atomix)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
index e42e4f1..281ef67 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AvroEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Produce or consume Apache Avro RPC services.
@@ -52,7 +54,8 @@ public interface AvroEndpointBuilderFactory {
          * @param protocol the value to set
          * @return the dsl builder
          */
-        default AvroEndpointConsumerBuilder protocol(Object protocol) {
+        default AvroEndpointConsumerBuilder protocol(
+                org.apache.avro.Protocol protocol) {
             doSetProperty("protocol", protocol);
             return this;
         }
@@ -258,7 +261,7 @@ public interface AvroEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAvroEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -293,7 +296,7 @@ public interface AvroEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedAvroEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -335,7 +338,8 @@ public interface AvroEndpointBuilderFactory {
          * @param protocol the value to set
          * @return the dsl builder
          */
-        default AvroEndpointProducerBuilder protocol(Object protocol) {
+        default AvroEndpointProducerBuilder protocol(
+                org.apache.avro.Protocol protocol) {
             doSetProperty("protocol", protocol);
             return this;
         }
@@ -553,7 +557,7 @@ public interface AvroEndpointBuilderFactory {
          * @param protocol the value to set
          * @return the dsl builder
          */
-        default AvroEndpointBuilder protocol(Object protocol) {
+        default AvroEndpointBuilder protocol(org.apache.avro.Protocol protocol) {
             doSetProperty("protocol", protocol);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
index ecc424c..6a6322e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanEndpointBuilderFactory.java
@@ -16,9 +16,12 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.BeanScope;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
@@ -109,7 +112,7 @@ public interface BeanEndpointBuilderFactory {
          * @param scope the value to set
          * @return the dsl builder
          */
-        default BeanEndpointBuilder scope(BeanScope scope) {
+        default BeanEndpointBuilder scope(org.apache.camel.BeanScope scope) {
             doSetProperty("scope", scope);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
index 15e013f..369a7d5 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -160,7 +164,7 @@ public interface BeanValidatorEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBeanValidatorEndpointBuilder constraintValidatorFactory(
-                Object constraintValidatorFactory) {
+                javax.validation.ConstraintValidatorFactory constraintValidatorFactory) {
             doSetProperty("constraintValidatorFactory", constraintValidatorFactory);
             return this;
         }
@@ -193,7 +197,7 @@ public interface BeanValidatorEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBeanValidatorEndpointBuilder messageInterpolator(
-                Object messageInterpolator) {
+                javax.validation.MessageInterpolator messageInterpolator) {
             doSetProperty("messageInterpolator", messageInterpolator);
             return this;
         }
@@ -225,7 +229,7 @@ public interface BeanValidatorEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBeanValidatorEndpointBuilder traversableResolver(
-                Object traversableResolver) {
+                javax.validation.TraversableResolver traversableResolver) {
             doSetProperty("traversableResolver", traversableResolver);
             return this;
         }
@@ -258,7 +262,7 @@ public interface BeanValidatorEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBeanValidatorEndpointBuilder validationProviderResolver(
-                Object validationProviderResolver) {
+                javax.validation.ValidationProviderResolver validationProviderResolver) {
             doSetProperty("validationProviderResolver", validationProviderResolver);
             return this;
         }
@@ -291,7 +295,7 @@ public interface BeanValidatorEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBeanValidatorEndpointBuilder validatorFactory(
-                Object validatorFactory) {
+                javax.validation.ValidatorFactory validatorFactory) {
             doSetProperty("validatorFactory", validatorFactory);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java
index 31c9b13..d17b4c9 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanstalkEndpointBuilderFactory.java
@@ -16,17 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.PollingConsumerPollStrategy;
 
 /**
  * Retrieve and post-process Beanstalk jobs.
@@ -64,7 +62,7 @@ public interface BeanstalkEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BeanstalkEndpointConsumerBuilder command(
-                BeanstalkCommand command) {
+                org.apache.camel.component.beanstalk.BeanstalkCommand command) {
             doSetProperty("command", command);
             return this;
         }
@@ -272,7 +270,7 @@ public interface BeanstalkEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BeanstalkEndpointConsumerBuilder onFailure(
-                BeanstalkCommand onFailure) {
+                org.apache.camel.component.beanstalk.BeanstalkCommand onFailure) {
             doSetProperty("onFailure", onFailure);
             return this;
         }
@@ -603,7 +601,7 @@ public interface BeanstalkEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BeanstalkEndpointConsumerBuilder runLoggingLevel(
-                LoggingLevel runLoggingLevel) {
+                org.apache.camel.LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
         }
@@ -861,7 +859,7 @@ public interface BeanstalkEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBeanstalkEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -896,7 +894,7 @@ public interface BeanstalkEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBeanstalkEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -931,7 +929,7 @@ public interface BeanstalkEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBeanstalkEndpointConsumerBuilder pollStrategy(
-                PollingConsumerPollStrategy pollStrategy) {
+                org.apache.camel.spi.PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
         }
@@ -983,7 +981,7 @@ public interface BeanstalkEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BeanstalkEndpointProducerBuilder command(
-                BeanstalkCommand command) {
+                org.apache.camel.component.beanstalk.BeanstalkCommand command) {
             doSetProperty("command", command);
             return this;
         }
@@ -1190,7 +1188,8 @@ public interface BeanstalkEndpointBuilderFactory {
          * @param command the value to set
          * @return the dsl builder
          */
-        default BeanstalkEndpointBuilder command(BeanstalkCommand command) {
+        default BeanstalkEndpointBuilder command(
+                org.apache.camel.component.beanstalk.BeanstalkCommand command) {
             doSetProperty("command", command);
             return this;
         }
@@ -1321,19 +1320,6 @@ public interface BeanstalkEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.beanstalk.BeanstalkCommand</code> enum.
-     */
-    enum BeanstalkCommand {
-        bury,
-        release,
-        put,
-        touch,
-        delete,
-        kick;
-    }
-
     public interface BeanstalkBuilders {
         /**
          * Beanstalk (camel-beanstalk)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobEndpointBuilderFactory.java
index d3d629e..3f9b633 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BlobEndpointBuilderFactory.java
@@ -16,19 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.time.Duration;
-import java.time.OffsetDateTime;
+import java.util.*;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.PollingConsumerPollStrategy;
 
 /**
  * Store and retrieve blobs from Azure Storage Blob Service.
@@ -117,7 +113,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BlobEndpointConsumerBuilder blobServiceClient(
-                Object blobServiceClient) {
+                com.azure.storage.blob.BlobServiceClient blobServiceClient) {
             doSetProperty("blobServiceClient", blobServiceClient);
             return this;
         }
@@ -159,7 +155,8 @@ public interface BlobEndpointBuilderFactory {
          * @param blobType the value to set
          * @return the dsl builder
          */
-        default BlobEndpointConsumerBuilder blobType(BlobType blobType) {
+        default BlobEndpointConsumerBuilder blobType(
+                org.apache.camel.component.azure.storage.blob.BlobType blobType) {
             doSetProperty("blobType", blobType);
             return this;
         }
@@ -225,7 +222,8 @@ public interface BlobEndpointBuilderFactory {
          * @param credentials the value to set
          * @return the dsl builder
          */
-        default BlobEndpointConsumerBuilder credentials(Object credentials) {
+        default BlobEndpointConsumerBuilder credentials(
+                com.azure.storage.common.StorageSharedKeyCredential credentials) {
             doSetProperty("credentials", credentials);
             return this;
         }
@@ -414,7 +412,8 @@ public interface BlobEndpointBuilderFactory {
          * @param serviceClient the value to set
          * @return the dsl builder
          */
-        default BlobEndpointConsumerBuilder serviceClient(Object serviceClient) {
+        default BlobEndpointConsumerBuilder serviceClient(
+                com.azure.storage.blob.BlobServiceClient serviceClient) {
             doSetProperty("serviceClient", serviceClient);
             return this;
         }
@@ -453,7 +452,7 @@ public interface BlobEndpointBuilderFactory {
          * @param timeout the value to set
          * @return the dsl builder
          */
-        default BlobEndpointConsumerBuilder timeout(Duration timeout) {
+        default BlobEndpointConsumerBuilder timeout(java.time.Duration timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -798,7 +797,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BlobEndpointConsumerBuilder runLoggingLevel(
-                LoggingLevel runLoggingLevel) {
+                org.apache.camel.LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
         }
@@ -1086,7 +1085,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBlobEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -1121,7 +1120,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBlobEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -1156,7 +1155,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBlobEndpointConsumerBuilder pollStrategy(
-                PollingConsumerPollStrategy pollStrategy) {
+                org.apache.camel.spi.PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
         }
@@ -1259,7 +1258,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BlobEndpointProducerBuilder blobServiceClient(
-                Object blobServiceClient) {
+                com.azure.storage.blob.BlobServiceClient blobServiceClient) {
             doSetProperty("blobServiceClient", blobServiceClient);
             return this;
         }
@@ -1301,7 +1300,8 @@ public interface BlobEndpointBuilderFactory {
          * @param blobType the value to set
          * @return the dsl builder
          */
-        default BlobEndpointProducerBuilder blobType(BlobType blobType) {
+        default BlobEndpointProducerBuilder blobType(
+                org.apache.camel.component.azure.storage.blob.BlobType blobType) {
             doSetProperty("blobType", blobType);
             return this;
         }
@@ -1367,7 +1367,8 @@ public interface BlobEndpointBuilderFactory {
          * @param credentials the value to set
          * @return the dsl builder
          */
-        default BlobEndpointProducerBuilder credentials(Object credentials) {
+        default BlobEndpointProducerBuilder credentials(
+                com.azure.storage.common.StorageSharedKeyCredential credentials) {
             doSetProperty("credentials", credentials);
             return this;
         }
@@ -1556,7 +1557,8 @@ public interface BlobEndpointBuilderFactory {
          * @param serviceClient the value to set
          * @return the dsl builder
          */
-        default BlobEndpointProducerBuilder serviceClient(Object serviceClient) {
+        default BlobEndpointProducerBuilder serviceClient(
+                com.azure.storage.blob.BlobServiceClient serviceClient) {
             doSetProperty("serviceClient", serviceClient);
             return this;
         }
@@ -1595,7 +1597,7 @@ public interface BlobEndpointBuilderFactory {
          * @param timeout the value to set
          * @return the dsl builder
          */
-        default BlobEndpointProducerBuilder timeout(Duration timeout) {
+        default BlobEndpointProducerBuilder timeout(java.time.Duration timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -1666,7 +1668,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BlobEndpointProducerBuilder blockListType(
-                BlockListType blockListType) {
+                com.azure.storage.blob.models.BlockListType blockListType) {
             doSetProperty("blockListType", blockListType);
             return this;
         }
@@ -1701,7 +1703,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BlobEndpointProducerBuilder changeFeedContext(
-                Object changeFeedContext) {
+                com.azure.core.util.Context changeFeedContext) {
             doSetProperty("changeFeedContext", changeFeedContext);
             return this;
         }
@@ -1739,7 +1741,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BlobEndpointProducerBuilder changeFeedEndTime(
-                OffsetDateTime changeFeedEndTime) {
+                java.time.OffsetDateTime changeFeedEndTime) {
             doSetProperty("changeFeedEndTime", changeFeedEndTime);
             return this;
         }
@@ -1779,7 +1781,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BlobEndpointProducerBuilder changeFeedStartTime(
-                OffsetDateTime changeFeedStartTime) {
+                java.time.OffsetDateTime changeFeedStartTime) {
             doSetProperty("changeFeedStartTime", changeFeedStartTime);
             return this;
         }
@@ -2034,7 +2036,7 @@ public interface BlobEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BlobEndpointProducerBuilder operation(
-                BlobOperationsDefinition operation) {
+                org.apache.camel.component.azure.storage.blob.BlobOperationsDefinition operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -2211,7 +2213,8 @@ public interface BlobEndpointBuilderFactory {
          * @param blobServiceClient the value to set
          * @return the dsl builder
          */
-        default BlobEndpointBuilder blobServiceClient(Object blobServiceClient) {
+        default BlobEndpointBuilder blobServiceClient(
+                com.azure.storage.blob.BlobServiceClient blobServiceClient) {
             doSetProperty("blobServiceClient", blobServiceClient);
             return this;
         }
@@ -2252,7 +2255,8 @@ public interface BlobEndpointBuilderFactory {
          * @param blobType the value to set
          * @return the dsl builder
          */
-        default BlobEndpointBuilder blobType(BlobType blobType) {
+        default BlobEndpointBuilder blobType(
+                org.apache.camel.component.azure.storage.blob.BlobType blobType) {
             doSetProperty("blobType", blobType);
             return this;
         }
@@ -2318,7 +2322,8 @@ public interface BlobEndpointBuilderFactory {
          * @param credentials the value to set
          * @return the dsl builder
          */
-        default BlobEndpointBuilder credentials(Object credentials) {
+        default BlobEndpointBuilder credentials(
+                com.azure.storage.common.StorageSharedKeyCredential credentials) {
             doSetProperty("credentials", credentials);
             return this;
         }
@@ -2503,7 +2508,8 @@ public interface BlobEndpointBuilderFactory {
          * @param serviceClient the value to set
          * @return the dsl builder
          */
-        default BlobEndpointBuilder serviceClient(Object serviceClient) {
+        default BlobEndpointBuilder serviceClient(
+                com.azure.storage.blob.BlobServiceClient serviceClient) {
             doSetProperty("serviceClient", serviceClient);
             return this;
         }
@@ -2542,7 +2548,7 @@ public interface BlobEndpointBuilderFactory {
          * @param timeout the value to set
          * @return the dsl builder
          */
-        default BlobEndpointBuilder timeout(Duration timeout) {
+        default BlobEndpointBuilder timeout(java.time.Duration timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -2609,54 +2615,6 @@ public interface BlobEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.azure.storage.blob.BlobType</code> enum.
-     */
-    enum BlobType {
-        blockblob,
-        appendblob,
-        pageblob;
-    }
-
-    /**
-     * Proxy enum for <code>com.azure.storage.blob.models.BlockListType</code>
-     * enum.
-     */
-    enum BlockListType {
-        COMMITTED,
-        UNCOMMITTED,
-        ALL;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.azure.storage.blob.BlobOperationsDefinition</code> enum.
-     */
-    enum BlobOperationsDefinition {
-        listBlobContainers,
-        createBlobContainer,
-        deleteBlobContainer,
-        listBlobs,
-        getBlob,
-        deleteBlob,
-        downloadBlobToFile,
-        downloadLink,
-        uploadBlockBlob,
-        stageBlockBlobList,
-        commitBlobBlockList,
-        getBlobBlockList,
-        createAppendBlob,
-        commitAppendBlob,
-        createPageBlob,
-        uploadPageBlob,
-        resizePageBlob,
-        clearPageBlob,
-        getPageBlobRanges,
-        getChangeFeed,
-        copyBlob;
-    }
-
     public interface BlobBuilders {
         /**
          * Azure Storage Blob Service (camel-azure-storage-blob)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
index 7049b8f..b9e09ac4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BonitaEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
index 98532b0..709f9df 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
@@ -16,13 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Upload, download and manage files, folders, groups, collaborations, etc. on
@@ -186,7 +187,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BoxEndpointConsumerBuilder sslContextParameters(
-                Object sslContextParameters) {
+                org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
@@ -261,7 +262,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBoxEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -296,7 +297,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBoxEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -328,7 +329,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBoxEndpointConsumerBuilder httpParams(
-                Map<String, Object> httpParams) {
+                Map<java.lang.String, java.lang.Object> httpParams) {
             doSetProperty("httpParams", httpParams);
             return this;
         }
@@ -360,7 +361,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBoxEndpointConsumerBuilder accessTokenCache(
-                Object accessTokenCache) {
+                com.box.sdk.IAccessTokenCache accessTokenCache) {
             doSetProperty("accessTokenCache", accessTokenCache);
             return this;
         }
@@ -394,7 +395,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBoxEndpointConsumerBuilder encryptionAlgorithm(
-                EncryptionAlgorithm encryptionAlgorithm) {
+                com.box.sdk.EncryptionAlgorithm encryptionAlgorithm) {
             doSetProperty("encryptionAlgorithm", encryptionAlgorithm);
             return this;
         }
@@ -651,7 +652,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BoxEndpointProducerBuilder sslContextParameters(
-                Object sslContextParameters) {
+                org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
@@ -723,7 +724,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBoxEndpointProducerBuilder httpParams(
-                Map<String, Object> httpParams) {
+                Map<java.lang.String, java.lang.Object> httpParams) {
             doSetProperty("httpParams", httpParams);
             return this;
         }
@@ -755,7 +756,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBoxEndpointProducerBuilder accessTokenCache(
-                Object accessTokenCache) {
+                com.box.sdk.IAccessTokenCache accessTokenCache) {
             doSetProperty("accessTokenCache", accessTokenCache);
             return this;
         }
@@ -789,7 +790,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBoxEndpointProducerBuilder encryptionAlgorithm(
-                EncryptionAlgorithm encryptionAlgorithm) {
+                com.box.sdk.EncryptionAlgorithm encryptionAlgorithm) {
             doSetProperty("encryptionAlgorithm", encryptionAlgorithm);
             return this;
         }
@@ -996,7 +997,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default BoxEndpointBuilder sslContextParameters(
-                Object sslContextParameters) {
+                org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
@@ -1069,7 +1070,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBoxEndpointBuilder httpParams(
-                Map<String, Object> httpParams) {
+                Map<java.lang.String, java.lang.Object> httpParams) {
             doSetProperty("httpParams", httpParams);
             return this;
         }
@@ -1101,7 +1102,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBoxEndpointBuilder accessTokenCache(
-                Object accessTokenCache) {
+                com.box.sdk.IAccessTokenCache accessTokenCache) {
             doSetProperty("accessTokenCache", accessTokenCache);
             return this;
         }
@@ -1135,7 +1136,7 @@ public interface BoxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBoxEndpointBuilder encryptionAlgorithm(
-                EncryptionAlgorithm encryptionAlgorithm) {
+                com.box.sdk.EncryptionAlgorithm encryptionAlgorithm) {
             doSetProperty("encryptionAlgorithm", encryptionAlgorithm);
             return this;
         }
@@ -1190,15 +1191,6 @@ public interface BoxEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for <code>com.box.sdk.EncryptionAlgorithm</code> enum.
-     */
-    enum EncryptionAlgorithm {
-        RSA_SHA_256,
-        RSA_SHA_384,
-        RSA_SHA_512;
-    }
-
     public interface BoxBuilders {
         /**
          * Box (camel-box)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
index bf24152..44a0364 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
index 1971c37..3f968f8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Inspect the messages received on endpoints supporting BrowsableEndpoint.
@@ -112,7 +114,7 @@ public interface BrowseEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBrowseEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -147,7 +149,7 @@ public interface BrowseEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedBrowseEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
index 427f266..ffc3e32 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMISEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMISEndpointBuilderFactory.java
index f55df57..cc08dbe 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMISEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CMISEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Read and write data from to/from a CMIS compliant content repositories.
@@ -262,7 +264,7 @@ public interface CMISEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCMISEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -297,7 +299,7 @@ public interface CMISEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCMISEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -330,7 +332,7 @@ public interface CMISEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCMISEndpointConsumerBuilder sessionFacadeFactory(
-                Object sessionFacadeFactory) {
+                org.apache.camel.component.cmis.CMISSessionFacadeFactory sessionFacadeFactory) {
             doSetProperty("sessionFacadeFactory", sessionFacadeFactory);
             return this;
         }
@@ -602,7 +604,7 @@ public interface CMISEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCMISEndpointProducerBuilder sessionFacadeFactory(
-                Object sessionFacadeFactory) {
+                org.apache.camel.component.cmis.CMISSessionFacadeFactory sessionFacadeFactory) {
             doSetProperty("sessionFacadeFactory", sessionFacadeFactory);
             return this;
         }
@@ -794,7 +796,7 @@ public interface CMISEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCMISEndpointBuilder sessionFacadeFactory(
-                Object sessionFacadeFactory) {
+                org.apache.camel.component.cmis.CMISSessionFacadeFactory sessionFacadeFactory) {
             doSetProperty("sessionFacadeFactory", sessionFacadeFactory);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
index d6c25e8..0e79cf0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -65,7 +69,8 @@ public interface CaffeineCacheEndpointBuilderFactory {
          * @param cacheLoader the value to set
          * @return the dsl builder
          */
-        default CaffeineCacheEndpointBuilder cacheLoader(Object cacheLoader) {
+        default CaffeineCacheEndpointBuilder cacheLoader(
+                com.github.benmanes.caffeine.cache.CacheLoader cacheLoader) {
             doSetProperty("cacheLoader", cacheLoader);
             return this;
         }
@@ -132,7 +137,7 @@ public interface CaffeineCacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CaffeineCacheEndpointBuilder evictionType(
-                EvictionType evictionType) {
+                org.apache.camel.component.caffeine.EvictionType evictionType) {
             doSetProperty("evictionType", evictionType);
             return this;
         }
@@ -373,7 +378,7 @@ public interface CaffeineCacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CaffeineCacheEndpointBuilder removalListener(
-                Object removalListener) {
+                com.github.benmanes.caffeine.cache.RemovalListener removalListener) {
             doSetProperty("removalListener", removalListener);
             return this;
         }
@@ -404,7 +409,8 @@ public interface CaffeineCacheEndpointBuilderFactory {
          * @param statsCounter the value to set
          * @return the dsl builder
          */
-        default CaffeineCacheEndpointBuilder statsCounter(Object statsCounter) {
+        default CaffeineCacheEndpointBuilder statsCounter(
+                com.github.benmanes.caffeine.cache.stats.StatsCounter statsCounter) {
             doSetProperty("statsCounter", statsCounter);
             return this;
         }
@@ -495,15 +501,6 @@ public interface CaffeineCacheEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.caffeine.EvictionType</code> enum.
-     */
-    enum EvictionType {
-        SIZE_BASED,
-        TIME_BASED;
-    }
-
     public interface CaffeineCacheBuilders {
         /**
          * Caffeine Cache (camel-caffeine)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
index bc158d8..37a0c03 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -65,7 +69,8 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
          * @param cacheLoader the value to set
          * @return the dsl builder
          */
-        default CaffeineLoadCacheEndpointBuilder cacheLoader(Object cacheLoader) {
+        default CaffeineLoadCacheEndpointBuilder cacheLoader(
+                com.github.benmanes.caffeine.cache.CacheLoader cacheLoader) {
             doSetProperty("cacheLoader", cacheLoader);
             return this;
         }
@@ -132,7 +137,7 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CaffeineLoadCacheEndpointBuilder evictionType(
-                EvictionType evictionType) {
+                org.apache.camel.component.caffeine.EvictionType evictionType) {
             doSetProperty("evictionType", evictionType);
             return this;
         }
@@ -375,7 +380,7 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CaffeineLoadCacheEndpointBuilder removalListener(
-                Object removalListener) {
+                com.github.benmanes.caffeine.cache.RemovalListener removalListener) {
             doSetProperty("removalListener", removalListener);
             return this;
         }
@@ -407,7 +412,7 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CaffeineLoadCacheEndpointBuilder statsCounter(
-                Object statsCounter) {
+                com.github.benmanes.caffeine.cache.stats.StatsCounter statsCounter) {
             doSetProperty("statsCounter", statsCounter);
             return this;
         }
@@ -502,15 +507,6 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.caffeine.EvictionType</code> enum.
-     */
-    enum EvictionType {
-        SIZE_BASED,
-        TIME_BASED;
-    }
-
     public interface CaffeineLoadCacheBuilders {
         /**
          * Caffeine LoadCache (camel-caffeine)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
index 83ffe70..fad95fd 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CassandraEndpointBuilderFactory.java
@@ -16,17 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.PollingConsumerPollStrategy;
 
 /**
  * Integrate with Cassandra 2.0 using the CQL3 API (not the Thrift API). Based
@@ -73,7 +71,7 @@ public interface CassandraEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CassandraEndpointConsumerBuilder consistencyLevel(
-                DefaultConsistencyLevel consistencyLevel) {
+                com.datastax.oss.driver.api.core.DefaultConsistencyLevel consistencyLevel) {
             doSetProperty("consistencyLevel", consistencyLevel);
             return this;
         }
@@ -198,7 +196,7 @@ public interface CassandraEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CassandraEndpointConsumerBuilder resultSetConversionStrategy(
-                Object resultSetConversionStrategy) {
+                org.apache.camel.component.cassandra.ResultSetConversionStrategy resultSetConversionStrategy) {
             doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
             return this;
         }
@@ -231,7 +229,8 @@ public interface CassandraEndpointBuilderFactory {
          * @param session the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointConsumerBuilder session(Object session) {
+        default CassandraEndpointConsumerBuilder session(
+                com.datastax.oss.driver.api.core.CqlSession session) {
             doSetProperty("session", session);
             return this;
         }
@@ -591,7 +590,7 @@ public interface CassandraEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CassandraEndpointConsumerBuilder runLoggingLevel(
-                LoggingLevel runLoggingLevel) {
+                org.apache.camel.LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
         }
@@ -849,7 +848,7 @@ public interface CassandraEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCassandraEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -884,7 +883,7 @@ public interface CassandraEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCassandraEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -919,7 +918,7 @@ public interface CassandraEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCassandraEndpointConsumerBuilder pollStrategy(
-                PollingConsumerPollStrategy pollStrategy) {
+                org.apache.camel.spi.PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
         }
@@ -979,7 +978,7 @@ public interface CassandraEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CassandraEndpointProducerBuilder consistencyLevel(
-                DefaultConsistencyLevel consistencyLevel) {
+                com.datastax.oss.driver.api.core.DefaultConsistencyLevel consistencyLevel) {
             doSetProperty("consistencyLevel", consistencyLevel);
             return this;
         }
@@ -1104,7 +1103,7 @@ public interface CassandraEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CassandraEndpointProducerBuilder resultSetConversionStrategy(
-                Object resultSetConversionStrategy) {
+                org.apache.camel.component.cassandra.ResultSetConversionStrategy resultSetConversionStrategy) {
             doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
             return this;
         }
@@ -1137,7 +1136,8 @@ public interface CassandraEndpointBuilderFactory {
          * @param session the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointProducerBuilder session(Object session) {
+        default CassandraEndpointProducerBuilder session(
+                com.datastax.oss.driver.api.core.CqlSession session) {
             doSetProperty("session", session);
             return this;
         }
@@ -1269,7 +1269,7 @@ public interface CassandraEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CassandraEndpointBuilder consistencyLevel(
-                DefaultConsistencyLevel consistencyLevel) {
+                com.datastax.oss.driver.api.core.DefaultConsistencyLevel consistencyLevel) {
             doSetProperty("consistencyLevel", consistencyLevel);
             return this;
         }
@@ -1394,7 +1394,7 @@ public interface CassandraEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CassandraEndpointBuilder resultSetConversionStrategy(
-                Object resultSetConversionStrategy) {
+                org.apache.camel.component.cassandra.ResultSetConversionStrategy resultSetConversionStrategy) {
             doSetProperty("resultSetConversionStrategy", resultSetConversionStrategy);
             return this;
         }
@@ -1427,7 +1427,8 @@ public interface CassandraEndpointBuilderFactory {
          * @param session the value to set
          * @return the dsl builder
          */
-        default CassandraEndpointBuilder session(Object session) {
+        default CassandraEndpointBuilder session(
+                com.datastax.oss.driver.api.core.CqlSession session) {
             doSetProperty("session", session);
             return this;
         }
@@ -1475,25 +1476,6 @@ public interface CassandraEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>com.datastax.oss.driver.api.core.DefaultConsistencyLevel</code>
-     * enum.
-     */
-    enum DefaultConsistencyLevel {
-        ANY,
-        ONE,
-        TWO,
-        THREE,
-        QUORUM,
-        ALL,
-        LOCAL_ONE,
-        LOCAL_QUORUM,
-        EACH_QUORUM,
-        SERIAL,
-        LOCAL_SERIAL;
-    }
-
     public interface CassandraBuilders {
         /**
          * Cassandra CQL (camel-cassandraql)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
index 76300ba..0e848df 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChatScriptEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
index 7945427..aea3dfb 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ChunkEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
index 22a597b..1715949 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CinderEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -60,7 +64,8 @@ public interface CinderEndpointBuilderFactory {
          * @param config the value to set
          * @return the dsl builder
          */
-        default CinderEndpointBuilder config(Object config) {
+        default CinderEndpointBuilder config(
+                org.openstack4j.core.transport.Config config) {
             doSetProperty("config", config);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
index 29c89c0..7b9e278 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClassEndpointBuilderFactory.java
@@ -16,9 +16,12 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.BeanScope;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
@@ -109,7 +112,7 @@ public interface ClassEndpointBuilderFactory {
          * @param scope the value to set
          * @return the dsl builder
          */
-        default ClassEndpointBuilder scope(BeanScope scope) {
+        default ClassEndpointBuilder scope(org.apache.camel.BeanScope scope) {
             doSetProperty("scope", scope);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
index e1dc6ca..66ae282 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
@@ -16,13 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.TimeZone;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * IEC 60870 supervisory control and data acquisition (SCADA) client using
@@ -55,7 +56,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointConsumerBuilder dataModuleOptions(
-                Object dataModuleOptions) {
+                org.eclipse.neoscada.protocol.iec60870.client.data.DataModuleOptions dataModuleOptions) {
             doSetProperty("dataModuleOptions", dataModuleOptions);
             return this;
         }
@@ -87,7 +88,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointConsumerBuilder protocolOptions(
-                Object protocolOptions) {
+                org.eclipse.neoscada.protocol.iec60870.ProtocolOptions protocolOptions) {
             doSetProperty("protocolOptions", protocolOptions);
             return this;
         }
@@ -197,7 +198,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointConsumerBuilder adsuAddressType(
-                ASDUAddressType adsuAddressType) {
+                org.eclipse.neoscada.protocol.iec60870.ASDUAddressType adsuAddressType) {
             doSetProperty("adsuAddressType", adsuAddressType);
             return this;
         }
@@ -229,7 +230,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointConsumerBuilder causeOfTransmissionType(
-                CauseOfTransmissionType causeOfTransmissionType) {
+                org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType causeOfTransmissionType) {
             doSetProperty("causeOfTransmissionType", causeOfTransmissionType);
             return this;
         }
@@ -261,7 +262,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointConsumerBuilder informationObjectAddressType(
-                InformationObjectAddressType informationObjectAddressType) {
+                org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType informationObjectAddressType) {
             doSetProperty("informationObjectAddressType", informationObjectAddressType);
             return this;
         }
@@ -606,7 +607,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedClientEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -641,7 +642,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedClientEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -684,7 +685,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointProducerBuilder dataModuleOptions(
-                Object dataModuleOptions) {
+                org.eclipse.neoscada.protocol.iec60870.client.data.DataModuleOptions dataModuleOptions) {
             doSetProperty("dataModuleOptions", dataModuleOptions);
             return this;
         }
@@ -716,7 +717,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointProducerBuilder protocolOptions(
-                Object protocolOptions) {
+                org.eclipse.neoscada.protocol.iec60870.ProtocolOptions protocolOptions) {
             doSetProperty("protocolOptions", protocolOptions);
             return this;
         }
@@ -830,7 +831,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointProducerBuilder adsuAddressType(
-                ASDUAddressType adsuAddressType) {
+                org.eclipse.neoscada.protocol.iec60870.ASDUAddressType adsuAddressType) {
             doSetProperty("adsuAddressType", adsuAddressType);
             return this;
         }
@@ -862,7 +863,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointProducerBuilder causeOfTransmissionType(
-                CauseOfTransmissionType causeOfTransmissionType) {
+                org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType causeOfTransmissionType) {
             doSetProperty("causeOfTransmissionType", causeOfTransmissionType);
             return this;
         }
@@ -894,7 +895,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointProducerBuilder informationObjectAddressType(
-                InformationObjectAddressType informationObjectAddressType) {
+                org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType informationObjectAddressType) {
             doSetProperty("informationObjectAddressType", informationObjectAddressType);
             return this;
         }
@@ -1247,7 +1248,8 @@ public interface ClientEndpointBuilderFactory {
          * @param dataModuleOptions the value to set
          * @return the dsl builder
          */
-        default ClientEndpointBuilder dataModuleOptions(Object dataModuleOptions) {
+        default ClientEndpointBuilder dataModuleOptions(
+                org.eclipse.neoscada.protocol.iec60870.client.data.DataModuleOptions dataModuleOptions) {
             doSetProperty("dataModuleOptions", dataModuleOptions);
             return this;
         }
@@ -1277,7 +1279,8 @@ public interface ClientEndpointBuilderFactory {
          * @param protocolOptions the value to set
          * @return the dsl builder
          */
-        default ClientEndpointBuilder protocolOptions(Object protocolOptions) {
+        default ClientEndpointBuilder protocolOptions(
+                org.eclipse.neoscada.protocol.iec60870.ProtocolOptions protocolOptions) {
             doSetProperty("protocolOptions", protocolOptions);
             return this;
         }
@@ -1339,7 +1342,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointBuilder adsuAddressType(
-                ASDUAddressType adsuAddressType) {
+                org.eclipse.neoscada.protocol.iec60870.ASDUAddressType adsuAddressType) {
             doSetProperty("adsuAddressType", adsuAddressType);
             return this;
         }
@@ -1370,7 +1373,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointBuilder causeOfTransmissionType(
-                CauseOfTransmissionType causeOfTransmissionType) {
+                org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType causeOfTransmissionType) {
             doSetProperty("causeOfTransmissionType", causeOfTransmissionType);
             return this;
         }
@@ -1402,7 +1405,7 @@ public interface ClientEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ClientEndpointBuilder informationObjectAddressType(
-                InformationObjectAddressType informationObjectAddressType) {
+                org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType informationObjectAddressType) {
             doSetProperty("informationObjectAddressType", informationObjectAddressType);
             return this;
         }
@@ -1729,34 +1732,6 @@ public interface ClientEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code> enum.
-     */
-    enum ASDUAddressType {
-        SIZE_1,
-        SIZE_2;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> enum.
-     */
-    enum CauseOfTransmissionType {
-        SIZE_1,
-        SIZE_2;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> enum.
-     */
-    enum InformationObjectAddressType {
-        SIZE_1,
-        SIZE_2,
-        SIZE_3;
-    }
-
     public interface ClientBuilders {
         /**
          * IEC 60870 Client (camel-iec60870)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java
index 161d650..92295af 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CoAPEndpointBuilderFactory.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.security.PrivateKey;
-import java.security.PublicKey;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Send and receive messages to/from COAP capable devices.
@@ -171,7 +171,8 @@ public interface CoAPEndpointBuilderFactory {
          * @param privateKey the value to set
          * @return the dsl builder
          */
-        default CoAPEndpointConsumerBuilder privateKey(PrivateKey privateKey) {
+        default CoAPEndpointConsumerBuilder privateKey(
+                java.security.PrivateKey privateKey) {
             doSetProperty("privateKey", privateKey);
             return this;
         }
@@ -201,7 +202,8 @@ public interface CoAPEndpointBuilderFactory {
          * @param pskStore the value to set
          * @return the dsl builder
          */
-        default CoAPEndpointConsumerBuilder pskStore(Object pskStore) {
+        default CoAPEndpointConsumerBuilder pskStore(
+                org.eclipse.californium.scandium.dtls.pskstore.PskStore pskStore) {
             doSetProperty("pskStore", pskStore);
             return this;
         }
@@ -231,7 +233,8 @@ public interface CoAPEndpointBuilderFactory {
          * @param publicKey the value to set
          * @return the dsl builder
          */
-        default CoAPEndpointConsumerBuilder publicKey(PublicKey publicKey) {
+        default CoAPEndpointConsumerBuilder publicKey(
+                java.security.PublicKey publicKey) {
             doSetProperty("publicKey", publicKey);
             return this;
         }
@@ -301,7 +304,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CoAPEndpointConsumerBuilder sslContextParameters(
-                Object sslContextParameters) {
+                org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
@@ -335,7 +338,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CoAPEndpointConsumerBuilder trustedRpkStore(
-                Object trustedRpkStore) {
+                org.eclipse.californium.scandium.dtls.rpkstore.TrustedRpkStore trustedRpkStore) {
             doSetProperty("trustedRpkStore", trustedRpkStore);
             return this;
         }
@@ -381,7 +384,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCoAPEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -416,7 +419,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCoAPEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -563,7 +566,8 @@ public interface CoAPEndpointBuilderFactory {
          * @param privateKey the value to set
          * @return the dsl builder
          */
-        default CoAPEndpointProducerBuilder privateKey(PrivateKey privateKey) {
+        default CoAPEndpointProducerBuilder privateKey(
+                java.security.PrivateKey privateKey) {
             doSetProperty("privateKey", privateKey);
             return this;
         }
@@ -593,7 +597,8 @@ public interface CoAPEndpointBuilderFactory {
          * @param pskStore the value to set
          * @return the dsl builder
          */
-        default CoAPEndpointProducerBuilder pskStore(Object pskStore) {
+        default CoAPEndpointProducerBuilder pskStore(
+                org.eclipse.californium.scandium.dtls.pskstore.PskStore pskStore) {
             doSetProperty("pskStore", pskStore);
             return this;
         }
@@ -623,7 +628,8 @@ public interface CoAPEndpointBuilderFactory {
          * @param publicKey the value to set
          * @return the dsl builder
          */
-        default CoAPEndpointProducerBuilder publicKey(PublicKey publicKey) {
+        default CoAPEndpointProducerBuilder publicKey(
+                java.security.PublicKey publicKey) {
             doSetProperty("publicKey", publicKey);
             return this;
         }
@@ -693,7 +699,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CoAPEndpointProducerBuilder sslContextParameters(
-                Object sslContextParameters) {
+                org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
@@ -727,7 +733,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CoAPEndpointProducerBuilder trustedRpkStore(
-                Object trustedRpkStore) {
+                org.eclipse.californium.scandium.dtls.rpkstore.TrustedRpkStore trustedRpkStore) {
             doSetProperty("trustedRpkStore", trustedRpkStore);
             return this;
         }
@@ -837,7 +843,8 @@ public interface CoAPEndpointBuilderFactory {
          * @param privateKey the value to set
          * @return the dsl builder
          */
-        default CoAPEndpointBuilder privateKey(PrivateKey privateKey) {
+        default CoAPEndpointBuilder privateKey(
+                java.security.PrivateKey privateKey) {
             doSetProperty("privateKey", privateKey);
             return this;
         }
@@ -867,7 +874,8 @@ public interface CoAPEndpointBuilderFactory {
          * @param pskStore the value to set
          * @return the dsl builder
          */
-        default CoAPEndpointBuilder pskStore(Object pskStore) {
+        default CoAPEndpointBuilder pskStore(
+                org.eclipse.californium.scandium.dtls.pskstore.PskStore pskStore) {
             doSetProperty("pskStore", pskStore);
             return this;
         }
@@ -897,7 +905,7 @@ public interface CoAPEndpointBuilderFactory {
          * @param publicKey the value to set
          * @return the dsl builder
          */
-        default CoAPEndpointBuilder publicKey(PublicKey publicKey) {
+        default CoAPEndpointBuilder publicKey(java.security.PublicKey publicKey) {
             doSetProperty("publicKey", publicKey);
             return this;
         }
@@ -967,7 +975,7 @@ public interface CoAPEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CoAPEndpointBuilder sslContextParameters(
-                Object sslContextParameters) {
+                org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
@@ -1000,7 +1008,8 @@ public interface CoAPEndpointBuilderFactory {
          * @param trustedRpkStore the value to set
          * @return the dsl builder
          */
-        default CoAPEndpointBuilder trustedRpkStore(Object trustedRpkStore) {
+        default CoAPEndpointBuilder trustedRpkStore(
+                org.eclipse.californium.scandium.dtls.rpkstore.TrustedRpkStore trustedRpkStore) {
             doSetProperty("trustedRpkStore", trustedRpkStore);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
index dc39b41..9f42e32 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Offers publish/subscribe, peer-to-peer (via a server), and RPC style
@@ -425,7 +427,7 @@ public interface CometdEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCometdEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -460,7 +462,7 @@ public interface CometdEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCometdEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
index 26468ff..d8e208b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
@@ -16,16 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.math.BigInteger;
-import java.time.Duration;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Integrate with Consul service discovery and configuration store.
@@ -56,7 +54,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ConsulEndpointConsumerBuilder connectTimeout(
-                Duration connectTimeout) {
+                java.time.Duration connectTimeout) {
             doSetProperty("connectTimeout", connectTimeout);
             return this;
         }
@@ -122,7 +120,8 @@ public interface ConsulEndpointBuilderFactory {
          * @param consulClient the value to set
          * @return the dsl builder
          */
-        default ConsulEndpointConsumerBuilder consulClient(Object consulClient) {
+        default ConsulEndpointConsumerBuilder consulClient(
+                com.orbitz.consul.Consul consulClient) {
             doSetProperty("consulClient", consulClient);
             return this;
         }
@@ -198,7 +197,8 @@ public interface ConsulEndpointBuilderFactory {
          * @param readTimeout the value to set
          * @return the dsl builder
          */
-        default ConsulEndpointConsumerBuilder readTimeout(Duration readTimeout) {
+        default ConsulEndpointConsumerBuilder readTimeout(
+                java.time.Duration readTimeout) {
             doSetProperty("readTimeout", readTimeout);
             return this;
         }
@@ -255,23 +255,7 @@ public interface ConsulEndpointBuilderFactory {
         /**
          * Set tags. You can separate multiple tags by comma.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.Set&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param tags the value to set
-         * @return the dsl builder
-         */
-        default ConsulEndpointConsumerBuilder tags(Set<String> tags) {
-            doSetProperty("tags", tags);
-            return this;
-        }
-        /**
-         * Set tags. You can separate multiple tags by comma.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.Set&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -306,7 +290,8 @@ public interface ConsulEndpointBuilderFactory {
          * @param writeTimeout the value to set
          * @return the dsl builder
          */
-        default ConsulEndpointConsumerBuilder writeTimeout(Duration writeTimeout) {
+        default ConsulEndpointConsumerBuilder writeTimeout(
+                java.time.Duration writeTimeout) {
             doSetProperty("writeTimeout", writeTimeout);
             return this;
         }
@@ -446,7 +431,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ConsulEndpointConsumerBuilder sslContextParameters(
-                Object sslContextParameters) {
+                org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
@@ -523,7 +508,8 @@ public interface ConsulEndpointBuilderFactory {
          * @param firstIndex the value to set
          * @return the dsl builder
          */
-        default ConsulEndpointConsumerBuilder firstIndex(BigInteger firstIndex) {
+        default ConsulEndpointConsumerBuilder firstIndex(
+                java.math.BigInteger firstIndex) {
             doSetProperty("firstIndex", firstIndex);
             return this;
         }
@@ -600,7 +586,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedConsulEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -635,7 +621,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedConsulEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -670,7 +656,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedConsulEndpointConsumerBuilder consistencyMode(
-                Object consistencyMode) {
+                com.orbitz.consul.option.ConsistencyMode consistencyMode) {
             doSetProperty("consistencyMode", consistencyMode);
             return this;
         }
@@ -734,7 +720,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedConsulEndpointConsumerBuilder nodeMeta(
-                List<String> nodeMeta) {
+                List<java.lang.String> nodeMeta) {
             doSetProperty("nodeMeta", nodeMeta);
             return this;
         }
@@ -775,7 +761,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ConsulEndpointProducerBuilder connectTimeout(
-                Duration connectTimeout) {
+                java.time.Duration connectTimeout) {
             doSetProperty("connectTimeout", connectTimeout);
             return this;
         }
@@ -841,7 +827,8 @@ public interface ConsulEndpointBuilderFactory {
          * @param consulClient the value to set
          * @return the dsl builder
          */
-        default ConsulEndpointProducerBuilder consulClient(Object consulClient) {
+        default ConsulEndpointProducerBuilder consulClient(
+                com.orbitz.consul.Consul consulClient) {
             doSetProperty("consulClient", consulClient);
             return this;
         }
@@ -917,7 +904,8 @@ public interface ConsulEndpointBuilderFactory {
          * @param readTimeout the value to set
          * @return the dsl builder
          */
-        default ConsulEndpointProducerBuilder readTimeout(Duration readTimeout) {
+        default ConsulEndpointProducerBuilder readTimeout(
+                java.time.Duration readTimeout) {
             doSetProperty("readTimeout", readTimeout);
             return this;
         }
@@ -974,23 +962,7 @@ public interface ConsulEndpointBuilderFactory {
         /**
          * Set tags. You can separate multiple tags by comma.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.Set&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param tags the value to set
-         * @return the dsl builder
-         */
-        default ConsulEndpointProducerBuilder tags(Set<String> tags) {
-            doSetProperty("tags", tags);
-            return this;
-        }
-        /**
-         * Set tags. You can separate multiple tags by comma.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.Set&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -1025,7 +997,8 @@ public interface ConsulEndpointBuilderFactory {
          * @param writeTimeout the value to set
          * @return the dsl builder
          */
-        default ConsulEndpointProducerBuilder writeTimeout(Duration writeTimeout) {
+        default ConsulEndpointProducerBuilder writeTimeout(
+                java.time.Duration writeTimeout) {
             doSetProperty("writeTimeout", writeTimeout);
             return this;
         }
@@ -1217,7 +1190,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ConsulEndpointProducerBuilder sslContextParameters(
-                Object sslContextParameters) {
+                org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
@@ -1278,7 +1251,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedConsulEndpointProducerBuilder consistencyMode(
-                Object consistencyMode) {
+                com.orbitz.consul.option.ConsistencyMode consistencyMode) {
             doSetProperty("consistencyMode", consistencyMode);
             return this;
         }
@@ -1342,7 +1315,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedConsulEndpointProducerBuilder nodeMeta(
-                List<String> nodeMeta) {
+                List<java.lang.String> nodeMeta) {
             doSetProperty("nodeMeta", nodeMeta);
             return this;
         }
@@ -1383,7 +1356,8 @@ public interface ConsulEndpointBuilderFactory {
          * @param connectTimeout the value to set
          * @return the dsl builder
          */
-        default ConsulEndpointBuilder connectTimeout(Duration connectTimeout) {
+        default ConsulEndpointBuilder connectTimeout(
+                java.time.Duration connectTimeout) {
             doSetProperty("connectTimeout", connectTimeout);
             return this;
         }
@@ -1448,7 +1422,8 @@ public interface ConsulEndpointBuilderFactory {
          * @param consulClient the value to set
          * @return the dsl builder
          */
-        default ConsulEndpointBuilder consulClient(Object consulClient) {
+        default ConsulEndpointBuilder consulClient(
+                com.orbitz.consul.Consul consulClient) {
             doSetProperty("consulClient", consulClient);
             return this;
         }
@@ -1524,7 +1499,7 @@ public interface ConsulEndpointBuilderFactory {
          * @param readTimeout the value to set
          * @return the dsl builder
          */
-        default ConsulEndpointBuilder readTimeout(Duration readTimeout) {
+        default ConsulEndpointBuilder readTimeout(java.time.Duration readTimeout) {
             doSetProperty("readTimeout", readTimeout);
             return this;
         }
@@ -1579,23 +1554,7 @@ public interface ConsulEndpointBuilderFactory {
         /**
          * Set tags. You can separate multiple tags by comma.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.Set&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param tags the value to set
-         * @return the dsl builder
-         */
-        default ConsulEndpointBuilder tags(Set<String> tags) {
-            doSetProperty("tags", tags);
-            return this;
-        }
-        /**
-         * Set tags. You can separate multiple tags by comma.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.Set&amp;lt;java.lang.String&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -1630,7 +1589,8 @@ public interface ConsulEndpointBuilderFactory {
          * @param writeTimeout the value to set
          * @return the dsl builder
          */
-        default ConsulEndpointBuilder writeTimeout(Duration writeTimeout) {
+        default ConsulEndpointBuilder writeTimeout(
+                java.time.Duration writeTimeout) {
             doSetProperty("writeTimeout", writeTimeout);
             return this;
         }
@@ -1724,7 +1684,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ConsulEndpointBuilder sslContextParameters(
-                Object sslContextParameters) {
+                org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
@@ -1786,7 +1746,7 @@ public interface ConsulEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedConsulEndpointBuilder consistencyMode(
-                Object consistencyMode) {
+                com.orbitz.consul.option.ConsistencyMode consistencyMode) {
             doSetProperty("consistencyMode", consistencyMode);
             return this;
         }
@@ -1848,7 +1808,8 @@ public interface ConsulEndpointBuilderFactory {
          * @param nodeMeta the value to set
          * @return the dsl builder
          */
-        default AdvancedConsulEndpointBuilder nodeMeta(List<String> nodeMeta) {
+        default AdvancedConsulEndpointBuilder nodeMeta(
+                List<java.lang.String> nodeMeta) {
             doSetProperty("nodeMeta", nodeMeta);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
index 3a102fd..0c0cafd 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
@@ -16,8 +16,11 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
@@ -156,7 +159,8 @@ public interface ControlBusEndpointBuilderFactory {
          * @param loggingLevel the value to set
          * @return the dsl builder
          */
-        default ControlBusEndpointBuilder loggingLevel(LoggingLevel loggingLevel) {
+        default ControlBusEndpointBuilder loggingLevel(
+                org.apache.camel.LoggingLevel loggingLevel) {
             doSetProperty("loggingLevel", loggingLevel);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
index 5e676b1..8b46d6c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Perform operations against Corda blockchain platform using corda-rpc library.
@@ -105,7 +107,7 @@ public interface CordaEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CordaEndpointConsumerBuilder pageSpecification(
-                Object pageSpecification) {
+                net.corda.core.node.services.vault.PageSpecification pageSpecification) {
             doSetProperty("pageSpecification", pageSpecification);
             return this;
         }
@@ -179,7 +181,8 @@ public interface CordaEndpointBuilderFactory {
          * @param sort the value to set
          * @return the dsl builder
          */
-        default CordaEndpointConsumerBuilder sort(Object sort) {
+        default CordaEndpointConsumerBuilder sort(
+                net.corda.core.node.services.vault.Sort sort) {
             doSetProperty("sort", sort);
             return this;
         }
@@ -259,7 +262,7 @@ public interface CordaEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCordaEndpointConsumerBuilder contractStateClass(
-                Class<Object> contractStateClass) {
+                Class<net.corda.core.contracts.ContractState> contractStateClass) {
             doSetProperty("contractStateClass", contractStateClass);
             return this;
         }
@@ -301,7 +304,7 @@ public interface CordaEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCordaEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -336,7 +339,7 @@ public interface CordaEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCordaEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -408,7 +411,7 @@ public interface CordaEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCordaEndpointConsumerBuilder flowLogicClass(
-                Class<Object> flowLogicClass) {
+                Class<net.corda.core.flows.FlowLogic<java.lang.Object>> flowLogicClass) {
             doSetProperty("flowLogicClass", flowLogicClass);
             return this;
         }
@@ -444,7 +447,7 @@ public interface CordaEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCordaEndpointConsumerBuilder queryCriteria(
-                Object queryCriteria) {
+                net.corda.core.node.services.vault.QueryCriteria queryCriteria) {
             doSetProperty("queryCriteria", queryCriteria);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CosmosDbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CosmosDbEndpointBuilderFactory.java
index 536f6f5..42fbe5b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CosmosDbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CosmosDbEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * To read and write records to the CosmosDB database on Azure cloud platform.
@@ -150,7 +152,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointConsumerBuilder consistencyLevel(
-                ConsistencyLevel consistencyLevel) {
+                com.azure.cosmos.ConsistencyLevel consistencyLevel) {
             doSetProperty("consistencyLevel", consistencyLevel);
             return this;
         }
@@ -250,7 +252,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointConsumerBuilder cosmosAsyncClient(
-                Object cosmosAsyncClient) {
+                com.azure.cosmos.CosmosAsyncClient cosmosAsyncClient) {
             doSetProperty("cosmosAsyncClient", cosmosAsyncClient);
             return this;
         }
@@ -484,7 +486,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointConsumerBuilder throughputProperties(
-                Object throughputProperties) {
+                com.azure.cosmos.models.ThroughputProperties throughputProperties) {
             doSetProperty("throughputProperties", throughputProperties);
             return this;
         }
@@ -566,7 +568,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointConsumerBuilder changeFeedProcessorOptions(
-                Object changeFeedProcessorOptions) {
+                com.azure.cosmos.models.ChangeFeedProcessorOptions changeFeedProcessorOptions) {
             doSetProperty("changeFeedProcessorOptions", changeFeedProcessorOptions);
             return this;
         }
@@ -758,7 +760,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCosmosDbEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -793,7 +795,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCosmosDbEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -933,7 +935,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointProducerBuilder consistencyLevel(
-                ConsistencyLevel consistencyLevel) {
+                com.azure.cosmos.ConsistencyLevel consistencyLevel) {
             doSetProperty("consistencyLevel", consistencyLevel);
             return this;
         }
@@ -1033,7 +1035,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointProducerBuilder cosmosAsyncClient(
-                Object cosmosAsyncClient) {
+                com.azure.cosmos.CosmosAsyncClient cosmosAsyncClient) {
             doSetProperty("cosmosAsyncClient", cosmosAsyncClient);
             return this;
         }
@@ -1267,7 +1269,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointProducerBuilder throughputProperties(
-                Object throughputProperties) {
+                com.azure.cosmos.models.ThroughputProperties throughputProperties) {
             doSetProperty("throughputProperties", throughputProperties);
             return this;
         }
@@ -1317,7 +1319,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointProducerBuilder itemPartitionKey(
-                Object itemPartitionKey) {
+                com.azure.cosmos.models.PartitionKey itemPartitionKey) {
             doSetProperty("itemPartitionKey", itemPartitionKey);
             return this;
         }
@@ -1402,7 +1404,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointProducerBuilder operation(
-                CosmosDbOperationsDefinition operation) {
+                org.apache.camel.component.azure.cosmosdb.CosmosDbOperationsDefinition operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -1453,7 +1455,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointProducerBuilder queryRequestOptions(
-                Object queryRequestOptions) {
+                com.azure.cosmos.models.CosmosQueryRequestOptions queryRequestOptions) {
             doSetProperty("queryRequestOptions", queryRequestOptions);
             return this;
         }
@@ -1623,7 +1625,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointBuilder consistencyLevel(
-                ConsistencyLevel consistencyLevel) {
+                com.azure.cosmos.ConsistencyLevel consistencyLevel) {
             doSetProperty("consistencyLevel", consistencyLevel);
             return this;
         }
@@ -1722,7 +1724,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointBuilder cosmosAsyncClient(
-                Object cosmosAsyncClient) {
+                com.azure.cosmos.CosmosAsyncClient cosmosAsyncClient) {
             doSetProperty("cosmosAsyncClient", cosmosAsyncClient);
             return this;
         }
@@ -1954,7 +1956,7 @@ public interface CosmosDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CosmosDbEndpointBuilder throughputProperties(
-                Object throughputProperties) {
+                com.azure.cosmos.models.ThroughputProperties throughputProperties) {
             doSetProperty("throughputProperties", throughputProperties);
             return this;
         }
@@ -2005,41 +2007,6 @@ public interface CosmosDbEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for <code>com.azure.cosmos.ConsistencyLevel</code> enum.
-     */
-    enum ConsistencyLevel {
-        STRONG,
-        BOUNDED_STALENESS,
-        SESSION,
-        EVENTUAL,
-        CONSISTENT_PREFIX;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.azure.cosmosdb.CosmosDbOperationsDefinition</code> enum.
-     */
-    enum CosmosDbOperationsDefinition {
-        listDatabases,
-        createDatabase,
-        queryDatabases,
-        deleteDatabase,
-        createContainer,
-        replaceDatabaseThroughput,
-        listContainers,
-        queryContainers,
-        deleteContainer,
-        replaceContainerThroughput,
-        createItem,
-        upsertItem,
-        deleteItem,
-        replaceItem,
-        readItem,
-        readAllItems,
-        queryItems;
-    }
-
     public interface CosmosDbBuilders {
         /**
          * Azure CosmosDB (camel-azure-cosmosdb)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java
index d658b8d..5016928 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchDbEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Consume changesets for inserts, updates and deletes in a CouchDB database, as
@@ -195,7 +197,7 @@ public interface CouchDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CouchDbEndpointConsumerBuilder resumeStrategy(
-                Object resumeStrategy) {
+                org.apache.camel.component.couchdb.consumer.CouchDbResumeStrategy resumeStrategy) {
             doSetProperty("resumeStrategy", resumeStrategy);
             return this;
         }
@@ -320,7 +322,7 @@ public interface CouchDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCouchDbEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -355,7 +357,7 @@ public interface CouchDbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCouchDbEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
index 31ed0bf..37f6761 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CouchbaseEndpointBuilderFactory.java
@@ -16,17 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.PollingConsumerPollStrategy;
 
 /**
  * Query Couchbase Views with a poll strategy and/or perform various operations
@@ -632,7 +630,7 @@ public interface CouchbaseEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CouchbaseEndpointConsumerBuilder runLoggingLevel(
-                LoggingLevel runLoggingLevel) {
+                org.apache.camel.LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
         }
@@ -918,7 +916,7 @@ public interface CouchbaseEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCouchbaseEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -953,7 +951,7 @@ public interface CouchbaseEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCouchbaseEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -988,7 +986,7 @@ public interface CouchbaseEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCouchbaseEndpointConsumerBuilder pollStrategy(
-                PollingConsumerPollStrategy pollStrategy) {
+                org.apache.camel.spi.PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CronEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CronEndpointBuilderFactory.java
index ee001a0..e987b48 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CronEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CronEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * A generic interface for triggering events at times specified through the Unix
@@ -125,7 +127,7 @@ public interface CronEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCronEndpointBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -160,7 +162,7 @@ public interface CronEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCronEndpointBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
index b1df995..441aec7 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
@@ -16,7 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.time.Instant;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -46,7 +49,8 @@ public interface Cw2EndpointBuilderFactory {
          * @param amazonCwClient the value to set
          * @return the dsl builder
          */
-        default Cw2EndpointBuilder amazonCwClient(Object amazonCwClient) {
+        default Cw2EndpointBuilder amazonCwClient(
+                software.amazon.awssdk.services.cloudwatch.CloudWatchClient amazonCwClient) {
             doSetProperty("amazonCwClient", amazonCwClient);
             return this;
         }
@@ -214,7 +218,8 @@ public interface Cw2EndpointBuilderFactory {
          * @param proxyProtocol the value to set
          * @return the dsl builder
          */
-        default Cw2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default Cw2EndpointBuilder proxyProtocol(
+                software.amazon.awssdk.core.Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -261,7 +266,7 @@ public interface Cw2EndpointBuilderFactory {
          * @param timestamp the value to set
          * @return the dsl builder
          */
-        default Cw2EndpointBuilder timestamp(Instant timestamp) {
+        default Cw2EndpointBuilder timestamp(java.time.Instant timestamp) {
             doSetProperty("timestamp", timestamp);
             return this;
         }
@@ -441,14 +446,6 @@ public interface Cw2EndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
-     */
-    enum Protocol {
-        HTTP,
-        HTTPS;
-    }
-
     public interface Cw2Builders {
         /**
          * AWS CloudWatch (camel-aws2-cw)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
index 54be679..50398c5 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfEndpointBuilderFactory.java
@@ -16,14 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.HeaderFilterStrategy;
 
 /**
  * Expose SOAP WebServices using Apache CXF or connect to external WebServices
@@ -57,7 +58,8 @@ public interface CxfEndpointBuilderFactory {
          * @param dataFormat the value to set
          * @return the dsl builder
          */
-        default CxfEndpointConsumerBuilder dataFormat(DataFormat dataFormat) {
+        default CxfEndpointConsumerBuilder dataFormat(
+                org.apache.camel.component.cxf.DataFormat dataFormat) {
             doSetProperty("dataFormat", dataFormat);
             return this;
         }
@@ -350,7 +352,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfEndpointConsumerBuilder serviceClass(
-                Class<Object> serviceClass) {
+                Class<java.lang.Object> serviceClass) {
             doSetProperty("serviceClass", serviceClass);
             return this;
         }
@@ -426,7 +428,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -461,7 +463,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -528,7 +530,7 @@ public interface CxfEndpointBuilderFactory {
          * @param bus the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfEndpointConsumerBuilder bus(Object bus) {
+        default AdvancedCxfEndpointConsumerBuilder bus(org.apache.cxf.Bus bus) {
             doSetProperty("bus", bus);
             return this;
         }
@@ -596,7 +598,8 @@ public interface CxfEndpointBuilderFactory {
          * @param cxfBinding the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfEndpointConsumerBuilder cxfBinding(Object cxfBinding) {
+        default AdvancedCxfEndpointConsumerBuilder cxfBinding(
+                org.apache.camel.component.cxf.CxfBinding cxfBinding) {
             doSetProperty("cxfBinding", cxfBinding);
             return this;
         }
@@ -634,7 +637,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointConsumerBuilder cxfConfigurer(
-                Object cxfConfigurer) {
+                org.apache.camel.component.cxf.CxfConfigurer cxfConfigurer) {
             doSetProperty("cxfConfigurer", cxfConfigurer);
             return this;
         }
@@ -704,7 +707,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointConsumerBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -898,7 +901,8 @@ public interface CxfEndpointBuilderFactory {
          * @param dataFormat the value to set
          * @return the dsl builder
          */
-        default CxfEndpointProducerBuilder dataFormat(DataFormat dataFormat) {
+        default CxfEndpointProducerBuilder dataFormat(
+                org.apache.camel.component.cxf.DataFormat dataFormat) {
             doSetProperty("dataFormat", dataFormat);
             return this;
         }
@@ -965,7 +969,8 @@ public interface CxfEndpointBuilderFactory {
          * @param cookieHandler the value to set
          * @return the dsl builder
          */
-        default CxfEndpointProducerBuilder cookieHandler(Object cookieHandler) {
+        default CxfEndpointProducerBuilder cookieHandler(
+                org.apache.camel.http.base.cookie.CookieHandler cookieHandler) {
             doSetProperty("cookieHandler", cookieHandler);
             return this;
         }
@@ -1029,7 +1034,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfEndpointProducerBuilder hostnameVerifier(
-                Object hostnameVerifier) {
+                javax.net.ssl.HostnameVerifier hostnameVerifier) {
             doSetProperty("hostnameVerifier", hostnameVerifier);
             return this;
         }
@@ -1112,7 +1117,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfEndpointProducerBuilder sslContextParameters(
-                Object sslContextParameters) {
+                org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
@@ -1356,7 +1361,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfEndpointProducerBuilder serviceClass(
-                Class<Object> serviceClass) {
+                Class<java.lang.Object> serviceClass) {
             doSetProperty("serviceClass", serviceClass);
             return this;
         }
@@ -1497,7 +1502,7 @@ public interface CxfEndpointBuilderFactory {
          * @param bus the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfEndpointProducerBuilder bus(Object bus) {
+        default AdvancedCxfEndpointProducerBuilder bus(org.apache.cxf.Bus bus) {
             doSetProperty("bus", bus);
             return this;
         }
@@ -1565,7 +1570,8 @@ public interface CxfEndpointBuilderFactory {
          * @param cxfBinding the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfEndpointProducerBuilder cxfBinding(Object cxfBinding) {
+        default AdvancedCxfEndpointProducerBuilder cxfBinding(
+                org.apache.camel.component.cxf.CxfBinding cxfBinding) {
             doSetProperty("cxfBinding", cxfBinding);
             return this;
         }
@@ -1603,7 +1609,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointProducerBuilder cxfConfigurer(
-                Object cxfConfigurer) {
+                org.apache.camel.component.cxf.CxfConfigurer cxfConfigurer) {
             doSetProperty("cxfConfigurer", cxfConfigurer);
             return this;
         }
@@ -1673,7 +1679,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointProducerBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -1868,7 +1874,8 @@ public interface CxfEndpointBuilderFactory {
          * @param dataFormat the value to set
          * @return the dsl builder
          */
-        default CxfEndpointBuilder dataFormat(DataFormat dataFormat) {
+        default CxfEndpointBuilder dataFormat(
+                org.apache.camel.component.cxf.DataFormat dataFormat) {
             doSetProperty("dataFormat", dataFormat);
             return this;
         }
@@ -2112,7 +2119,8 @@ public interface CxfEndpointBuilderFactory {
          * @param serviceClass the value to set
          * @return the dsl builder
          */
-        default CxfEndpointBuilder serviceClass(Class<Object> serviceClass) {
+        default CxfEndpointBuilder serviceClass(
+                Class<java.lang.Object> serviceClass) {
             doSetProperty("serviceClass", serviceClass);
             return this;
         }
@@ -2219,7 +2227,7 @@ public interface CxfEndpointBuilderFactory {
          * @param bus the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfEndpointBuilder bus(Object bus) {
+        default AdvancedCxfEndpointBuilder bus(org.apache.cxf.Bus bus) {
             doSetProperty("bus", bus);
             return this;
         }
@@ -2287,7 +2295,8 @@ public interface CxfEndpointBuilderFactory {
          * @param cxfBinding the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfEndpointBuilder cxfBinding(Object cxfBinding) {
+        default AdvancedCxfEndpointBuilder cxfBinding(
+                org.apache.camel.component.cxf.CxfBinding cxfBinding) {
             doSetProperty("cxfBinding", cxfBinding);
             return this;
         }
@@ -2324,7 +2333,8 @@ public interface CxfEndpointBuilderFactory {
          * @param cxfConfigurer the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfEndpointBuilder cxfConfigurer(Object cxfConfigurer) {
+        default AdvancedCxfEndpointBuilder cxfConfigurer(
+                org.apache.camel.component.cxf.CxfConfigurer cxfConfigurer) {
             doSetProperty("cxfConfigurer", cxfConfigurer);
             return this;
         }
@@ -2393,7 +2403,7 @@ public interface CxfEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfEndpointBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -2561,18 +2571,6 @@ public interface CxfEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for <code>org.apache.camel.component.cxf.DataFormat</code>
-     * enum.
-     */
-    enum DataFormat {
-        PAYLOAD,
-        RAW,
-        MESSAGE,
-        CXF_MESSAGE,
-        POJO;
-    }
-
     public interface CxfBuilders {
         /**
          * CXF (camel-cxf)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
index fcdf291..4ae250d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.HeaderFilterStrategy;
 
 /**
  * Expose JAX-RS REST services using Apache CXF or connect to external REST
@@ -55,7 +55,8 @@ public interface CxfRsEndpointBuilderFactory {
          * @param features the value to set
          * @return the dsl builder
          */
-        default CxfRsEndpointConsumerBuilder features(List<Object> features) {
+        default CxfRsEndpointConsumerBuilder features(
+                List<org.apache.cxf.feature.Feature> features) {
             doSetProperty("features", features);
             return this;
         }
@@ -162,25 +163,7 @@ public interface CxfRsEndpointBuilderFactory {
          * specify a string with a list of providers to lookup in the registy
          * separated by comma.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;java.lang.Object&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param providers the value to set
-         * @return the dsl builder
-         */
-        default CxfRsEndpointConsumerBuilder providers(List<Object> providers) {
-            doSetProperty("providers", providers);
-            return this;
-        }
-        /**
-         * Set custom JAX-RS provider(s) list to the CxfRs endpoint. You can
-         * specify a string with a list of providers to lookup in the registy
-         * separated by comma.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;java.lang.Object&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -204,7 +187,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfRsEndpointConsumerBuilder resourceClasses(
-                List<Class<Object>> resourceClasses) {
+                List<java.lang.Class<java.lang.Object>> resourceClasses) {
             doSetProperty("resourceClasses", resourceClasses);
             return this;
         }
@@ -238,7 +221,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfRsEndpointConsumerBuilder schemaLocations(
-                List<String> schemaLocations) {
+                List<java.lang.String> schemaLocations) {
             doSetProperty("schemaLocations", schemaLocations);
             return this;
         }
@@ -321,7 +304,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfRsEndpointConsumerBuilder bindingStyle(
-                BindingStyle bindingStyle) {
+                org.apache.camel.component.cxf.jaxrs.BindingStyle bindingStyle) {
             doSetProperty("bindingStyle", bindingStyle);
             return this;
         }
@@ -442,7 +425,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfRsEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -477,7 +460,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfRsEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -502,26 +485,7 @@ public interface CxfRsEndpointBuilderFactory {
          * want to export as REST service. Multiple beans can be separated by
          * comma.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;java.lang.Object&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: consumer (advanced)
-         * 
-         * @param serviceBeans the value to set
-         * @return the dsl builder
-         */
-        default AdvancedCxfRsEndpointConsumerBuilder serviceBeans(
-                List<Object> serviceBeans) {
-            doSetProperty("serviceBeans", serviceBeans);
-            return this;
-        }
-        /**
-         * The service beans (the bean ids to lookup in the registry) which you
-         * want to export as REST service. Multiple beans can be separated by
-         * comma.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;java.lang.Object&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: consumer (advanced)
          * 
@@ -545,7 +509,8 @@ public interface CxfRsEndpointBuilderFactory {
          * @param binding the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfRsEndpointConsumerBuilder binding(Object binding) {
+        default AdvancedCxfRsEndpointConsumerBuilder binding(
+                org.apache.camel.component.cxf.jaxrs.CxfRsBinding binding) {
             doSetProperty("binding", binding);
             return this;
         }
@@ -575,7 +540,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @param bus the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfRsEndpointConsumerBuilder bus(Object bus) {
+        default AdvancedCxfRsEndpointConsumerBuilder bus(org.apache.cxf.Bus bus) {
             doSetProperty("bus", bus);
             return this;
         }
@@ -646,7 +611,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfRsEndpointConsumerBuilder cxfRsConfigurer(
-                Object cxfRsConfigurer) {
+                org.apache.camel.component.cxf.jaxrs.CxfRsConfigurer cxfRsConfigurer) {
             doSetProperty("cxfRsConfigurer", cxfRsConfigurer);
             return this;
         }
@@ -717,7 +682,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfRsEndpointConsumerBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -837,7 +802,8 @@ public interface CxfRsEndpointBuilderFactory {
          * @param features the value to set
          * @return the dsl builder
          */
-        default CxfRsEndpointProducerBuilder features(List<Object> features) {
+        default CxfRsEndpointProducerBuilder features(
+                List<org.apache.cxf.feature.Feature> features) {
             doSetProperty("features", features);
             return this;
         }
@@ -944,25 +910,7 @@ public interface CxfRsEndpointBuilderFactory {
          * specify a string with a list of providers to lookup in the registy
          * separated by comma.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;java.lang.Object&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param providers the value to set
-         * @return the dsl builder
-         */
-        default CxfRsEndpointProducerBuilder providers(List<Object> providers) {
-            doSetProperty("providers", providers);
-            return this;
-        }
-        /**
-         * Set custom JAX-RS provider(s) list to the CxfRs endpoint. You can
-         * specify a string with a list of providers to lookup in the registy
-         * separated by comma.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;java.lang.Object&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -986,7 +934,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfRsEndpointProducerBuilder resourceClasses(
-                List<Class<Object>> resourceClasses) {
+                List<java.lang.Class<java.lang.Object>> resourceClasses) {
             doSetProperty("resourceClasses", resourceClasses);
             return this;
         }
@@ -1020,7 +968,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfRsEndpointProducerBuilder schemaLocations(
-                List<String> schemaLocations) {
+                List<java.lang.String> schemaLocations) {
             doSetProperty("schemaLocations", schemaLocations);
             return this;
         }
@@ -1087,7 +1035,8 @@ public interface CxfRsEndpointBuilderFactory {
          * @param cookieHandler the value to set
          * @return the dsl builder
          */
-        default CxfRsEndpointProducerBuilder cookieHandler(Object cookieHandler) {
+        default CxfRsEndpointProducerBuilder cookieHandler(
+                org.apache.camel.http.base.cookie.CookieHandler cookieHandler) {
             doSetProperty("cookieHandler", cookieHandler);
             return this;
         }
@@ -1119,7 +1068,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfRsEndpointProducerBuilder hostnameVerifier(
-                Object hostnameVerifier) {
+                javax.net.ssl.HostnameVerifier hostnameVerifier) {
             doSetProperty("hostnameVerifier", hostnameVerifier);
             return this;
         }
@@ -1202,7 +1151,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfRsEndpointProducerBuilder sslContextParameters(
-                Object sslContextParameters) {
+                org.apache.camel.support.jsse.SSLContextParameters sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
@@ -1422,7 +1371,8 @@ public interface CxfRsEndpointBuilderFactory {
          * @param binding the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfRsEndpointProducerBuilder binding(Object binding) {
+        default AdvancedCxfRsEndpointProducerBuilder binding(
+                org.apache.camel.component.cxf.jaxrs.CxfRsBinding binding) {
             doSetProperty("binding", binding);
             return this;
         }
@@ -1452,7 +1402,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @param bus the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfRsEndpointProducerBuilder bus(Object bus) {
+        default AdvancedCxfRsEndpointProducerBuilder bus(org.apache.cxf.Bus bus) {
             doSetProperty("bus", bus);
             return this;
         }
@@ -1523,7 +1473,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfRsEndpointProducerBuilder cxfRsConfigurer(
-                Object cxfRsConfigurer) {
+                org.apache.camel.component.cxf.jaxrs.CxfRsConfigurer cxfRsConfigurer) {
             doSetProperty("cxfRsConfigurer", cxfRsConfigurer);
             return this;
         }
@@ -1594,7 +1544,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfRsEndpointProducerBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -1715,7 +1665,8 @@ public interface CxfRsEndpointBuilderFactory {
          * @param features the value to set
          * @return the dsl builder
          */
-        default CxfRsEndpointBuilder features(List<Object> features) {
+        default CxfRsEndpointBuilder features(
+                List<org.apache.cxf.feature.Feature> features) {
             doSetProperty("features", features);
             return this;
         }
@@ -1820,25 +1771,7 @@ public interface CxfRsEndpointBuilderFactory {
          * specify a string with a list of providers to lookup in the registy
          * separated by comma.
          * 
-         * The option is a:
-         * &lt;code&gt;java.util.List&amp;lt;java.lang.Object&amp;gt;&lt;/code&gt; type.
-         * 
-         * Group: common
-         * 
-         * @param providers the value to set
-         * @return the dsl builder
-         */
-        default CxfRsEndpointBuilder providers(List<Object> providers) {
-            doSetProperty("providers", providers);
-            return this;
-        }
-        /**
-         * Set custom JAX-RS provider(s) list to the CxfRs endpoint. You can
-         * specify a string with a list of providers to lookup in the registy
-         * separated by comma.
-         * 
-         * The option will be converted to a
-         * &lt;code&gt;java.util.List&amp;lt;java.lang.Object&amp;gt;&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;java.lang.String&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -1862,7 +1795,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfRsEndpointBuilder resourceClasses(
-                List<Class<Object>> resourceClasses) {
+                List<java.lang.Class<java.lang.Object>> resourceClasses) {
             doSetProperty("resourceClasses", resourceClasses);
             return this;
         }
@@ -1895,7 +1828,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default CxfRsEndpointBuilder schemaLocations(
-                List<String> schemaLocations) {
+                List<java.lang.String> schemaLocations) {
             doSetProperty("schemaLocations", schemaLocations);
             return this;
         }
@@ -1972,7 +1905,8 @@ public interface CxfRsEndpointBuilderFactory {
          * @param binding the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfRsEndpointBuilder binding(Object binding) {
+        default AdvancedCxfRsEndpointBuilder binding(
+                org.apache.camel.component.cxf.jaxrs.CxfRsBinding binding) {
             doSetProperty("binding", binding);
             return this;
         }
@@ -2002,7 +1936,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @param bus the value to set
          * @return the dsl builder
          */
-        default AdvancedCxfRsEndpointBuilder bus(Object bus) {
+        default AdvancedCxfRsEndpointBuilder bus(org.apache.cxf.Bus bus) {
             doSetProperty("bus", bus);
             return this;
         }
@@ -2073,7 +2007,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfRsEndpointBuilder cxfRsConfigurer(
-                Object cxfRsConfigurer) {
+                org.apache.camel.component.cxf.jaxrs.CxfRsConfigurer cxfRsConfigurer) {
             doSetProperty("cxfRsConfigurer", cxfRsConfigurer);
             return this;
         }
@@ -2142,7 +2076,7 @@ public interface CxfRsEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedCxfRsEndpointBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
@@ -2242,16 +2176,6 @@ public interface CxfRsEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.cxf.jaxrs.BindingStyle</code> enum.
-     */
-    enum BindingStyle {
-        SimpleConsumer,
-        Default,
-        Custom;
-    }
-
     public interface CxfRsBuilders {
         /**
          * CXF-RS (camel-cxf)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DJLEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DJLEndpointBuilderFactory.java
index 7a1ef75..634b156 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DJLEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DJLEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DMSEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DMSEndpointBuilderFactory.java
index d1dbe12..4cb2e0d 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DMSEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DMSEndpointBuilderFactory.java
@@ -16,7 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -79,7 +82,8 @@ public interface DMSEndpointBuilderFactory {
          * @param availableZones the value to set
          * @return the dsl builder
          */
-        default DMSEndpointBuilder availableZones(List<String> availableZones) {
+        default DMSEndpointBuilder availableZones(
+                List<java.lang.String> availableZones) {
             doSetProperty("availableZones", availableZones);
             return this;
         }
@@ -485,7 +489,8 @@ public interface DMSEndpointBuilderFactory {
          * @param serviceKeys the value to set
          * @return the dsl builder
          */
-        default DMSEndpointBuilder serviceKeys(Object serviceKeys) {
+        default DMSEndpointBuilder serviceKeys(
+                org.apache.camel.component.huaweicloud.common.models.ServiceKeys serviceKeys) {
             doSetProperty("serviceKeys", serviceKeys);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
index 68f1c5c..3fbfdaa 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataFormatEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataLakeEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataLakeEndpointBuilderFactory.java
index e42841e..7ff7ce2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataLakeEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataLakeEndpointBuilderFactory.java
@@ -16,20 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.nio.file.OpenOption;
-import java.time.Duration;
+import java.util.*;
 import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.PollingConsumerPollStrategy;
 
 /**
  * Sends and receives files to/from Azure DataLake Storage.
@@ -105,7 +100,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointConsumerBuilder clientSecretCredential(
-                Object clientSecretCredential) {
+                com.azure.identity.ClientSecretCredential clientSecretCredential) {
             doSetProperty("clientSecretCredential", clientSecretCredential);
             return this;
         }
@@ -229,7 +224,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointConsumerBuilder dataLakeServiceClient(
-                Object dataLakeServiceClient) {
+                com.azure.storage.file.datalake.DataLakeServiceClient dataLakeServiceClient) {
             doSetProperty("dataLakeServiceClient", dataLakeServiceClient);
             return this;
         }
@@ -437,7 +432,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointConsumerBuilder openOptions(
-                Set<OpenOption> openOptions) {
+                Set<java.nio.file.OpenOption> openOptions) {
             doSetProperty("openOptions", openOptions);
             return this;
         }
@@ -603,7 +598,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointConsumerBuilder serviceClient(
-                Object serviceClient) {
+                com.azure.storage.file.datalake.DataLakeServiceClient serviceClient) {
             doSetProperty("serviceClient", serviceClient);
             return this;
         }
@@ -635,7 +630,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointConsumerBuilder sharedKeyCredential(
-                Object sharedKeyCredential) {
+                com.azure.storage.common.StorageSharedKeyCredential sharedKeyCredential) {
             doSetProperty("sharedKeyCredential", sharedKeyCredential);
             return this;
         }
@@ -679,7 +674,8 @@ public interface DataLakeEndpointBuilderFactory {
          * @param timeout the value to set
          * @return the dsl builder
          */
-        default DataLakeEndpointConsumerBuilder timeout(Duration timeout) {
+        default DataLakeEndpointConsumerBuilder timeout(
+                java.time.Duration timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -1068,7 +1064,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointConsumerBuilder runLoggingLevel(
-                LoggingLevel runLoggingLevel) {
+                org.apache.camel.LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
         }
@@ -1327,7 +1323,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDataLakeEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -1362,7 +1358,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDataLakeEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -1397,7 +1393,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDataLakeEndpointConsumerBuilder pollStrategy(
-                PollingConsumerPollStrategy pollStrategy) {
+                org.apache.camel.spi.PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
         }
@@ -1487,7 +1483,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointProducerBuilder clientSecretCredential(
-                Object clientSecretCredential) {
+                com.azure.identity.ClientSecretCredential clientSecretCredential) {
             doSetProperty("clientSecretCredential", clientSecretCredential);
             return this;
         }
@@ -1611,7 +1607,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointProducerBuilder dataLakeServiceClient(
-                Object dataLakeServiceClient) {
+                com.azure.storage.file.datalake.DataLakeServiceClient dataLakeServiceClient) {
             doSetProperty("dataLakeServiceClient", dataLakeServiceClient);
             return this;
         }
@@ -1819,7 +1815,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointProducerBuilder openOptions(
-                Set<OpenOption> openOptions) {
+                Set<java.nio.file.OpenOption> openOptions) {
             doSetProperty("openOptions", openOptions);
             return this;
         }
@@ -1985,7 +1981,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointProducerBuilder serviceClient(
-                Object serviceClient) {
+                com.azure.storage.file.datalake.DataLakeServiceClient serviceClient) {
             doSetProperty("serviceClient", serviceClient);
             return this;
         }
@@ -2017,7 +2013,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointProducerBuilder sharedKeyCredential(
-                Object sharedKeyCredential) {
+                com.azure.storage.common.StorageSharedKeyCredential sharedKeyCredential) {
             doSetProperty("sharedKeyCredential", sharedKeyCredential);
             return this;
         }
@@ -2061,7 +2057,8 @@ public interface DataLakeEndpointBuilderFactory {
          * @param timeout the value to set
          * @return the dsl builder
          */
-        default DataLakeEndpointProducerBuilder timeout(Duration timeout) {
+        default DataLakeEndpointProducerBuilder timeout(
+                java.time.Duration timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -2187,7 +2184,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointProducerBuilder operation(
-                DataLakeOperationsDefinition operation) {
+                org.apache.camel.component.azure.storage.datalake.DataLakeOperationsDefinition operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -2286,7 +2283,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointBuilder clientSecretCredential(
-                Object clientSecretCredential) {
+                com.azure.identity.ClientSecretCredential clientSecretCredential) {
             doSetProperty("clientSecretCredential", clientSecretCredential);
             return this;
         }
@@ -2410,7 +2407,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointBuilder dataLakeServiceClient(
-                Object dataLakeServiceClient) {
+                com.azure.storage.file.datalake.DataLakeServiceClient dataLakeServiceClient) {
             doSetProperty("dataLakeServiceClient", dataLakeServiceClient);
             return this;
         }
@@ -2614,7 +2611,8 @@ public interface DataLakeEndpointBuilderFactory {
          * @param openOptions the value to set
          * @return the dsl builder
          */
-        default DataLakeEndpointBuilder openOptions(Set<OpenOption> openOptions) {
+        default DataLakeEndpointBuilder openOptions(
+                Set<java.nio.file.OpenOption> openOptions) {
             doSetProperty("openOptions", openOptions);
             return this;
         }
@@ -2779,7 +2777,8 @@ public interface DataLakeEndpointBuilderFactory {
          * @param serviceClient the value to set
          * @return the dsl builder
          */
-        default DataLakeEndpointBuilder serviceClient(Object serviceClient) {
+        default DataLakeEndpointBuilder serviceClient(
+                com.azure.storage.file.datalake.DataLakeServiceClient serviceClient) {
             doSetProperty("serviceClient", serviceClient);
             return this;
         }
@@ -2810,7 +2809,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DataLakeEndpointBuilder sharedKeyCredential(
-                Object sharedKeyCredential) {
+                com.azure.storage.common.StorageSharedKeyCredential sharedKeyCredential) {
             doSetProperty("sharedKeyCredential", sharedKeyCredential);
             return this;
         }
@@ -2854,7 +2853,7 @@ public interface DataLakeEndpointBuilderFactory {
          * @param timeout the value to set
          * @return the dsl builder
          */
-        default DataLakeEndpointBuilder timeout(Duration timeout) {
+        default DataLakeEndpointBuilder timeout(java.time.Duration timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -2933,28 +2932,6 @@ public interface DataLakeEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.azure.storage.datalake.DataLakeOperationsDefinition</code> enum.
-     */
-    enum DataLakeOperationsDefinition {
-        listFileSystem,
-        createFileSystem,
-        deleteFileSystem,
-        listPaths,
-        getFile,
-        downloadToFile,
-        downloadLink,
-        deleteFile,
-        appendToFile,
-        flushToFile,
-        uploadFromFile,
-        upload,
-        openQueryInputStream,
-        createFile,
-        deleteDirectory;
-    }
-
     public interface DataLakeBuilders {
         /**
          * Azure Storage Datalake Service (camel-azure-storage-datalake)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
index 18ba637..b488712 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Provide data for load and soak testing of your Camel application.
@@ -257,7 +259,7 @@ public interface DataSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDataSetEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -292,7 +294,7 @@ public interface DataSetEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDataSetEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -565,7 +567,7 @@ public interface DataSetEndpointBuilderFactory {
          * more detailed logging then set the logger to DEBUG level for the
          * org.apache.camel.component.mock.MockEndpoint class.
          * 
-         * The option is a: &lt;code&gt;org.slf4j.Logger&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;boolean&lt;/code&gt; type.
          * 
          * Default: false
          * Group: producer
@@ -573,7 +575,7 @@ public interface DataSetEndpointBuilderFactory {
          * @param log the value to set
          * @return the dsl builder
          */
-        default DataSetEndpointProducerBuilder log(Object log) {
+        default DataSetEndpointProducerBuilder log(boolean log) {
             doSetProperty("log", log);
             return this;
         }
@@ -583,8 +585,8 @@ public interface DataSetEndpointBuilderFactory {
          * more detailed logging then set the logger to DEBUG level for the
          * org.apache.camel.component.mock.MockEndpoint class.
          * 
-         * The option will be converted to a
-         * &lt;code&gt;org.slf4j.Logger&lt;/code&gt; type.
+         * The option will be converted to a &lt;code&gt;boolean&lt;/code&gt;
+         * type.
          * 
          * Default: false
          * Group: producer
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
index 802be40..beedf75 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
index 983d2d4..91fbeb8 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -45,7 +49,8 @@ public interface Ddb2EndpointBuilderFactory {
          * @param amazonDDBClient the value to set
          * @return the dsl builder
          */
-        default Ddb2EndpointBuilder amazonDDBClient(Object amazonDDBClient) {
+        default Ddb2EndpointBuilder amazonDDBClient(
+                software.amazon.awssdk.services.dynamodb.DynamoDbClient amazonDDBClient) {
             doSetProperty("amazonDDBClient", amazonDDBClient);
             return this;
         }
@@ -233,7 +238,8 @@ public interface Ddb2EndpointBuilderFactory {
          * @param operation the value to set
          * @return the dsl builder
          */
-        default Ddb2EndpointBuilder operation(Ddb2Operations operation) {
+        default Ddb2EndpointBuilder operation(
+                org.apache.camel.component.aws2.ddb.Ddb2Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -347,7 +353,8 @@ public interface Ddb2EndpointBuilderFactory {
          * @param proxyProtocol the value to set
          * @return the dsl builder
          */
-        default Ddb2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default Ddb2EndpointBuilder proxyProtocol(
+                software.amazon.awssdk.core.Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -561,31 +568,6 @@ public interface Ddb2EndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.aws2.ddb.Ddb2Operations</code> enum.
-     */
-    enum Ddb2Operations {
-        BatchGetItems,
-        DeleteItem,
-        DeleteTable,
-        DescribeTable,
-        GetItem,
-        PutItem,
-        Query,
-        Scan,
-        UpdateItem,
-        UpdateTable;
-    }
-
-    /**
-     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
-     */
-    enum Protocol {
-        HTTP,
-        HTTPS;
-    }
-
     public interface Ddb2Builders {
         /**
          * AWS DynamoDB (camel-aws2-ddb)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
index 471ed16..b770254 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
@@ -16,17 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.PollingConsumerPollStrategy;
 
 /**
  * Receive messages from AWS DynamoDB Stream service using AWS SDK version 2.x.
@@ -58,7 +56,7 @@ public interface Ddb2StreamEndpointBuilderFactory {
          * @return the dsl builder
          */
         default Ddb2StreamEndpointBuilder amazonDynamoDbStreamsClient(
-                Object amazonDynamoDbStreamsClient) {
+                software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient amazonDynamoDbStreamsClient) {
             doSetProperty("amazonDynamoDbStreamsClient", amazonDynamoDbStreamsClient);
             return this;
         }
@@ -243,7 +241,8 @@ public interface Ddb2StreamEndpointBuilderFactory {
          * @param proxyProtocol the value to set
          * @return the dsl builder
          */
-        default Ddb2StreamEndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default Ddb2StreamEndpointBuilder proxyProtocol(
+                software.amazon.awssdk.core.Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -318,7 +317,7 @@ public interface Ddb2StreamEndpointBuilderFactory {
          * has caught up to real-time.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration$StreamIteratorType&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration.StreamIteratorType&lt;/code&gt; type.
          * 
          * Default: FROM_LATEST
          * Group: consumer
@@ -327,7 +326,7 @@ public interface Ddb2StreamEndpointBuilderFactory {
          * @return the dsl builder
          */
         default Ddb2StreamEndpointBuilder streamIteratorType(
-                StreamIteratorType streamIteratorType) {
+                org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration.StreamIteratorType streamIteratorType) {
             doSetProperty("streamIteratorType", streamIteratorType);
             return this;
         }
@@ -337,7 +336,7 @@ public interface Ddb2StreamEndpointBuilderFactory {
          * has caught up to real-time.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration$StreamIteratorType&lt;/code&gt; type.
+         * &lt;code&gt;org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration.StreamIteratorType&lt;/code&gt; type.
          * 
          * Default: FROM_LATEST
          * Group: consumer
@@ -683,7 +682,7 @@ public interface Ddb2StreamEndpointBuilderFactory {
          * @return the dsl builder
          */
         default Ddb2StreamEndpointBuilder runLoggingLevel(
-                LoggingLevel runLoggingLevel) {
+                org.apache.camel.LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
         }
@@ -964,7 +963,7 @@ public interface Ddb2StreamEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDdb2StreamEndpointBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -999,7 +998,7 @@ public interface Ddb2StreamEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDdb2StreamEndpointBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -1034,7 +1033,7 @@ public interface Ddb2StreamEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDdb2StreamEndpointBuilder pollStrategy(
-                PollingConsumerPollStrategy pollStrategy) {
+                org.apache.camel.spi.PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
         }
@@ -1059,23 +1058,6 @@ public interface Ddb2StreamEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
-     */
-    enum Protocol {
-        HTTP,
-        HTTPS;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration$StreamIteratorType</code> enum.
-     */
-    enum StreamIteratorType {
-        FROM_LATEST,
-        FROM_START;
-    }
-
     public interface Ddb2StreamBuilders {
         /**
          * AWS DynamoDB Streams (camel-aws2-ddb)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
index c16fa07..19d60d3 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
@@ -16,13 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Capture changes from a MongoDB database.
@@ -1578,7 +1580,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDebeziumMongodbEndpointBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -1613,7 +1615,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDebeziumMongodbEndpointBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
index 4d96ca6..41f06ff 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
@@ -16,13 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Capture changes from a MySQL database.
@@ -2457,7 +2459,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDebeziumMySqlEndpointBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -2492,7 +2494,7 @@ public interface DebeziumMySqlEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDebeziumMySqlEndpointBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
index be74922..53e0e4b 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumPostgresEndpointBuilderFactory.java
@@ -16,13 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Capture changes from a PostgresSQL database.
@@ -2177,7 +2179,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDebeziumPostgresEndpointBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -2212,7 +2214,7 @@ public interface DebeziumPostgresEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDebeziumPostgresEndpointBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
index 0b43f34..ea253c2 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumSqlserverEndpointBuilderFactory.java
@@ -16,13 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Capture changes from an SQL Server database.
@@ -1867,7 +1869,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDebeziumSqlserverEndpointBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -1902,7 +1904,7 @@ public interface DebeziumSqlserverEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDebeziumSqlserverEndpointBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
index 4564698..5afddba 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalOceanEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -165,7 +169,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DigitalOceanEndpointBuilder resource(
-                DigitalOceanResources resource) {
+                org.apache.camel.component.digitalocean.constants.DigitalOceanResources resource) {
             doSetProperty("resource", resource);
             return this;
         }
@@ -294,7 +298,7 @@ public interface DigitalOceanEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDigitalOceanEndpointBuilder digitalOceanClient(
-                Object digitalOceanClient) {
+                com.myjeeva.digitalocean.impl.DigitalOceanClient digitalOceanClient) {
             doSetProperty("digitalOceanClient", digitalOceanClient);
             return this;
         }
@@ -316,24 +320,6 @@ public interface DigitalOceanEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.digitalocean.constants.DigitalOceanResources</code> enum.
-     */
-    enum DigitalOceanResources {
-        account,
-        actions,
-        blockStorages,
-        droplets,
-        images,
-        snapshots,
-        keys,
-        regions,
-        sizes,
-        floatingIPs,
-        tags;
-    }
-
     public interface DigitalOceanBuilders {
         /**
          * DigitalOcean (camel-digitalocean)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
index a854b56..3a26604 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DigitalSignatureEndpointBuilderFactory.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.cert.Certificate;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -111,7 +110,8 @@ public interface DigitalSignatureEndpointBuilderFactory {
          * @param keystore the value to set
          * @return the dsl builder
          */
-        default DigitalSignatureEndpointBuilder keystore(KeyStore keystore) {
+        default DigitalSignatureEndpointBuilder keystore(
+                java.security.KeyStore keystore) {
             doSetProperty("keystore", keystore);
             return this;
         }
@@ -210,7 +210,8 @@ public interface DigitalSignatureEndpointBuilderFactory {
          * @param privateKey the value to set
          * @return the dsl builder
          */
-        default DigitalSignatureEndpointBuilder privateKey(PrivateKey privateKey) {
+        default DigitalSignatureEndpointBuilder privateKey(
+                java.security.PrivateKey privateKey) {
             doSetProperty("privateKey", privateKey);
             return this;
         }
@@ -379,7 +380,7 @@ public interface DigitalSignatureEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDigitalSignatureEndpointBuilder certificate(
-                Certificate certificate) {
+                java.security.cert.Certificate certificate) {
             doSetProperty("certificate", certificate);
             return this;
         }
@@ -457,7 +458,7 @@ public interface DigitalSignatureEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDigitalSignatureEndpointBuilder keyStoreParameters(
-                Object keyStoreParameters) {
+                org.apache.camel.support.jsse.KeyStoreParameters keyStoreParameters) {
             doSetProperty("keyStoreParameters", keyStoreParameters);
             return this;
         }
@@ -496,7 +497,7 @@ public interface DigitalSignatureEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDigitalSignatureEndpointBuilder publicKey(
-                PublicKey publicKey) {
+                java.security.PublicKey publicKey) {
             doSetProperty("publicKey", publicKey);
             return this;
         }
@@ -529,7 +530,7 @@ public interface DigitalSignatureEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDigitalSignatureEndpointBuilder secureRandom(
-                SecureRandom secureRandom) {
+                java.security.SecureRandom secureRandom) {
             doSetProperty("secureRandom", secureRandom);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
index 6d9ccf1..cb41442 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Call another endpoint from the same Camel Context synchronously.
@@ -112,7 +114,7 @@ public interface DirectEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDirectEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -147,7 +149,7 @@ public interface DirectEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDirectEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
index 54eded1..2846529 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
@@ -16,13 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.HeaderFilterStrategy;
 
 /**
  * Call another endpoint from any Camel Context in the same JVM synchronously.
@@ -113,7 +114,7 @@ public interface DirectVmEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDirectVmEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -148,7 +149,7 @@ public interface DirectVmEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDirectVmEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -389,7 +390,7 @@ public interface DirectVmEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDirectVmEndpointProducerBuilder headerFilterStrategy(
-                HeaderFilterStrategy headerFilterStrategy) {
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
             doSetProperty("headerFilterStrategy", headerFilterStrategy);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
index d616f5e..b8090a0 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
@@ -16,13 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.WaitForTaskToComplete;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Provides asynchronous SEDA behavior using LMAX Disruptor.
@@ -215,7 +216,7 @@ public interface DisruptorEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DisruptorEndpointConsumerBuilder waitStrategy(
-                DisruptorWaitStrategy waitStrategy) {
+                org.apache.camel.component.disruptor.DisruptorWaitStrategy waitStrategy) {
             doSetProperty("waitStrategy", waitStrategy);
             return this;
         }
@@ -264,7 +265,7 @@ public interface DisruptorEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDisruptorEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -299,7 +300,7 @@ public interface DisruptorEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDisruptorEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -476,7 +477,7 @@ public interface DisruptorEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DisruptorEndpointProducerBuilder producerType(
-                DisruptorProducerType producerType) {
+                org.apache.camel.component.disruptor.DisruptorProducerType producerType) {
             doSetProperty("producerType", producerType);
             return this;
         }
@@ -551,7 +552,7 @@ public interface DisruptorEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DisruptorEndpointProducerBuilder waitForTaskToComplete(
-                WaitForTaskToComplete waitForTaskToComplete) {
+                org.apache.camel.WaitForTaskToComplete waitForTaskToComplete) {
             doSetProperty("waitForTaskToComplete", waitForTaskToComplete);
             return this;
         }
@@ -653,28 +654,6 @@ public interface DisruptorEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.disruptor.DisruptorWaitStrategy</code>
-     * enum.
-     */
-    enum DisruptorWaitStrategy {
-        Blocking,
-        Sleeping,
-        BusySpin,
-        Yielding;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.disruptor.DisruptorProducerType</code>
-     * enum.
-     */
-    enum DisruptorProducerType {
-        Single,
-        Multi;
-    }
-
     public interface DisruptorBuilders {
         /**
          * Disruptor (camel-disruptor)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
index 3095d5f..383e4cd 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
@@ -16,13 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.WaitForTaskToComplete;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Provides asynchronous SEDA behavior using LMAX Disruptor.
@@ -215,7 +216,7 @@ public interface DisruptorVmEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DisruptorVmEndpointConsumerBuilder waitStrategy(
-                DisruptorWaitStrategy waitStrategy) {
+                org.apache.camel.component.disruptor.DisruptorWaitStrategy waitStrategy) {
             doSetProperty("waitStrategy", waitStrategy);
             return this;
         }
@@ -264,7 +265,7 @@ public interface DisruptorVmEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDisruptorVmEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -299,7 +300,7 @@ public interface DisruptorVmEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDisruptorVmEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -476,7 +477,7 @@ public interface DisruptorVmEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DisruptorVmEndpointProducerBuilder producerType(
-                DisruptorProducerType producerType) {
+                org.apache.camel.component.disruptor.DisruptorProducerType producerType) {
             doSetProperty("producerType", producerType);
             return this;
         }
@@ -551,7 +552,7 @@ public interface DisruptorVmEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DisruptorVmEndpointProducerBuilder waitForTaskToComplete(
-                WaitForTaskToComplete waitForTaskToComplete) {
+                org.apache.camel.WaitForTaskToComplete waitForTaskToComplete) {
             doSetProperty("waitForTaskToComplete", waitForTaskToComplete);
             return this;
         }
@@ -653,28 +654,6 @@ public interface DisruptorVmEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.disruptor.DisruptorWaitStrategy</code>
-     * enum.
-     */
-    enum DisruptorWaitStrategy {
-        Blocking,
-        Sleeping,
-        BusySpin,
-        Yielding;
-    }
-
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.disruptor.DisruptorProducerType</code>
-     * enum.
-     */
-    enum DisruptorProducerType {
-        Single,
-        Multi;
-    }
-
     public interface DisruptorVmBuilders {
         /**
          * Disruptor VM (camel-disruptor)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
index 066be62..51c19c1 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DnsEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
index c9f6074..44c0599 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
@@ -16,13 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Manage Docker containers.
@@ -309,7 +310,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDockerEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -344,7 +345,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDockerEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -525,7 +526,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDockerEndpointConsumerBuilder parameters(
-                Map<String, Object> parameters) {
+                Map<java.lang.String, java.lang.Object> parameters) {
             doSetProperty("parameters", parameters);
             return this;
         }
@@ -1021,7 +1022,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDockerEndpointProducerBuilder parameters(
-                Map<String, Object> parameters) {
+                Map<java.lang.String, java.lang.Object> parameters) {
             doSetProperty("parameters", parameters);
             return this;
         }
@@ -1467,7 +1468,7 @@ public interface DockerEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDockerEndpointBuilder parameters(
-                Map<String, Object> parameters) {
+                Map<java.lang.String, java.lang.Object> parameters) {
             doSetProperty("parameters", parameters);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
index 76b4258..053ffea 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DozerEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -98,7 +102,7 @@ public interface DozerEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DozerEndpointBuilder mappingConfiguration(
-                Object mappingConfiguration) {
+                org.apache.camel.converter.dozer.DozerBeanMapperConfiguration mappingConfiguration) {
             doSetProperty("mappingConfiguration", mappingConfiguration);
             return this;
         }
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
index 77d0fc3..e24bcf71 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -123,7 +127,8 @@ public interface DrillEndpointBuilderFactory {
          * @param mode the value to set
          * @return the dsl builder
          */
-        default DrillEndpointBuilder mode(DrillConnectionMode mode) {
+        default DrillEndpointBuilder mode(
+                org.apache.camel.component.drill.DrillConnectionMode mode) {
             doSetProperty("mode", mode);
             return this;
         }
@@ -177,15 +182,6 @@ public interface DrillEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.drill.DrillConnectionMode</code> enum.
-     */
-    enum DrillConnectionMode {
-        ZK,
-        DRILLBIT;
-    }
-
     public interface DrillBuilders {
         /**
          * Drill (camel-drill)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
index 7f3058b..47a11e4 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DropboxEndpointBuilderFactory.java
@@ -16,12 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Upload, download and manage files, folders, groups, collaborations, etc on
@@ -68,7 +70,8 @@ public interface DropboxEndpointBuilderFactory {
          * @param client the value to set
          * @return the dsl builder
          */
-        default DropboxEndpointConsumerBuilder client(Object client) {
+        default DropboxEndpointConsumerBuilder client(
+                com.dropbox.core.v2.DbxClientV2 client) {
             doSetProperty("client", client);
             return this;
         }
@@ -178,7 +181,7 @@ public interface DropboxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DropboxEndpointConsumerBuilder uploadMode(
-                DropboxUploadMode uploadMode) {
+                org.apache.camel.component.dropbox.util.DropboxUploadMode uploadMode) {
             doSetProperty("uploadMode", uploadMode);
             return this;
         }
@@ -271,7 +274,7 @@ public interface DropboxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDropboxEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -306,7 +309,7 @@ public interface DropboxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedDropboxEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -363,7 +366,8 @@ public interface DropboxEndpointBuilderFactory {
          * @param client the value to set
          * @return the dsl builder
          */
-        default DropboxEndpointProducerBuilder client(Object client) {
+        default DropboxEndpointProducerBuilder client(
+                com.dropbox.core.v2.DbxClientV2 client) {
             doSetProperty("client", client);
             return this;
         }
@@ -473,7 +477,7 @@ public interface DropboxEndpointBuilderFactory {
          * @return the dsl builder
          */
         default DropboxEndpointProducerBuilder uploadMode(
-                DropboxUploadMode uploadMode) {
+                org.apache.camel.component.dropbox.util.DropboxUploadMode uploadMode) {
             doSetProperty("uploadMode", uploadMode);
             return this;
         }
@@ -593,7 +597,8 @@ public interface DropboxEndpointBuilderFactory {
          * @param client the value to set
          * @return the dsl builder
          */
-        default DropboxEndpointBuilder client(Object client) {
+        default DropboxEndpointBuilder client(
+                com.dropbox.core.v2.DbxClientV2 client) {
             doSetProperty("client", client);
             return this;
         }
@@ -700,7 +705,8 @@ public interface DropboxEndpointBuilderFactory {
          * @param uploadMode the value to set
          * @return the dsl builder
          */
-        default DropboxEndpointBuilder uploadMode(DropboxUploadMode uploadMode) {
+        default DropboxEndpointBuilder uploadMode(
+                org.apache.camel.component.dropbox.util.DropboxUploadMode uploadMode) {
             doSetProperty("uploadMode", uploadMode);
             return this;
         }
@@ -736,16 +742,6 @@ public interface DropboxEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.dropbox.util.DropboxUploadMode</code>
-     * enum.
-     */
-    enum DropboxUploadMode {
-        add,
-        force;
-    }
-
     public interface DropboxBuilders {
         /**
          * Dropbox (camel-dropbox)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
index d440bdf..eac731c 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -46,7 +50,8 @@ public interface ECS2EndpointBuilderFactory {
          * @param ecsClient the value to set
          * @return the dsl builder
          */
-        default ECS2EndpointBuilder ecsClient(Object ecsClient) {
+        default ECS2EndpointBuilder ecsClient(
+                software.amazon.awssdk.services.ecs.EcsClient ecsClient) {
             doSetProperty("ecsClient", ecsClient);
             return this;
         }
@@ -124,7 +129,8 @@ public interface ECS2EndpointBuilderFactory {
          * @param operation the value to set
          * @return the dsl builder
          */
-        default ECS2EndpointBuilder operation(ECS2Operations operation) {
+        default ECS2EndpointBuilder operation(
+                org.apache.camel.component.aws2.ecs.ECS2Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -263,7 +269,8 @@ public interface ECS2EndpointBuilderFactory {
          * @param proxyProtocol the value to set
          * @return the dsl builder
          */
-        default ECS2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default ECS2EndpointBuilder proxyProtocol(
+                software.amazon.awssdk.core.Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -418,25 +425,6 @@ public interface ECS2EndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.aws2.ecs.ECS2Operations</code> enum.
-     */
-    enum ECS2Operations {
-        listClusters,
-        describeCluster,
-        createCluster,
-        deleteCluster;
-    }
-
-    /**
-     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
-     */
-    enum Protocol {
-        HTTP,
-        HTTPS;
-    }
-
     public interface ECS2Builders {
         /**
          * AWS Elastic Container Service (ECS) (camel-aws2-ecs)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
index 1584114..b5afc3e 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -46,7 +50,8 @@ public interface EKS2EndpointBuilderFactory {
          * @param eksClient the value to set
          * @return the dsl builder
          */
-        default EKS2EndpointBuilder eksClient(Object eksClient) {
+        default EKS2EndpointBuilder eksClient(
+                software.amazon.awssdk.services.eks.EksClient eksClient) {
             doSetProperty("eksClient", eksClient);
             return this;
         }
@@ -124,7 +129,8 @@ public interface EKS2EndpointBuilderFactory {
          * @param operation the value to set
          * @return the dsl builder
          */
-        default EKS2EndpointBuilder operation(EKS2Operations operation) {
+        default EKS2EndpointBuilder operation(
+                org.apache.camel.component.aws2.eks.EKS2Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -263,7 +269,8 @@ public interface EKS2EndpointBuilderFactory {
          * @param proxyProtocol the value to set
          * @return the dsl builder
          */
-        default EKS2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default EKS2EndpointBuilder proxyProtocol(
+                software.amazon.awssdk.core.Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -418,25 +425,6 @@ public interface EKS2EndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.aws2.eks.EKS2Operations</code> enum.
-     */
-    enum EKS2Operations {
-        listClusters,
-        describeCluster,
-        createCluster,
-        deleteCluster;
-    }
-
-    /**
-     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
-     */
-    enum Protocol {
-        HTTP,
-        HTTPS;
-    }
-
     public interface EKS2Builders {
         /**
          * AWS Elastic Kubernetes Service (EKS) (camel-aws2-eks)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java
index 4111a3d..61c85fc 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EhcacheEndpointBuilderFactory.java
@@ -16,13 +16,14 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * Perform caching operations using Ehcache.
@@ -45,15 +46,16 @@ public interface EhcacheEndpointBuilderFactory {
         /**
          * The cache manager.
          * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.component.ehcache.EhcacheManager&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;org.ehcache.CacheManager&lt;/code&gt;
+         * type.
          * 
          * Group: common
          * 
          * @param cacheManager the value to set
          * @return the dsl builder
          */
-        default EhcacheEndpointConsumerBuilder cacheManager(Object cacheManager) {
+        default EhcacheEndpointConsumerBuilder cacheManager(
+                org.ehcache.CacheManager cacheManager) {
             doSetProperty("cacheManager", cacheManager);
             return this;
         }
@@ -61,7 +63,7 @@ public interface EhcacheEndpointBuilderFactory {
          * The cache manager.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.ehcache.EhcacheManager&lt;/code&gt; type.
+         * &lt;code&gt;org.ehcache.CacheManager&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -84,7 +86,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default EhcacheEndpointConsumerBuilder cacheManagerConfiguration(
-                Object cacheManagerConfiguration) {
+                org.ehcache.config.Configuration cacheManagerConfiguration) {
             doSetProperty("cacheManagerConfiguration", cacheManagerConfiguration);
             return this;
         }
@@ -212,7 +214,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default EhcacheEndpointConsumerBuilder eventFiring(
-                EventFiring eventFiring) {
+                org.ehcache.event.EventFiring eventFiring) {
             doSetProperty("eventFiring", eventFiring);
             return this;
         }
@@ -245,7 +247,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default EhcacheEndpointConsumerBuilder eventOrdering(
-                EventOrdering eventOrdering) {
+                org.ehcache.event.EventOrdering eventOrdering) {
             doSetProperty("eventOrdering", eventOrdering);
             return this;
         }
@@ -308,7 +310,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedEhcacheEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -343,7 +345,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedEhcacheEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -367,7 +369,7 @@ public interface EhcacheEndpointBuilderFactory {
          * The default cache configuration to be used to create caches.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.ehcache.EhcacheConfiguration&lt;/code&gt; type.
+         * &lt;code&gt;org.ehcache.config.CacheConfiguration&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -375,7 +377,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedEhcacheEndpointConsumerBuilder configuration(
-                Object configuration) {
+                org.ehcache.config.CacheConfiguration configuration) {
             doSetProperty("configuration", configuration);
             return this;
         }
@@ -383,7 +385,7 @@ public interface EhcacheEndpointBuilderFactory {
          * The default cache configuration to be used to create caches.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.ehcache.EhcacheConfiguration&lt;/code&gt; type.
+         * &lt;code&gt;org.ehcache.config.CacheConfiguration&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -407,7 +409,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedEhcacheEndpointConsumerBuilder configurations(
-                Map<String, Object> configurations) {
+                Map<java.lang.String, org.ehcache.config.CacheConfiguration> configurations) {
             doSetProperty("configurations", configurations);
             return this;
         }
@@ -471,15 +473,16 @@ public interface EhcacheEndpointBuilderFactory {
         /**
          * The cache manager.
          * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.component.ehcache.EhcacheManager&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;org.ehcache.CacheManager&lt;/code&gt;
+         * type.
          * 
          * Group: common
          * 
          * @param cacheManager the value to set
          * @return the dsl builder
          */
-        default EhcacheEndpointProducerBuilder cacheManager(Object cacheManager) {
+        default EhcacheEndpointProducerBuilder cacheManager(
+                org.ehcache.CacheManager cacheManager) {
             doSetProperty("cacheManager", cacheManager);
             return this;
         }
@@ -487,7 +490,7 @@ public interface EhcacheEndpointBuilderFactory {
          * The cache manager.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.ehcache.EhcacheManager&lt;/code&gt; type.
+         * &lt;code&gt;org.ehcache.CacheManager&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -510,7 +513,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default EhcacheEndpointProducerBuilder cacheManagerConfiguration(
-                Object cacheManagerConfiguration) {
+                org.ehcache.config.Configuration cacheManagerConfiguration) {
             doSetProperty("cacheManagerConfiguration", cacheManagerConfiguration);
             return this;
         }
@@ -690,7 +693,7 @@ public interface EhcacheEndpointBuilderFactory {
          * The default cache configuration to be used to create caches.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.ehcache.EhcacheConfiguration&lt;/code&gt; type.
+         * &lt;code&gt;org.ehcache.config.CacheConfiguration&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -698,7 +701,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedEhcacheEndpointProducerBuilder configuration(
-                Object configuration) {
+                org.ehcache.config.CacheConfiguration configuration) {
             doSetProperty("configuration", configuration);
             return this;
         }
@@ -706,7 +709,7 @@ public interface EhcacheEndpointBuilderFactory {
          * The default cache configuration to be used to create caches.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.ehcache.EhcacheConfiguration&lt;/code&gt; type.
+         * &lt;code&gt;org.ehcache.config.CacheConfiguration&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -730,7 +733,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedEhcacheEndpointProducerBuilder configurations(
-                Map<String, Object> configurations) {
+                Map<java.lang.String, org.ehcache.config.CacheConfiguration> configurations) {
             doSetProperty("configurations", configurations);
             return this;
         }
@@ -795,15 +798,16 @@ public interface EhcacheEndpointBuilderFactory {
         /**
          * The cache manager.
          * 
-         * The option is a:
-         * &lt;code&gt;org.apache.camel.component.ehcache.EhcacheManager&lt;/code&gt; type.
+         * The option is a: &lt;code&gt;org.ehcache.CacheManager&lt;/code&gt;
+         * type.
          * 
          * Group: common
          * 
          * @param cacheManager the value to set
          * @return the dsl builder
          */
-        default EhcacheEndpointBuilder cacheManager(Object cacheManager) {
+        default EhcacheEndpointBuilder cacheManager(
+                org.ehcache.CacheManager cacheManager) {
             doSetProperty("cacheManager", cacheManager);
             return this;
         }
@@ -811,7 +815,7 @@ public interface EhcacheEndpointBuilderFactory {
          * The cache manager.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.ehcache.EhcacheManager&lt;/code&gt; type.
+         * &lt;code&gt;org.ehcache.CacheManager&lt;/code&gt; type.
          * 
          * Group: common
          * 
@@ -834,7 +838,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default EhcacheEndpointBuilder cacheManagerConfiguration(
-                Object cacheManagerConfiguration) {
+                org.ehcache.config.Configuration cacheManagerConfiguration) {
             doSetProperty("cacheManagerConfiguration", cacheManagerConfiguration);
             return this;
         }
@@ -919,7 +923,7 @@ public interface EhcacheEndpointBuilderFactory {
          * The default cache configuration to be used to create caches.
          * 
          * The option is a:
-         * &lt;code&gt;org.apache.camel.component.ehcache.EhcacheConfiguration&lt;/code&gt; type.
+         * &lt;code&gt;org.ehcache.config.CacheConfiguration&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -927,7 +931,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedEhcacheEndpointBuilder configuration(
-                Object configuration) {
+                org.ehcache.config.CacheConfiguration configuration) {
             doSetProperty("configuration", configuration);
             return this;
         }
@@ -935,7 +939,7 @@ public interface EhcacheEndpointBuilderFactory {
          * The default cache configuration to be used to create caches.
          * 
          * The option will be converted to a
-         * &lt;code&gt;org.apache.camel.component.ehcache.EhcacheConfiguration&lt;/code&gt; type.
+         * &lt;code&gt;org.ehcache.config.CacheConfiguration&lt;/code&gt; type.
          * 
          * Group: advanced
          * 
@@ -959,7 +963,7 @@ public interface EhcacheEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedEhcacheEndpointBuilder configurations(
-                Map<String, Object> configurations) {
+                Map<java.lang.String, org.ehcache.config.CacheConfiguration> configurations) {
             doSetProperty("configurations", configurations);
             return this;
         }
@@ -1010,22 +1014,6 @@ public interface EhcacheEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for <code>org.ehcache.event.EventFiring</code> enum.
-     */
-    enum EventFiring {
-        ASYNCHRONOUS,
-        SYNCHRONOUS;
-    }
-
-    /**
-     * Proxy enum for <code>org.ehcache.event.EventOrdering</code> enum.
-     */
-    enum EventOrdering {
-        UNORDERED,
-        ORDERED;
-    }
-
     public interface EhcacheBuilders {
         /**
          * Ehcache (camel-ehcache)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
index 8811e69..b5c8b76 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
@@ -252,7 +256,7 @@ public interface ElasticsearchEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ElasticsearchEndpointBuilder operation(
-                ElasticsearchOperation operation) {
+                org.apache.camel.component.elasticsearch.ElasticsearchOperation operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -576,25 +580,6 @@ public interface ElasticsearchEndpointBuilderFactory {
         }
     }
 
-    /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.elasticsearch.ElasticsearchOperation</code> enum.
-     */
-    enum ElasticsearchOperation {
-        Index,
-        Update,
-        Bulk,
-        BulkIndex,
-        GetById,
-        MultiGet,
-        MultiSearch,
-        Delete,
-        DeleteIndex,
-        Search,
-        Exists,
-        Ping;
-    }
-
     public interface ElasticsearchBuilders {
         /**
          * Elasticsearch Rest (camel-elasticsearch-rest)
diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
index b69e63d..49898bd 100644
--- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
+++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElsqlEndpointBuilderFactory.java
@@ -16,17 +16,15 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.*;
 import java.util.Map;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
+import java.util.function.*;
+import java.util.stream.*;
 import javax.annotation.Generated;
-import org.apache.camel.ExchangePattern;
-import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
-import org.apache.camel.spi.ExceptionHandler;
-import org.apache.camel.spi.PollingConsumerPollStrategy;
 
 /**
  * Use ElSql to define SQL queries. Extends the SQL Component.
@@ -91,7 +89,7 @@ public interface ElsqlEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ElsqlEndpointConsumerBuilder databaseVendor(
-                ElSqlDatabaseVendor databaseVendor) {
+                org.apache.camel.component.elsql.ElSqlDatabaseVendor databaseVendor) {
             doSetProperty("databaseVendor", databaseVendor);
             return this;
         }
@@ -122,7 +120,8 @@ public interface ElsqlEndpointBuilderFactory {
          * @param dataSource the value to set
          * @return the dsl builder
          */
-        default ElsqlEndpointConsumerBuilder dataSource(Object dataSource) {
+        default ElsqlEndpointConsumerBuilder dataSource(
+                javax.sql.DataSource dataSource) {
             doSetProperty("dataSource", dataSource);
             return this;
         }
@@ -200,7 +199,8 @@ public interface ElsqlEndpointBuilderFactory {
          * @param outputType the value to set
          * @return the dsl builder
          */
-        default ElsqlEndpointConsumerBuilder outputType(SqlOutputType outputType) {
+        default ElsqlEndpointConsumerBuilder outputType(
+                org.apache.camel.component.sql.SqlOutputType outputType) {
             doSetProperty("outputType", outputType);
             return this;
         }
@@ -841,7 +841,7 @@ public interface ElsqlEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ElsqlEndpointConsumerBuilder runLoggingLevel(
-                LoggingLevel runLoggingLevel) {
+                org.apache.camel.LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
         }
@@ -1097,7 +1097,7 @@ public interface ElsqlEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedElsqlEndpointConsumerBuilder exceptionHandler(
-                ExceptionHandler exceptionHandler) {
+                org.apache.camel.spi.ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
         }
@@ -1132,7 +1132,7 @@ public interface ElsqlEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedElsqlEndpointConsumerBuilder exchangePattern(
-                ExchangePattern exchangePattern) {
+                org.apache.camel.ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
@@ -1167,7 +1167,7 @@ public interface ElsqlEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedElsqlEndpointConsumerBuilder pollStrategy(
-                PollingConsumerPollStrategy pollStrategy) {
+                org.apache.camel.spi.PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
         }
@@ -1204,7 +1204,7 @@ public interface ElsqlEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedElsqlEndpointConsumerBuilder processingStrategy(
-                Object processingStrategy) {
+                org.apache.camel.component.sql.SqlProcessingStrategy processingStrategy) {
             doSetProperty("processingStrategy", processingStrategy);
             return this;
         }
@@ -1282,7 +1282,7 @@ public interface ElsqlEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedElsqlEndpointConsumerBuilder elSqlConfig(
-                Object elSqlConfig) {
+                com.opengamma.elsql.ElSqlConfig elSqlConfig) {
             doSetProperty("elSqlConfig", elSqlConfig);
             return this;
         }
@@ -1371,7 +1371,7 @@ public interface ElsqlEndpointBuilderFactory {
          * @return the dsl builder
          */
         default AdvancedElsqlEndpointConsumerBuilder prepareStatementStrategy(
-                Object prepareStatementStrategy) {
+                org.apache.camel.component.sql.SqlPrepareStatementStrategy prepareStatementStrategy) {
             doSetProperty("prepareStatementStrategy", prepareStatementStrategy);
             return this;
         }
@@ -1523,7 +1523,7 @@ public interface ElsqlEndpointBuilderFactory {
          * @return the dsl builder
          */
         default ElsqlEndpointProducerBuilder databaseVendor(
-                ElSqlDatabaseVendor databaseVendor) {
+                org.apache.camel.component.elsql.ElSqlDatabaseVendor databaseVendor) {
             doSetProperty("databaseVendor", databaseVendor);
             return this;
         }
@@ -1554,7 +1554,8 @@ public interface ElsqlEndpointBuilderFactory {
          * @param dataSource the value to set
          * @return the dsl builder
          */
-        default ElsqlEndpointProducerBuilder dataSource(Object dataSource) {
... 28499 lines suppressed ...

[camel] 05/05: CAMEL-17194: componentdsl - Prepare for generate only once during project build. WIP.

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

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

commit 0668b8731c2b4e145fa2c11fcb4081f8423ad66f
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 21 14:38:00 2021 +0100

    CAMEL-17194: componentdsl - Prepare for generate only once during project build. WIP.
---
 .../org/apache/camel/maven/packaging/ComponentDslMojo.java   | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
index 7630138..6c708d6 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ComponentDslMojo.java
@@ -104,8 +104,6 @@ public class ComponentDslMojo extends AbstractGeneratorMojo {
     @Parameter(defaultValue = "org.apache.camel.builder.component.dsl")
     protected String componentsDslFactoriesPackageName;
 
-    DynamicClassLoader projectClassLoader;
-
     @Override
     public void execute(MavenProject project, MavenProjectHelper projectHelper, BuildContext buildContext)
             throws MojoFailureException, MojoExecutionException {
@@ -118,12 +116,6 @@ public class ComponentDslMojo extends AbstractGeneratorMojo {
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
-        try {
-            projectClassLoader = DynamicClassLoader.createDynamicClassLoader(project.getTestClasspathElements());
-        } catch (org.apache.maven.artifact.DependencyResolutionRequiredException e) {
-            throw new RuntimeException(e.getMessage(), e);
-        }
-
         File camelDir = findCamelDirectory(baseDir, "dsl/camel-componentdsl");
         if (camelDir == null) {
             getLog().debug("No dsl/camel-componentdsl folder found, skipping execution");
@@ -208,7 +200,7 @@ public class ComponentDslMojo extends AbstractGeneratorMojo {
             final ComponentModel componentModel)
             throws MojoFailureException {
         final ComponentDslBuilderFactoryGenerator componentDslBuilderFactoryGenerator = ComponentDslBuilderFactoryGenerator
-                .generateClass(componentModel, projectClassLoader, componentsDslPackageName);
+                .generateClass(componentModel, getProjectClassLoader(), componentsDslPackageName);
         boolean updated = writeSourceIfChanged(componentDslBuilderFactoryGenerator.printClassAsString(),
                 componentsDslFactoriesPackageName.replace('.', '/'),
                 componentDslBuilderFactoryGenerator.getGeneratedClassName() + ".java", sourcesOutputDir);
@@ -237,7 +229,7 @@ public class ComponentDslMojo extends AbstractGeneratorMojo {
     private void syncAndGenerateComponentsBuilderFactories(final Set<ComponentModel> componentCachedModels)
             throws MojoFailureException {
         final ComponentsBuilderFactoryGenerator componentsBuilderFactoryGenerator = ComponentsBuilderFactoryGenerator
-                .generateClass(componentCachedModels, projectClassLoader, componentsDslPackageName);
+                .generateClass(componentCachedModels, getProjectClassLoader(), componentsDslPackageName);
         boolean updated = writeSourceIfChanged(componentsBuilderFactoryGenerator.printClassAsString(),
                 componentsDslPackageName.replace('.', '/'), componentsBuilderFactoryGenerator.getGeneratedClassName() + ".java",
                 sourcesOutputDir);

[camel] 01/05: CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.

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

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

commit 1df8926d6eb9e2cd61768b2cfc0e9f4f3fbc3da1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 21 11:31:00 2021 +0100

    CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.
---
 .../camel/maven/packaging/EndpointDslMojo.java     | 231 ++-------------------
 1 file changed, 19 insertions(+), 212 deletions(-)

diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index d9a34d6..c0b810a 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -22,14 +22,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.LineNumberReader;
 import java.io.StringReader;
-import java.lang.reflect.Array;
-import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -44,11 +41,6 @@ import java.util.stream.Stream;
 
 import javax.annotation.Generated;
 
-import org.apache.camel.maven.packaging.generics.GenericsUtil;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriParams;
-import org.apache.camel.spi.UriPath;
 import org.apache.camel.tooling.model.ComponentModel;
 import org.apache.camel.tooling.model.ComponentModel.EndpointOptionModel;
 import org.apache.camel.tooling.model.JsonMapper;
@@ -56,7 +48,6 @@ import org.apache.camel.tooling.util.JavadocHelper;
 import org.apache.camel.tooling.util.PackageHelper;
 import org.apache.camel.tooling.util.Strings;
 import org.apache.camel.tooling.util.srcgen.GenericType;
-import org.apache.camel.tooling.util.srcgen.GenericType.BoundType;
 import org.apache.camel.tooling.util.srcgen.JavaClass;
 import org.apache.camel.tooling.util.srcgen.Method;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -85,23 +76,8 @@ import static org.apache.camel.tooling.util.PackageHelper.loadText;
       defaultPhase = LifecyclePhase.PROCESS_CLASSES)
 public class EndpointDslMojo extends AbstractGeneratorMojo {
 
-    private static final Map<String, Class<?>> PRIMITIVEMAP;
-
     private static final Map<Path, Lock> LOCKS = new ConcurrentHashMap<>();
 
-    static {
-        PRIMITIVEMAP = new HashMap<>();
-        PRIMITIVEMAP.put("boolean", java.lang.Boolean.class);
-        PRIMITIVEMAP.put("char", java.lang.Character.class);
-        PRIMITIVEMAP.put("long", java.lang.Long.class);
-        PRIMITIVEMAP.put("int", java.lang.Integer.class);
-        PRIMITIVEMAP.put("integer", java.lang.Integer.class);
-        PRIMITIVEMAP.put("byte", java.lang.Byte.class);
-        PRIMITIVEMAP.put("short", java.lang.Short.class);
-        PRIMITIVEMAP.put("double", java.lang.Double.class);
-        PRIMITIVEMAP.put("float", java.lang.Float.class);
-    }
-
     /**
      * The project build directory
      */
@@ -283,8 +259,6 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
             throws MojoFailureException {
         String componentClassName = model.getJavaType();
         String builderName = getEndpointName(componentClassName);
-        Class<?> realComponentClass = loadClass(componentClassName);
-        Class<?> realEndpointClass = loadClass(findEndpointClassName(componentClassName));
 
         final JavaClass javaClass = new JavaClass(getProjectClassLoader());
         javaClass.setPackage(componentsFactoriesPackageName);
@@ -294,8 +268,6 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
         javaClass.addImport("org.apache.camel.builder.EndpointProducerBuilder");
         javaClass.addImport("org.apache.camel.builder.endpoint.AbstractEndpointBuilder");
 
-        Map<String, JavaClass> enumClasses = new HashMap<>();
-
         boolean hasAdvanced = false;
         for (EndpointOptionModel option : model.getEndpointOptions()) {
             if (option.getLabel() != null && option.getLabel().contains("advanced")) {
@@ -309,8 +281,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
         JavaClass producerClass = null;
         JavaClass advancedProducerClass = null;
 
-        if (!realEndpointClass.getAnnotation(UriEndpoint.class).producerOnly()
-                && !realEndpointClass.getAnnotation(UriEndpoint.class).consumerOnly()) {
+        if (!model.isProducerOnly() && !model.isConsumerOnly()) {
             String consumerName = builderName.replace("Endpoint", "EndpointConsumer");
             consumerClass = javaClass.addNestedType().setPublic().setClass(false);
             consumerClass.setName(consumerName);
@@ -359,9 +330,9 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
         JavaClass advancedBuilderClass = null;
         builderClass = javaClass.addNestedType().setPublic().setClass(false);
         builderClass.setName(builderName);
-        if (realEndpointClass.getAnnotation(UriEndpoint.class).producerOnly()) {
+        if (model.isProducerOnly()) {
             builderClass.implementInterface("EndpointProducerBuilder");
-        } else if (realEndpointClass.getAnnotation(UriEndpoint.class).consumerOnly()) {
+        } else if (model.isConsumerOnly()) {
             builderClass.implementInterface("EndpointConsumerBuilder");
         } else {
             builderClass.implementInterface(consumerClass.getName());
@@ -373,9 +344,9 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
         if (hasAdvanced) {
             advancedBuilderClass = javaClass.addNestedType().setPublic().setClass(false);
             advancedBuilderClass.setName("Advanced" + builderName);
-            if (realEndpointClass.getAnnotation(UriEndpoint.class).producerOnly()) {
+            if (model.isProducerOnly()) {
                 advancedBuilderClass.implementInterface("EndpointProducerBuilder");
-            } else if (realEndpointClass.getAnnotation(UriEndpoint.class).consumerOnly()) {
+            } else if (model.isConsumerOnly()) {
                 advancedBuilderClass.implementInterface("EndpointConsumerBuilder");
             } else {
                 advancedBuilderClass.implementInterface(advancedConsumerClass.getName());
@@ -438,16 +409,6 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                 }
             }
 
-            GenericType ogtype;
-            GenericType gtype;
-            try {
-                Field field = findField(realComponentClass, realEndpointClass, option);
-                ogtype = new GenericType(GenericsUtil.resolveType(realEndpointClass, field));
-                gtype = getType(javaClass, enumClasses, option.getEnums(), ogtype.toString());
-            } catch (Exception e) {
-                throw new RuntimeException(e);
-            }
-
             for (JavaClass target : targets) {
                 if (target == null) {
                     continue;
@@ -489,7 +450,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                 if (multiValued) {
                     // multi value option that takes one value
                     String desc = baseDesc.replace("@@REPLACE_ME@@",
-                            "\nThe option is a: <code>" + ogtype.toString().replace("<", "&lt;").replace(">", "&gt;")
+                            "\nThe option is a: <code>" + optionJavaType(option).replace("<", "&lt;").replace(">", "&gt;")
                                                                      + "</code> type.");
                     desc = JavadocHelper.xmlEncode(desc);
 
@@ -526,13 +487,13 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                 } else {
                     // regular option
                     String desc = baseDesc.replace("@@REPLACE_ME@@",
-                            "\nThe option is a: <code>" + ogtype.toString().replace("<", "&lt;").replace(">", "&gt;")
+                            "\nThe option is a: <code>" + optionJavaType(option).replace("<", "&lt;").replace(">", "&gt;")
                                                                      + "</code> type.");
                     desc = JavadocHelper.xmlEncode(desc);
 
                     Method fluent = target.addMethod().setDefault().setName(option.getName())
                             .setReturnType(new GenericType(loadClass(target.getCanonicalName())))
-                            .addParameter(isPrimitive(ogtype.toString()) ? ogtype : gtype, option.getName())
+                            .addParameter(optionJavaType(option), option.getName())
                             .setBody("doSetProperty(\"" + option.getName() + "\", " + option.getName() + ");",
                                     "return this;\n");
                     if (option.isDeprecated()) {
@@ -543,11 +504,12 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                     text += "\n@return the dsl builder\n";
                     fluent.getJavaDoc().setText(text);
 
-                    if (ogtype.getRawClass() != String.class) {
+                    if (!"String".equals(optionJavaType(option))) {
                         // regular option by String parameter variant
                         desc = baseDesc.replace("@@REPLACE_ME@@",
                                 "\nThe option will be converted to a <code>"
-                                                                  + ogtype.toString().replace("<", "&lt;").replace(">", "&gt;")
+                                                                  + optionJavaType(option).replace("<", "&lt;").replace(">",
+                                                                          "&gt;")
                                                                   + "</code> type.");
                         desc = JavadocHelper.xmlEncode(desc);
 
@@ -702,6 +664,14 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                 false);
     }
 
+    private static String optionJavaType(EndpointOptionModel option) {
+        String answer = option.getJavaType();
+        if (answer.startsWith("java.lang.")) {
+            return answer.substring(10);
+        }
+        return answer;
+    }
+
     private static String pathParameterJavaDoc(ComponentModel model) {
         int pos = model.getSyntax().indexOf(':');
         if (pos != -1) {
@@ -976,169 +946,6 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
         return getComponentNameFromType(type) + "EndpointBuilder";
     }
 
-    private String findEndpointClassName(String type) {
-        String endpointName = type.replaceFirst("Component", "Endpoint");
-        //
-        // HACKS
-        //
-        switch (type) {
-            case "org.apache.camel.component.disruptor.vm.DisruptorVmComponent":
-                return "org.apache.camel.component.disruptor.DisruptorEndpoint";
-            case "org.apache.camel.component.etcd.EtcdComponent":
-                return "org.apache.camel.component.etcd.AbstractEtcdPollingEndpoint";
-            case "org.apache.camel.websocket.jsr356.JSR356WebSocketComponent":
-                return "org.apache.camel.websocket.jsr356.JSR356Endpoint";
-            default:
-                return endpointName;
-        }
-    }
-
-    private Field findField(Class<?> realComponentClass, Class<?> realEndpointClass, EndpointOptionModel option)
-            throws NoSuchFieldException {
-        Field field = null;
-        List<Class<?>> classes = new ArrayList<>();
-        classes.add(realComponentClass);
-        classes.add(realEndpointClass);
-        while (!classes.isEmpty()) {
-            Class cl = classes.remove(0);
-            for (Field f : cl.getDeclaredFields()) {
-                String n = f.getName();
-                UriPath path = f.getAnnotation(UriPath.class);
-                if (path != null && !Strings.isEmpty(path.name())) {
-                    n = path.name();
-                }
-                UriParam param = f.getAnnotation(UriParam.class);
-                if (param != null && !Strings.isEmpty(param.name())) {
-                    n = param.name();
-                }
-                if (n.equals(option.getName())) {
-                    field = f;
-                    break;
-                }
-                if (f.getType().isAnnotationPresent(UriParams.class)) {
-                    classes.add(f.getType());
-                }
-            }
-            if (field != null) {
-                break;
-            }
-            cl = cl.getSuperclass();
-            if (cl != null) {
-                classes.add(cl);
-            }
-        }
-        if (field == null) {
-            throw new NoSuchFieldException("Could not find field for option " + option.getName());
-        }
-        return field;
-    }
-
-    private static boolean isPrimitive(String type) {
-        return PRIMITIVEMAP.containsKey(type);
-    }
-
-    private GenericType getType(JavaClass javaClass, Map<String, JavaClass> enumClasses, List<String> enums, String type) {
-        type = type.trim();
-        // Check if this is an array
-        if (type.endsWith("[]")) {
-            GenericType t = getType(javaClass, enumClasses, enums, type.substring(0, type.length() - 2));
-            return new GenericType(Array.newInstance(t.getRawClass(), 0).getClass(), t);
-        }
-        // Check if this is a generic
-        int genericIndex = type.indexOf('<');
-        if (genericIndex > 0) {
-            if (!type.endsWith(">")) {
-                throw new IllegalArgumentException("Can not load type: " + type);
-            }
-            GenericType base = getType(javaClass, enumClasses, enums, type.substring(0, genericIndex));
-            if (base.getRawClass() == Object.class) {
-                return base;
-            }
-            String[] params = splitParams(type.substring(genericIndex + 1, type.length() - 1));
-            GenericType[] types = new GenericType[params.length];
-            for (int i = 0; i < params.length; i++) {
-                types[i] = getType(javaClass, enumClasses, enums, params[i]);
-            }
-            return new GenericType(base.getRawClass(), types);
-        }
-        // Primitive
-        if (isPrimitive(type)) {
-            return new GenericType(PRIMITIVEMAP.get(type));
-        }
-        // Extends
-        if (type.startsWith("? extends ")) {
-            String raw = type.substring("? extends ".length());
-            return new GenericType(loadClass(raw), BoundType.Extends);
-        }
-        // Super
-        if (type.startsWith("? super ")) {
-            String raw = type.substring("? extends ".length());
-            return new GenericType(loadClass(raw), BoundType.Super);
-        }
-        // Wildcard
-        if (type.equals("?")) {
-            return new GenericType(Object.class, BoundType.Extends);
-        }
-        if (loadClass(type).isEnum() && !isCamelCoreType(type)) {
-            String enumClassName = type.substring(type.lastIndexOf('.') + 1);
-            if (enumClassName.contains("$")) {
-                enumClassName = enumClassName.substring(enumClassName.indexOf('$') + 1);
-            }
-            JavaClass enumClass = enumClasses.get(enumClassName);
-            if (enumClass == null) {
-                enumClass = javaClass.addNestedType().setPackagePrivate().setName(enumClassName).setEnum(true);
-                enumClass.getJavaDoc().setText("Proxy enum for <code>" + type + "</code> enum.");
-                enumClasses.put(enumClassName, enumClass);
-                for (Object value : loadClass(type).getEnumConstants()) {
-                    enumClass.addValue((((Enum<?>) value).name()).replace('.', '_').replace('-', '_'));
-                }
-            }
-            type = javaClass.getPackage() + "." + javaClass.getName() + "$" + enumClassName;
-            return new GenericType(generateDummyClass(type));
-        }
-        if (!isCamelCoreType(type)) {
-            getLog().debug("Substituting java.lang.Object to " + type);
-            return new GenericType(Object.class);
-        }
-        return new GenericType(loadClass(type));
-    }
-
-    private String[] splitParams(String string) {
-        List<String> params = new ArrayList<>();
-        int cur = 0;
-        int start = 0;
-        int opened = 0;
-        while (true) {
-            int nextComma = string.indexOf(',', cur);
-            int nextOpen = string.indexOf('<', cur);
-            int nextClose = string.indexOf('>', cur);
-            if (nextComma < 0) {
-                params.add(string.substring(start));
-                return params.toArray(new String[0]);
-            } else if ((nextOpen < 0 || nextComma < nextOpen) && (nextClose < 0 || nextComma < nextClose) && opened == 0) {
-                params.add(string.substring(start, nextComma));
-                start = cur = nextComma + 1;
-            } else if (nextOpen < 0) {
-                if (--opened < 0) {
-                    throw new IllegalStateException();
-                }
-                cur = nextClose + 1;
-            } else if (nextClose < 0 || nextOpen < nextClose) {
-                ++opened;
-                cur = nextOpen + 1;
-            } else {
-                if (--opened < 0) {
-                    throw new IllegalStateException();
-                }
-                cur = nextClose + 1;
-            }
-        }
-    }
-
-    private boolean isCamelCoreType(String type) {
-        return type.startsWith("java.") || type.matches("org\\.apache\\.camel\\.(spi\\.)?([A-Za-z]+)");
-    }
-
     private Class generateDummyClass(String clazzName) {
         return getProjectClassLoader().generateDummyClass(clazzName);
     }

[camel] 02/05: CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.

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

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

commit 96b4c89bb70570279fca9b0fb2db10d0b03565d6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 21 13:58:37 2021 +0100

    CAMEL-17194: endpointdsl - Prepare for generate only once during project build. WIP.
---
 .../apache/camel/maven/packaging/EndpointDslMojo.java | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index c0b810a..ba37ef6 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -264,6 +264,10 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
         javaClass.setPackage(componentsFactoriesPackageName);
         javaClass.setName(builderName + "Factory");
         javaClass.setClass(false);
+        javaClass.addImport("java.util.*");
+        javaClass.addImport("java.util.concurrent.*");
+        javaClass.addImport("java.util.function.*");
+        javaClass.addImport("java.util.stream.*");
         javaClass.addImport("org.apache.camel.builder.EndpointConsumerBuilder");
         javaClass.addImport("org.apache.camel.builder.EndpointProducerBuilder");
         javaClass.addImport("org.apache.camel.builder.endpoint.AbstractEndpointBuilder");
@@ -450,7 +454,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                 if (multiValued) {
                     // multi value option that takes one value
                     String desc = baseDesc.replace("@@REPLACE_ME@@",
-                            "\nThe option is a: <code>" + optionJavaType(option).replace("<", "&lt;").replace(">", "&gt;")
+                            "\nThe option is a: <code>" + option.getJavaType().replace("<", "&lt;").replace(">", "&gt;")
                                                                      + "</code> type.");
                     desc = JavadocHelper.xmlEncode(desc);
 
@@ -487,7 +491,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                 } else {
                     // regular option
                     String desc = baseDesc.replace("@@REPLACE_ME@@",
-                            "\nThe option is a: <code>" + optionJavaType(option).replace("<", "&lt;").replace(">", "&gt;")
+                            "\nThe option is a: <code>" + option.getJavaType().replace("<", "&lt;").replace(">", "&gt;")
                                                                      + "</code> type.");
                     desc = JavadocHelper.xmlEncode(desc);
 
@@ -508,7 +512,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                         // regular option by String parameter variant
                         desc = baseDesc.replace("@@REPLACE_ME@@",
                                 "\nThe option will be converted to a <code>"
-                                                                  + optionJavaType(option).replace("<", "&lt;").replace(">",
+                                                                  + option.getJavaType().replace("<", "&lt;").replace(">",
                                                                           "&gt;")
                                                                   + "</code> type.");
                         desc = JavadocHelper.xmlEncode(desc);
@@ -668,7 +672,16 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
         String answer = option.getJavaType();
         if (answer.startsWith("java.lang.")) {
             return answer.substring(10);
+        } else if (answer.startsWith("java.util.concurrent.")) {
+            return answer.substring(21);
+        } else if (answer.startsWith("java.util.function.")) {
+            return answer.substring(19);
+        } else if (answer.startsWith("java.util.stream.")) {
+            return answer.substring(17);
+        } else if (answer.startsWith("java.util.")) {
+            return answer.substring(10);
         }
+
         return answer;
     }