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

[camel] 14/16: CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP

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

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

commit 03639e2096f8087495fa1f2d0508f9ec68d0932b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 18:51:17 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../activemq/ActiveMQEndpointUriAssembler.java     |  35 ---
 .../activemq/ActiveMQEndpointUriFactory.java       |  35 +++
 .../org/apache/camel/urifactory/activemq-endpoint  |   2 +
 .../component/ahc/ws/WsEndpointUriAssembler.java   |  40 ---
 .../component/ahc/ws/WsEndpointUriFactory.java     |  40 +++
 .../org/apache/camel/urifactory/ahc-ws-endpoint    |   2 +
 .../org/apache/camel/urifactory/ahc-wss-endpoint   |   2 +
 .../component/ahc/AhcEndpointUriAssembler.java     |  34 ---
 .../camel/component/ahc/AhcEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/ahc-endpoint       |   2 +
 .../component/amqp/AMQPEndpointUriAssembler.java   |  35 ---
 .../component/amqp/AMQPEndpointUriFactory.java     |  35 +++
 .../org/apache/camel/urifactory/amqp-endpoint      |   2 +
 .../component/apns/ApnsEndpointUriAssembler.java   |  34 ---
 .../component/apns/ApnsEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/apns-endpoint      |   2 +
 .../arangodb/ArangoDbEndpointUriAssembler.java     |  34 ---
 .../arangodb/ArangoDbEndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/arangodb-endpoint  |   2 +
 .../component/as2/AS2EndpointUriAssembler.java     |  35 ---
 .../camel/component/as2/AS2EndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/as2-endpoint       |   2 +
 .../asterisk/AsteriskEndpointUriAssembler.java     |  34 ---
 .../asterisk/AsteriskEndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/asterisk-endpoint  |   2 +
 .../component/atmos/AtmosEndpointUriAssembler.java |  35 ---
 .../component/atmos/AtmosEndpointUriFactory.java   |  35 +++
 .../org/apache/camel/urifactory/atmos-endpoint     |   2 +
 .../websocket/WebsocketEndpointUriAssembler.java   |  34 ---
 .../websocket/WebsocketEndpointUriFactory.java     |  34 +++
 .../camel/urifactory/atmosphere-websocket-endpoint |   2 +
 .../component/atom/AtomEndpointUriAssembler.java   |  34 ---
 .../component/atom/AtomEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/atom-endpoint      |   2 +
 .../client/map/AtomixMapEndpointUriAssembler.java  |  34 ---
 .../client/map/AtomixMapEndpointUriFactory.java    |  34 +++
 .../AtomixMessagingEndpointUriAssembler.java       |  34 ---
 .../AtomixMessagingEndpointUriFactory.java         |  34 +++
 .../AtomixMultiMapEndpointUriAssembler.java        |  34 ---
 .../multimap/AtomixMultiMapEndpointUriFactory.java |  34 +++
 .../queue/AtomixQueueEndpointUriAssembler.java     |  34 ---
 .../queue/AtomixQueueEndpointUriFactory.java       |  34 +++
 .../client/set/AtomixSetEndpointUriAssembler.java  |  34 ---
 .../client/set/AtomixSetEndpointUriFactory.java    |  34 +++
 .../value/AtomixValueEndpointUriAssembler.java     |  34 ---
 .../value/AtomixValueEndpointUriFactory.java       |  34 +++
 .../apache/camel/urifactory/atomix-map-endpoint    |   2 +
 .../camel/urifactory/atomix-messaging-endpoint     |   2 +
 .../camel/urifactory/atomix-multimap-endpoint      |   2 +
 .../apache/camel/urifactory/atomix-queue-endpoint  |   2 +
 .../apache/camel/urifactory/atomix-set-endpoint    |   2 +
 .../apache/camel/urifactory/atomix-value-endpoint  |   2 +
 .../component/avro/AvroEndpointUriAssembler.java   |  37 ---
 .../component/avro/AvroEndpointUriFactory.java     |  37 +++
 .../org/apache/camel/urifactory/avro-endpoint      |   2 +
 .../component/aws/cw/CwEndpointUriAssembler.java   |  34 ---
 .../component/aws/cw/CwEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/aws-cw-endpoint    |   2 +
 .../component/aws/ddb/DdbEndpointUriAssembler.java |  34 ---
 .../component/aws/ddb/DdbEndpointUriFactory.java   |  34 +++
 .../ddbstream/DdbStreamEndpointUriAssembler.java   |  34 ---
 .../aws/ddbstream/DdbStreamEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/aws-ddb-endpoint   |   2 +
 .../apache/camel/urifactory/aws-ddbstream-endpoint |   2 +
 .../component/aws/ec2/EC2EndpointUriAssembler.java |  34 ---
 .../component/aws/ec2/EC2EndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws-ec2-endpoint   |   2 +
 .../component/aws/ecs/ECSEndpointUriAssembler.java |  34 ---
 .../component/aws/ecs/ECSEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws-ecs-endpoint   |   2 +
 .../component/aws/eks/EKSEndpointUriAssembler.java |  34 ---
 .../component/aws/eks/EKSEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws-eks-endpoint   |   2 +
 .../component/aws/iam/IAMEndpointUriAssembler.java |  34 ---
 .../component/aws/iam/IAMEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws-iam-endpoint   |   2 +
 .../KinesisFirehoseEndpointUriAssembler.java       |  34 ---
 .../KinesisFirehoseEndpointUriFactory.java         |  34 +++
 .../aws/kinesis/KinesisEndpointUriAssembler.java   |  34 ---
 .../aws/kinesis/KinesisEndpointUriFactory.java     |  34 +++
 .../apache/camel/urifactory/aws-kinesis-endpoint   |   2 +
 .../camel/urifactory/aws-kinesis-firehose-endpoint |   2 +
 .../component/aws/kms/KMSEndpointUriAssembler.java |  34 ---
 .../component/aws/kms/KMSEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws-kms-endpoint   |   2 +
 .../aws/lambda/LambdaEndpointUriAssembler.java     |  34 ---
 .../aws/lambda/LambdaEndpointUriFactory.java       |  34 +++
 .../apache/camel/urifactory/aws-lambda-endpoint    |   2 +
 .../component/aws/mq/MQEndpointUriAssembler.java   |  34 ---
 .../component/aws/mq/MQEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/aws-mq-endpoint    |   2 +
 .../component/aws/msk/MSKEndpointUriAssembler.java |  34 ---
 .../component/aws/msk/MSKEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws-msk-endpoint   |   2 +
 .../component/aws/s3/S3EndpointUriAssembler.java   |  34 ---
 .../component/aws/s3/S3EndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/aws-s3-endpoint    |   2 +
 .../component/aws/sdb/SdbEndpointUriAssembler.java |  34 ---
 .../component/aws/sdb/SdbEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws-sdb-endpoint   |   2 +
 .../component/aws/ses/SesEndpointUriAssembler.java |  34 ---
 .../component/aws/ses/SesEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws-ses-endpoint   |   2 +
 .../component/aws/sns/SnsEndpointUriAssembler.java |  34 ---
 .../component/aws/sns/SnsEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws-sns-endpoint   |   2 +
 .../component/aws/sqs/SqsEndpointUriAssembler.java |  34 ---
 .../component/aws/sqs/SqsEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws-sqs-endpoint   |   2 +
 .../component/aws/swf/SWFEndpointUriAssembler.java |  34 ---
 .../component/aws/swf/SWFEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws-swf-endpoint   |   2 +
 .../translate/TranslateEndpointUriAssembler.java   |  34 ---
 .../aws/translate/TranslateEndpointUriFactory.java |  34 +++
 .../apache/camel/urifactory/aws-translate-endpoint |   2 +
 .../aws2/athena/Athena2EndpointUriAssembler.java   |  34 ---
 .../aws2/athena/Athena2EndpointUriFactory.java     |  34 +++
 .../apache/camel/urifactory/aws2-athena-endpoint   |   2 +
 .../component/aws2/cw/Cw2EndpointUriAssembler.java |  34 ---
 .../component/aws2/cw/Cw2EndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws2-cw-endpoint   |   2 +
 .../aws2/ddb/Ddb2EndpointUriAssembler.java         |  34 ---
 .../component/aws2/ddb/Ddb2EndpointUriFactory.java |  34 +++
 .../ddbstream/Ddb2StreamEndpointUriAssembler.java  |  34 ---
 .../ddbstream/Ddb2StreamEndpointUriFactory.java    |  34 +++
 .../org/apache/camel/urifactory/aws2-ddb-endpoint  |   2 +
 .../camel/urifactory/aws2-ddbstream-endpoint       |   2 +
 .../aws2/ec2/AWS2EC2EndpointUriAssembler.java      |  34 ---
 .../aws2/ec2/AWS2EC2EndpointUriFactory.java        |  34 +++
 .../org/apache/camel/urifactory/aws2-ec2-endpoint  |   2 +
 .../aws2/ecs/ECS2EndpointUriAssembler.java         |  34 ---
 .../component/aws2/ecs/ECS2EndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/aws2-ecs-endpoint  |   2 +
 .../aws2/eks/EKS2EndpointUriAssembler.java         |  34 ---
 .../component/aws2/eks/EKS2EndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/aws2-eks-endpoint  |   2 +
 .../EventbridgeEndpointUriAssembler.java           |  34 ---
 .../eventbridge/EventbridgeEndpointUriFactory.java |  34 +++
 .../camel/urifactory/aws2-eventbridge-endpoint     |   2 +
 .../aws2/iam/IAM2EndpointUriAssembler.java         |  34 ---
 .../component/aws2/iam/IAM2EndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/aws2-iam-endpoint  |   2 +
 .../KinesisFirehose2EndpointUriAssembler.java      |  34 ---
 .../KinesisFirehose2EndpointUriFactory.java        |  34 +++
 .../aws2/kinesis/Kinesis2EndpointUriAssembler.java |  34 ---
 .../aws2/kinesis/Kinesis2EndpointUriFactory.java   |  34 +++
 .../apache/camel/urifactory/aws2-kinesis-endpoint  |   2 +
 .../urifactory/aws2-kinesis-firehose-endpoint      |   2 +
 .../aws2/kms/KMS2EndpointUriAssembler.java         |  34 ---
 .../component/aws2/kms/KMS2EndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/aws2-kms-endpoint  |   2 +
 .../aws2/lambda/Lambda2EndpointUriAssembler.java   |  34 ---
 .../aws2/lambda/Lambda2EndpointUriFactory.java     |  34 +++
 .../apache/camel/urifactory/aws2-lambda-endpoint   |   2 +
 .../component/aws2/mq/MQ2EndpointUriAssembler.java |  34 ---
 .../component/aws2/mq/MQ2EndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/aws2-mq-endpoint   |   2 +
 .../aws2/msk/MSK2EndpointUriAssembler.java         |  34 ---
 .../component/aws2/msk/MSK2EndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/aws2-msk-endpoint  |   2 +
 .../aws2/s3/AWS2S3EndpointUriAssembler.java        |  34 ---
 .../aws2/s3/AWS2S3EndpointUriFactory.java          |  34 +++
 .../org/apache/camel/urifactory/aws2-s3-endpoint   |   2 +
 .../aws2/ses/Ses2EndpointUriAssembler.java         |  34 ---
 .../component/aws2/ses/Ses2EndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/aws2-ses-endpoint  |   2 +
 .../aws2/sns/Sns2EndpointUriAssembler.java         |  34 ---
 .../component/aws2/sns/Sns2EndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/aws2-sns-endpoint  |   2 +
 .../aws2/sqs/Sqs2EndpointUriAssembler.java         |  34 ---
 .../component/aws2/sqs/Sqs2EndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/aws2-sqs-endpoint  |   2 +
 .../aws2/sts/STS2EndpointUriAssembler.java         |  34 ---
 .../component/aws2/sts/STS2EndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/aws2-sts-endpoint  |   2 +
 .../translate/Translate2EndpointUriAssembler.java  |  34 ---
 .../translate/Translate2EndpointUriFactory.java    |  34 +++
 .../camel/urifactory/aws2-translate-endpoint       |   2 +
 .../eventhubs/EventHubsEndpointUriAssembler.java   |  35 ---
 .../eventhubs/EventHubsEndpointUriFactory.java     |  35 +++
 .../camel/urifactory/azure-eventhubs-endpoint      |   2 +
 .../storage/blob/BlobEndpointUriAssembler.java     |  35 ---
 .../azure/storage/blob/BlobEndpointUriFactory.java |  35 +++
 .../camel/urifactory/azure-storage-blob-endpoint   |   2 +
 .../storage/queue/QueueEndpointUriAssembler.java   |  35 ---
 .../storage/queue/QueueEndpointUriFactory.java     |  35 +++
 .../camel/urifactory/azure-storage-queue-endpoint  |   2 +
 .../blob/BlobServiceEndpointUriAssembler.java      |  34 ---
 .../azure/blob/BlobServiceEndpointUriFactory.java  |  34 +++
 .../queue/QueueServiceEndpointUriAssembler.java    |  34 ---
 .../queue/QueueServiceEndpointUriFactory.java      |  34 +++
 .../apache/camel/urifactory/azure-blob-endpoint    |   2 +
 .../apache/camel/urifactory/azure-queue-endpoint   |   2 +
 .../BeanValidatorEndpointUriAssembler.java         |  34 ---
 .../validator/BeanValidatorEndpointUriFactory.java |  34 +++
 .../camel/urifactory/bean-validator-endpoint       |   2 +
 .../component/bean/BeanEndpointUriAssembler.java   |  34 ---
 .../component/bean/BeanEndpointUriFactory.java     |  34 +++
 .../beanclass/ClassEndpointUriAssembler.java       |  34 ---
 .../beanclass/ClassEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/bean-endpoint      |   2 +
 .../org/apache/camel/urifactory/class-endpoint     |   2 +
 .../beanstalk/BeanstalkEndpointUriAssembler.java   |  34 ---
 .../beanstalk/BeanstalkEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/beanstalk-endpoint |   2 +
 .../bonita/BonitaEndpointUriAssembler.java         |  34 ---
 .../component/bonita/BonitaEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/bonita-endpoint    |   2 +
 .../component/box/BoxEndpointUriAssembler.java     |  35 ---
 .../camel/component/box/BoxEndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/box-endpoint       |   2 +
 .../braintree/BraintreeEndpointUriAssembler.java   |  35 ---
 .../braintree/BraintreeEndpointUriFactory.java     |  35 +++
 .../org/apache/camel/urifactory/braintree-endpoint |   2 +
 .../browse/BrowseEndpointUriAssembler.java         |  34 ---
 .../component/browse/BrowseEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/browse-endpoint    |   2 +
 .../cache/CaffeineCacheEndpointUriAssembler.java   |  34 ---
 .../cache/CaffeineCacheEndpointUriFactory.java     |  34 +++
 .../CaffeineLoadCacheEndpointUriAssembler.java     |  34 ---
 .../load/CaffeineLoadCacheEndpointUriFactory.java  |  34 +++
 .../camel/urifactory/caffeine-cache-endpoint       |   2 +
 .../camel/urifactory/caffeine-loadcache-endpoint   |   2 +
 .../cassandra/CassandraEndpointUriAssembler.java   |  37 ---
 .../cassandra/CassandraEndpointUriFactory.java     |  37 +++
 .../org/apache/camel/urifactory/cql-endpoint       |   2 +
 .../chatscript/ChatScriptEndpointUriAssembler.java |  36 ---
 .../chatscript/ChatScriptEndpointUriFactory.java   |  36 +++
 .../apache/camel/urifactory/chatscript-endpoint    |   2 +
 .../component/chunk/ChunkEndpointUriAssembler.java |  34 ---
 .../component/chunk/ChunkEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/chunk-endpoint     |   2 +
 .../camel/component/cm/CMEndpointUriAssembler.java |  34 ---
 .../camel/component/cm/CMEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/cm-sms-endpoint    |   2 +
 .../component/cmis/CMISEndpointUriAssembler.java   |  34 ---
 .../component/cmis/CMISEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/cmis-endpoint      |   2 +
 .../camel/coap/CoAPEndpointUriAssembler.java       |  40 ---
 .../apache/camel/coap/CoAPEndpointUriFactory.java  |  40 +++
 .../org/apache/camel/urifactory/coap+tcp-endpoint  |   2 +
 .../org/apache/camel/urifactory/coap-endpoint      |   2 +
 .../org/apache/camel/urifactory/coaps+tcp-endpoint |   2 +
 .../org/apache/camel/urifactory/coaps-endpoint     |   2 +
 .../cometd/CometdEndpointUriAssembler.java         |  42 ---
 .../component/cometd/CometdEndpointUriFactory.java |  42 +++
 .../org/apache/camel/urifactory/cometd-endpoint    |   2 +
 .../org/apache/camel/urifactory/cometds-endpoint   |   2 +
 .../consul/ConsulEndpointUriAssembler.java         |  34 ---
 .../component/consul/ConsulEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/consul-endpoint    |   2 +
 .../controlbus/ControlBusEndpointUriAssembler.java |  35 ---
 .../controlbus/ControlBusEndpointUriFactory.java   |  35 +++
 .../apache/camel/urifactory/controlbus-endpoint    |   2 +
 .../component/corda/CordaEndpointUriAssembler.java |  34 ---
 .../component/corda/CordaEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/corda-endpoint     |   2 +
 .../couchbase/CouchbaseEndpointUriAssembler.java   |  36 ---
 .../couchbase/CouchbaseEndpointUriFactory.java     |  36 +++
 .../org/apache/camel/urifactory/couchbase-endpoint |   2 +
 .../couchdb/CouchDbEndpointUriAssembler.java       |  37 ---
 .../couchdb/CouchDbEndpointUriFactory.java         |  37 +++
 .../org/apache/camel/urifactory/couchdb-endpoint   |   2 +
 .../component/cron/CronEndpointUriAssembler.java   |  34 ---
 .../component/cron/CronEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/cron-endpoint      |   2 +
 .../crypto/cms/CryptoCmsEndpointUriAssembler.java  |  35 ---
 .../crypto/cms/CryptoCmsEndpointUriFactory.java    |  35 +++
 .../apache/camel/urifactory/crypto-cms-endpoint    |   2 +
 .../DigitalSignatureEndpointUriAssembler.java      |  35 ---
 .../crypto/DigitalSignatureEndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/crypto-endpoint    |   2 +
 .../component/cxf/CxfEndpointUriAssembler.java     |  35 ---
 .../camel/component/cxf/CxfEndpointUriFactory.java |  35 +++
 .../cxf/jaxrs/CxfRsEndpointUriAssembler.java       |  35 ---
 .../cxf/jaxrs/CxfRsEndpointUriFactory.java         |  35 +++
 .../org/apache/camel/urifactory/cxf-endpoint       |   2 +
 .../org/apache/camel/urifactory/cxfrs-endpoint     |   2 +
 .../dataformat/DataFormatEndpointUriAssembler.java |  35 ---
 .../dataformat/DataFormatEndpointUriFactory.java   |  35 +++
 .../apache/camel/urifactory/dataformat-endpoint    |   2 +
 .../dataset/DataSetEndpointUriAssembler.java       |  34 ---
 .../dataset/DataSetEndpointUriFactory.java         |  34 +++
 .../dataset/DataSetTestEndpointUriAssembler.java   |  34 ---
 .../dataset/DataSetTestEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/dataset-endpoint   |   2 +
 .../apache/camel/urifactory/dataset-test-endpoint  |   2 +
 .../DebeziumMongodbEndpointUriAssembler.java       |  34 ---
 .../DebeziumMongodbEndpointUriFactory.java         |  34 +++
 .../camel/urifactory/debezium-mongodb-endpoint     |   2 +
 .../DebeziumMySqlEndpointUriAssembler.java         |  34 ---
 .../debezium/DebeziumMySqlEndpointUriFactory.java  |  34 +++
 .../camel/urifactory/debezium-mysql-endpoint       |   2 +
 .../DebeziumPostgresEndpointUriAssembler.java      |  34 ---
 .../DebeziumPostgresEndpointUriFactory.java        |  34 +++
 .../camel/urifactory/debezium-postgres-endpoint    |   2 +
 .../DebeziumSqlserverEndpointUriAssembler.java     |  34 ---
 .../DebeziumSqlserverEndpointUriFactory.java       |  34 +++
 .../camel/urifactory/debezium-sqlserver-endpoint   |   2 +
 .../DigitalOceanEndpointUriAssembler.java          |  34 ---
 .../DigitalOceanEndpointUriFactory.java            |  34 +++
 .../apache/camel/urifactory/digitalocean-endpoint  |   2 +
 .../direct/DirectEndpointUriAssembler.java         |  34 ---
 .../component/direct/DirectEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/direct-endpoint    |   2 +
 .../directvm/DirectVmEndpointUriAssembler.java     |  34 ---
 .../directvm/DirectVmEndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/direct-vm-endpoint |   2 +
 .../disruptor/DisruptorEndpointUriAssembler.java   |  40 ---
 .../disruptor/DisruptorEndpointUriFactory.java     |  40 +++
 .../vm/DisruptorVmEndpointUriAssembler.java        |  40 ---
 .../vm/DisruptorVmEndpointUriFactory.java          |  40 +++
 .../org/apache/camel/urifactory/disruptor-endpoint |   2 +
 .../apache/camel/urifactory/disruptor-vm-endpoint  |   2 +
 .../component/djl/DJLEndpointUriAssembler.java     |  34 ---
 .../camel/component/djl/DJLEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/djl-endpoint       |   2 +
 .../component/dns/DnsEndpointUriAssembler.java     |  34 ---
 .../camel/component/dns/DnsEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/dns-endpoint       |   2 +
 .../docker/DockerEndpointUriAssembler.java         |  34 ---
 .../component/docker/DockerEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/docker-endpoint    |   2 +
 .../component/dozer/DozerEndpointUriAssembler.java |  34 ---
 .../component/dozer/DozerEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/dozer-endpoint     |   2 +
 .../component/drill/DrillEndpointUriAssembler.java |  34 ---
 .../component/drill/DrillEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/drill-endpoint     |   2 +
 .../dropbox/DropboxEndpointUriAssembler.java       |  34 ---
 .../dropbox/DropboxEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/dropbox-endpoint   |   2 +
 .../ehcache/EhcacheEndpointUriAssembler.java       |  34 ---
 .../ehcache/EhcacheEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/ehcache-endpoint   |   2 +
 .../ElasticsearchEndpointUriAssembler.java         |  34 ---
 .../ElasticsearchEndpointUriFactory.java           |  34 +++
 .../camel/urifactory/elasticsearch-rest-endpoint   |   2 +
 .../component/elsql/ElsqlEndpointUriAssembler.java |  35 ---
 .../component/elsql/ElsqlEndpointUriFactory.java   |  35 +++
 .../org/apache/camel/urifactory/elsql-endpoint     |   2 +
 .../etcd/EtcdKeysEndpointUriAssembler.java         |  34 ---
 .../component/etcd/EtcdKeysEndpointUriFactory.java |  34 +++
 .../etcd/EtcdStatsEndpointUriAssembler.java        |  34 ---
 .../etcd/EtcdStatsEndpointUriFactory.java          |  34 +++
 .../etcd/EtcdWatchEndpointUriAssembler.java        |  34 ---
 .../etcd/EtcdWatchEndpointUriFactory.java          |  34 +++
 .../org/apache/camel/urifactory/etcd-keys-endpoint |   2 +
 .../apache/camel/urifactory/etcd-stats-endpoint    |   2 +
 .../apache/camel/urifactory/etcd-watch-endpoint    |   2 +
 .../component/exec/ExecEndpointUriAssembler.java   |  34 ---
 .../component/exec/ExecEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/exec-endpoint      |   2 +
 .../facebook/FacebookEndpointUriAssembler.java     |  34 ---
 .../facebook/FacebookEndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/facebook-endpoint  |   2 +
 .../component/fhir/FhirEndpointUriAssembler.java   |  35 ---
 .../component/fhir/FhirEndpointUriFactory.java     |  35 +++
 .../org/apache/camel/urifactory/fhir-endpoint      |   2 +
 .../file/watch/FileWatchEndpointUriAssembler.java  |  34 ---
 .../file/watch/FileWatchEndpointUriFactory.java    |  34 +++
 .../apache/camel/urifactory/file-watch-endpoint    |   2 +
 .../component/file/FileEndpointUriAssembler.java   |  34 ---
 .../component/file/FileEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/file-endpoint      |   2 +
 .../flatpack/FlatpackEndpointUriAssembler.java     |  35 ---
 .../flatpack/FlatpackEndpointUriFactory.java       |  35 +++
 .../org/apache/camel/urifactory/flatpack-endpoint  |   2 +
 .../component/flink/FlinkEndpointUriAssembler.java |  34 ---
 .../component/flink/FlinkEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/flink-endpoint     |   2 +
 .../component/fop/FopEndpointUriAssembler.java     |  34 ---
 .../camel/component/fop/FopEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/fop-endpoint       |   2 +
 .../freemarker/FreemarkerEndpointUriAssembler.java |  34 ---
 .../freemarker/FreemarkerEndpointUriFactory.java   |  34 +++
 .../apache/camel/urifactory/freemarker-endpoint    |   2 +
 .../file/remote/FtpEndpointUriAssembler.java       |  36 ---
 .../file/remote/FtpEndpointUriFactory.java         |  36 +++
 .../file/remote/FtpsEndpointUriAssembler.java      |  36 ---
 .../file/remote/FtpsEndpointUriFactory.java        |  36 +++
 .../file/remote/SftpEndpointUriAssembler.java      |  36 ---
 .../file/remote/SftpEndpointUriFactory.java        |  36 +++
 .../org/apache/camel/urifactory/ftp-endpoint       |   2 +
 .../org/apache/camel/urifactory/ftps-endpoint      |   2 +
 .../org/apache/camel/urifactory/sftp-endpoint      |   2 +
 .../ganglia/GangliaEndpointUriAssembler.java       |  35 ---
 .../ganglia/GangliaEndpointUriFactory.java         |  35 +++
 .../org/apache/camel/urifactory/ganglia-endpoint   |   2 +
 .../geocoder/GeoCoderEndpointUriAssembler.java     |  35 ---
 .../geocoder/GeoCoderEndpointUriFactory.java       |  35 +++
 .../org/apache/camel/urifactory/geocoder-endpoint  |   2 +
 .../component/git/GitEndpointUriAssembler.java     |  34 ---
 .../camel/component/git/GitEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/git-endpoint       |   2 +
 .../github/GitHubEndpointUriAssembler.java         |  35 ---
 .../component/github/GitHubEndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/github-endpoint    |   2 +
 .../GoogleBigQueryEndpointUriAssembler.java        |  36 ---
 .../bigquery/GoogleBigQueryEndpointUriFactory.java |  36 +++
 .../sql/GoogleBigQuerySQLEndpointUriAssembler.java |  35 ---
 .../sql/GoogleBigQuerySQLEndpointUriFactory.java   |  35 +++
 .../camel/urifactory/google-bigquery-endpoint      |   2 +
 .../camel/urifactory/google-bigquery-sql-endpoint  |   2 +
 .../GoogleCalendarEndpointUriAssembler.java        |  35 ---
 .../calendar/GoogleCalendarEndpointUriFactory.java |  35 +++
 .../GoogleCalendarStreamEndpointUriAssembler.java  |  34 ---
 .../GoogleCalendarStreamEndpointUriFactory.java    |  34 +++
 .../camel/urifactory/google-calendar-endpoint      |   2 +
 .../urifactory/google-calendar-stream-endpoint     |   2 +
 .../drive/GoogleDriveEndpointUriAssembler.java     |  35 ---
 .../drive/GoogleDriveEndpointUriFactory.java       |  35 +++
 .../apache/camel/urifactory/google-drive-endpoint  |   2 +
 .../mail/GoogleMailEndpointUriAssembler.java       |  35 ---
 .../google/mail/GoogleMailEndpointUriFactory.java  |  35 +++
 .../GoogleMailStreamEndpointUriAssembler.java      |  34 ---
 .../stream/GoogleMailStreamEndpointUriFactory.java |  34 +++
 .../apache/camel/urifactory/google-mail-endpoint   |   2 +
 .../camel/urifactory/google-mail-stream-endpoint   |   2 +
 .../pubsub/GooglePubsubEndpointUriAssembler.java   |  35 ---
 .../pubsub/GooglePubsubEndpointUriFactory.java     |  35 +++
 .../apache/camel/urifactory/google-pubsub-endpoint |   2 +
 .../sheets/GoogleSheetsEndpointUriAssembler.java   |  35 ---
 .../sheets/GoogleSheetsEndpointUriFactory.java     |  35 +++
 .../GoogleSheetsStreamEndpointUriAssembler.java    |  34 ---
 .../GoogleSheetsStreamEndpointUriFactory.java      |  34 +++
 .../apache/camel/urifactory/google-sheets-endpoint |   2 +
 .../camel/urifactory/google-sheets-stream-endpoint |   2 +
 .../component/gora/GoraEndpointUriAssembler.java   |  34 ---
 .../component/gora/GoraEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/gora-endpoint      |   2 +
 .../component/grape/GrapeEndpointUriAssembler.java |  34 ---
 .../component/grape/GrapeEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/grape-endpoint     |   2 +
 .../graphql/GraphqlEndpointUriAssembler.java       |  34 ---
 .../graphql/GraphqlEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/graphql-endpoint   |   2 +
 .../component/grpc/GrpcEndpointUriAssembler.java   |  36 ---
 .../component/grpc/GrpcEndpointUriFactory.java     |  36 +++
 .../org/apache/camel/urifactory/grpc-endpoint      |   2 +
 .../GuavaEventBusEndpointUriAssembler.java         |  34 ---
 .../eventbus/GuavaEventBusEndpointUriFactory.java  |  34 +++
 .../camel/urifactory/guava-eventbus-endpoint       |   2 +
 .../HazelcastAtomicnumberEndpointUriAssembler.java |  34 ---
 .../HazelcastAtomicnumberEndpointUriFactory.java   |  34 +++
 .../HazelcastInstanceEndpointUriAssembler.java     |  34 ---
 .../HazelcastInstanceEndpointUriFactory.java       |  34 +++
 .../list/HazelcastListEndpointUriAssembler.java    |  34 ---
 .../list/HazelcastListEndpointUriFactory.java      |  34 +++
 .../map/HazelcastMapEndpointUriAssembler.java      |  34 ---
 .../map/HazelcastMapEndpointUriFactory.java        |  34 +++
 .../HazelcastMultimapEndpointUriAssembler.java     |  34 ---
 .../HazelcastMultimapEndpointUriFactory.java       |  34 +++
 .../queue/HazelcastQueueEndpointUriAssembler.java  |  34 ---
 .../queue/HazelcastQueueEndpointUriFactory.java    |  34 +++
 ...HazelcastReplicatedmapEndpointUriAssembler.java |  34 ---
 .../HazelcastReplicatedmapEndpointUriFactory.java  |  34 +++
 .../HazelcastRingbufferEndpointUriAssembler.java   |  34 ---
 .../HazelcastRingbufferEndpointUriFactory.java     |  34 +++
 .../seda/HazelcastSedaEndpointUriAssembler.java    |  34 ---
 .../seda/HazelcastSedaEndpointUriFactory.java      |  34 +++
 .../set/HazelcastSetEndpointUriAssembler.java      |  34 ---
 .../set/HazelcastSetEndpointUriFactory.java        |  34 +++
 .../topic/HazelcastTopicEndpointUriAssembler.java  |  34 ---
 .../topic/HazelcastTopicEndpointUriFactory.java    |  34 +++
 .../urifactory/hazelcast-atomicvalue-endpoint      |   2 +
 .../camel/urifactory/hazelcast-instance-endpoint   |   2 +
 .../camel/urifactory/hazelcast-list-endpoint       |   2 +
 .../apache/camel/urifactory/hazelcast-map-endpoint |   2 +
 .../camel/urifactory/hazelcast-multimap-endpoint   |   2 +
 .../camel/urifactory/hazelcast-queue-endpoint      |   2 +
 .../urifactory/hazelcast-replicatedmap-endpoint    |   2 +
 .../camel/urifactory/hazelcast-ringbuffer-endpoint |   2 +
 .../camel/urifactory/hazelcast-seda-endpoint       |   2 +
 .../apache/camel/urifactory/hazelcast-set-endpoint |   2 +
 .../camel/urifactory/hazelcast-topic-endpoint      |   2 +
 .../component/hbase/HBaseEndpointUriAssembler.java |  34 ---
 .../component/hbase/HBaseEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/hbase-endpoint     |   2 +
 .../component/hdfs/HdfsEndpointUriAssembler.java   |  36 ---
 .../component/hdfs/HdfsEndpointUriFactory.java     |  36 +++
 .../org/apache/camel/urifactory/hdfs-endpoint      |   2 +
 .../hipchat/HipchatEndpointUriAssembler.java       |  36 ---
 .../hipchat/HipchatEndpointUriFactory.java         |  36 +++
 .../org/apache/camel/urifactory/hipchat-endpoint   |   2 +
 .../component/http/HttpEndpointUriAssembler.java   |  40 ---
 .../component/http/HttpEndpointUriFactory.java     |  40 +++
 .../org/apache/camel/urifactory/http-endpoint      |   2 +
 .../org/apache/camel/urifactory/https-endpoint     |   2 +
 .../client/ClientEndpointUriAssembler.java         |  34 ---
 .../iec60870/client/ClientEndpointUriFactory.java  |  34 +++
 .../server/ServerEndpointUriAssembler.java         |  34 ---
 .../iec60870/server/ServerEndpointUriFactory.java  |  34 +++
 .../camel/urifactory/iec60870-client-endpoint      |   2 +
 .../camel/urifactory/iec60870-server-endpoint      |   2 +
 .../apache/camel/urifactory/ignite-cache-endpoint  |   2 +
 .../camel/urifactory/ignite-compute-endpoint       |   2 +
 .../apache/camel/urifactory/ignite-events-endpoint |   2 +
 .../apache/camel/urifactory/ignite-idgen-endpoint  |   2 +
 .../camel/urifactory/ignite-messaging-endpoint     |   2 +
 .../apache/camel/urifactory/ignite-queue-endpoint  |   2 +
 .../apache/camel/urifactory/ignite-set-endpoint    |   2 +
 .../infinispan/InfinispanEndpointUriAssembler.java |  34 ---
 .../infinispan/InfinispanEndpointUriFactory.java   |  34 +++
 .../apache/camel/urifactory/infinispan-endpoint    |   2 +
 .../influxdb/InfluxDbEndpointUriAssembler.java     |  34 ---
 .../influxdb/InfluxDbEndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/influxdb-endpoint  |   2 +
 .../component/iota/IOTAEndpointUriAssembler.java   |  34 ---
 .../component/iota/IOTAEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/iota-endpoint      |   2 +
 .../component/ipfs/IPFSEndpointUriAssembler.java   |  34 ---
 .../component/ipfs/IPFSEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/ipfs-endpoint      |   2 +
 .../component/irc/IrcEndpointUriAssembler.java     |  35 ---
 .../camel/component/irc/IrcEndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/irc-endpoint       |   2 +
 .../ironmq/IronMQEndpointUriAssembler.java         |  34 ---
 .../component/ironmq/IronMQEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/ironmq-endpoint    |   2 +
 .../component/jbpm/JBPMEndpointUriAssembler.java   |  35 ---
 .../component/jbpm/JBPMEndpointUriFactory.java     |  35 +++
 .../org/apache/camel/urifactory/jbpm-endpoint      |   2 +
 .../jcache/JCacheEndpointUriAssembler.java         |  34 ---
 .../component/jcache/JCacheEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/jcache-endpoint    |   2 +
 .../jclouds/JcloudsEndpointUriAssembler.java       |  35 ---
 .../jclouds/JcloudsEndpointUriFactory.java         |  35 +++
 .../org/apache/camel/urifactory/jclouds-endpoint   |   2 +
 .../component/jcr/JcrEndpointUriAssembler.java     |  35 ---
 .../camel/component/jcr/JcrEndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/jcr-endpoint       |   2 +
 .../component/jdbc/JdbcEndpointUriAssembler.java   |  34 ---
 .../component/jdbc/JdbcEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/jdbc-endpoint      |   2 +
 .../jetty9/JettyHttp9EndpointUriAssembler.java     |  34 ---
 .../jetty9/JettyHttp9EndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/jetty-endpoint     |   2 +
 .../raft/JGroupsRaftEndpointUriAssembler.java      |  34 ---
 .../raft/JGroupsRaftEndpointUriFactory.java        |  34 +++
 .../apache/camel/urifactory/jgroups-raft-endpoint  |   2 +
 .../jgroups/JGroupsEndpointUriAssembler.java       |  34 ---
 .../jgroups/JGroupsEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/jgroups-endpoint   |   2 +
 .../validator/jing/JingEndpointUriAssembler.java   |  34 ---
 .../validator/jing/JingEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/jing-endpoint      |   2 +
 .../component/jira/JiraEndpointUriAssembler.java   |  34 ---
 .../component/jira/JiraEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/jira-endpoint      |   2 +
 .../component/jms/JmsEndpointUriAssembler.java     |  35 ---
 .../camel/component/jms/JmsEndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/jms-endpoint       |   2 +
 .../component/jmx/JMXEndpointUriAssembler.java     |  34 ---
 .../camel/component/jmx/JMXEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/jmx-endpoint       |   2 +
 .../component/jolt/JoltEndpointUriAssembler.java   |  34 ---
 .../component/jolt/JoltEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/jolt-endpoint      |   2 +
 .../component/jooq/JooqEndpointUriAssembler.java   |  34 ---
 .../component/jooq/JooqEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/jooq-endpoint      |   2 +
 .../component/jpa/JpaEndpointUriAssembler.java     |  34 ---
 .../camel/component/jpa/JpaEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/jpa-endpoint       |   2 +
 .../component/scp/ScpEndpointUriAssembler.java     |  36 ---
 .../camel/component/scp/ScpEndpointUriFactory.java |  36 +++
 .../org/apache/camel/urifactory/scp-endpoint       |   2 +
 .../component/jslt/JsltEndpointUriAssembler.java   |  34 ---
 .../component/jslt/JsltEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/jslt-endpoint      |   2 +
 .../JsonValidatorEndpointUriAssembler.java         |  34 ---
 .../JsonValidatorEndpointUriFactory.java           |  34 +++
 .../camel/urifactory/json-validator-endpoint       |   2 +
 .../jsonata/JsonataEndpointUriAssembler.java       |  34 ---
 .../jsonata/JsonataEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/jsonata-endpoint   |   2 +
 .../component/jt400/Jt400EndpointUriAssembler.java |  38 ---
 .../component/jt400/Jt400EndpointUriFactory.java   |  38 +++
 .../org/apache/camel/urifactory/jt400-endpoint     |   2 +
 .../component/kafka/KafkaEndpointUriAssembler.java |  34 ---
 .../component/kafka/KafkaEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/kafka-endpoint     |   2 +
 .../KubernetesConfigMapsEndpointUriAssembler.java  |  34 ---
 .../KubernetesConfigMapsEndpointUriFactory.java    |  34 +++
 .../KubernetesDeploymentsEndpointUriAssembler.java |  34 ---
 .../KubernetesDeploymentsEndpointUriFactory.java   |  34 +++
 .../hpa/KubernetesHPAEndpointUriAssembler.java     |  34 ---
 .../hpa/KubernetesHPAEndpointUriFactory.java       |  34 +++
 .../job/KubernetesJobEndpointUriAssembler.java     |  34 ---
 .../job/KubernetesJobEndpointUriFactory.java       |  34 +++
 .../KubernetesNamespacesEndpointUriAssembler.java  |  34 ---
 .../KubernetesNamespacesEndpointUriFactory.java    |  34 +++
 .../nodes/KubernetesNodesEndpointUriAssembler.java |  34 ---
 .../nodes/KubernetesNodesEndpointUriFactory.java   |  34 +++
 ...netesPersistentVolumesEndpointUriAssembler.java |  34 ---
 ...ernetesPersistentVolumesEndpointUriFactory.java |  34 +++
 ...ersistentVolumesClaimsEndpointUriAssembler.java |  34 ---
 ...sPersistentVolumesClaimsEndpointUriFactory.java |  34 +++
 .../pods/KubernetesPodsEndpointUriAssembler.java   |  34 ---
 .../pods/KubernetesPodsEndpointUriFactory.java     |  34 +++
 ...ReplicationControllersEndpointUriAssembler.java |  34 ---
 ...esReplicationControllersEndpointUriFactory.java |  34 +++
 ...bernetesResourcesQuotaEndpointUriAssembler.java |  34 ---
 ...KubernetesResourcesQuotaEndpointUriFactory.java |  34 +++
 .../KubernetesSecretsEndpointUriAssembler.java     |  34 ---
 .../KubernetesSecretsEndpointUriFactory.java       |  34 +++
 ...ernetesServiceAccountsEndpointUriAssembler.java |  34 ---
 ...ubernetesServiceAccountsEndpointUriFactory.java |  34 +++
 .../KubernetesServicesEndpointUriAssembler.java    |  34 ---
 .../KubernetesServicesEndpointUriFactory.java      |  34 +++
 .../OpenshiftBuildConfigsEndpointUriAssembler.java |  34 ---
 .../OpenshiftBuildConfigsEndpointUriFactory.java   |  34 +++
 .../OpenshiftBuildsEndpointUriAssembler.java       |  34 ---
 .../builds/OpenshiftBuildsEndpointUriFactory.java  |  34 +++
 .../urifactory/kubernetes-config-maps-endpoint     |   2 +
 .../urifactory/kubernetes-deployments-endpoint     |   2 +
 .../camel/urifactory/kubernetes-hpa-endpoint       |   2 +
 .../camel/urifactory/kubernetes-job-endpoint       |   2 +
 .../urifactory/kubernetes-namespaces-endpoint      |   2 +
 .../camel/urifactory/kubernetes-nodes-endpoint     |   2 +
 .../kubernetes-persistent-volumes-claims-endpoint  |   2 +
 .../kubernetes-persistent-volumes-endpoint         |   2 +
 .../camel/urifactory/kubernetes-pods-endpoint      |   2 +
 .../kubernetes-replication-controllers-endpoint    |   2 +
 .../urifactory/kubernetes-resources-quota-endpoint |   2 +
 .../camel/urifactory/kubernetes-secrets-endpoint   |   2 +
 .../kubernetes-service-accounts-endpoint           |   2 +
 .../camel/urifactory/kubernetes-services-endpoint  |   2 +
 .../urifactory/openshift-build-configs-endpoint    |   2 +
 .../camel/urifactory/openshift-builds-endpoint     |   2 +
 .../component/kudu/KuduEndpointUriAssembler.java   |  36 ---
 .../component/kudu/KuduEndpointUriFactory.java     |  36 +++
 .../org/apache/camel/urifactory/kudu-endpoint      |   2 +
 .../language/LanguageEndpointUriAssembler.java     |  35 ---
 .../language/LanguageEndpointUriFactory.java       |  35 +++
 .../org/apache/camel/urifactory/language-endpoint  |   2 +
 .../component/ldap/LdapEndpointUriAssembler.java   |  34 ---
 .../component/ldap/LdapEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/ldap-endpoint      |   2 +
 .../component/ldif/LdifEndpointUriAssembler.java   |  34 ---
 .../component/ldif/LdifEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/ldif-endpoint      |   2 +
 .../component/log/LogEndpointUriAssembler.java     |  34 ---
 .../camel/component/log/LogEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/log-endpoint       |   2 +
 .../lucene/LuceneEndpointUriAssembler.java         |  35 ---
 .../component/lucene/LuceneEndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/lucene-endpoint    |   2 +
 .../lumberjack/LumberjackEndpointUriAssembler.java |  35 ---
 .../lumberjack/LumberjackEndpointUriFactory.java   |  35 +++
 .../apache/camel/urifactory/lumberjack-endpoint    |   2 +
 .../component/mail/MailEndpointUriAssembler.java   |  41 ---
 .../component/mail/MailEndpointUriFactory.java     |  41 +++
 .../org/apache/camel/urifactory/imap-endpoint      |   2 +
 .../org/apache/camel/urifactory/imaps-endpoint     |   2 +
 .../org/apache/camel/urifactory/pop3-endpoint      |   2 +
 .../org/apache/camel/urifactory/pop3s-endpoint     |   2 +
 .../org/apache/camel/urifactory/smtp-endpoint      |   2 +
 .../org/apache/camel/urifactory/smtps-endpoint     |   2 +
 .../master/MasterEndpointUriAssembler.java         |  35 ---
 .../component/master/MasterEndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/master-endpoint    |   2 +
 .../metrics/MetricsEndpointUriAssembler.java       |  35 ---
 .../metrics/MetricsEndpointUriFactory.java         |  35 +++
 .../org/apache/camel/urifactory/metrics-endpoint   |   2 +
 .../micrometer/MicrometerEndpointUriAssembler.java |  36 ---
 .../micrometer/MicrometerEndpointUriFactory.java   |  36 +++
 .../apache/camel/urifactory/micrometer-endpoint    |   2 +
 .../MicroProfileMetricsEndpointUriAssembler.java   |  35 ---
 .../MicroProfileMetricsEndpointUriFactory.java     |  35 +++
 .../camel/urifactory/microprofile-metrics-endpoint |   2 +
 .../client/MiloClientEndpointUriAssembler.java     |  34 ---
 .../milo/client/MiloClientEndpointUriFactory.java  |  34 +++
 .../server/MiloServerEndpointUriAssembler.java     |  34 ---
 .../milo/server/MiloServerEndpointUriFactory.java  |  34 +++
 .../apache/camel/urifactory/milo-client-endpoint   |   2 +
 .../apache/camel/urifactory/milo-server-endpoint   |   2 +
 .../component/mina/MinaEndpointUriAssembler.java   |  36 ---
 .../component/mina/MinaEndpointUriFactory.java     |  36 +++
 .../org/apache/camel/urifactory/mina-endpoint      |   2 +
 .../component/minio/MinioEndpointUriAssembler.java |  34 ---
 .../component/minio/MinioEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/minio-endpoint     |   2 +
 .../component/mllp/MllpEndpointUriAssembler.java   |  35 ---
 .../component/mllp/MllpEndpointUriFactory.java     |  35 +++
 .../org/apache/camel/urifactory/mllp-endpoint      |   2 +
 .../component/mock/MockEndpointUriAssembler.java   |  34 ---
 .../component/mock/MockEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/mock-endpoint      |   2 +
 .../mongodb/gridfs/GridFsEndpointUriAssembler.java |  34 ---
 .../mongodb/gridfs/GridFsEndpointUriFactory.java   |  34 +++
 .../camel/urifactory/mongodb-gridfs-endpoint       |   2 +
 .../mongodb/MongoDbEndpointUriAssembler.java       |  34 ---
 .../mongodb/MongoDbEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/mongodb-endpoint   |   2 +
 .../validator/msv/MsvEndpointUriAssembler.java     |  34 ---
 .../validator/msv/MsvEndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/msv-endpoint       |   2 +
 .../mustache/MustacheEndpointUriAssembler.java     |  34 ---
 .../mustache/MustacheEndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/mustache-endpoint  |   2 +
 .../component/mvel/MvelEndpointUriAssembler.java   |  34 ---
 .../component/mvel/MvelEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/mvel-endpoint      |   2 +
 .../mybatis/MyBatisBeanEndpointUriAssembler.java   |  35 ---
 .../mybatis/MyBatisBeanEndpointUriFactory.java     |  35 +++
 .../mybatis/MyBatisEndpointUriAssembler.java       |  34 ---
 .../mybatis/MyBatisEndpointUriFactory.java         |  34 +++
 .../apache/camel/urifactory/mybatis-bean-endpoint  |   2 +
 .../org/apache/camel/urifactory/mybatis-endpoint   |   2 +
 .../nagios/NagiosEndpointUriAssembler.java         |  35 ---
 .../component/nagios/NagiosEndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/nagios-endpoint    |   2 +
 .../component/nats/NatsEndpointUriAssembler.java   |  34 ---
 .../component/nats/NatsEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/nats-endpoint      |   2 +
 .../netty/http/NettyHttpEndpointUriAssembler.java  |  37 ---
 .../netty/http/NettyHttpEndpointUriFactory.java    |  37 +++
 .../apache/camel/urifactory/netty-http-endpoint    |   2 +
 .../http/NettyHttpEndpointUriAssemblerTest.java    |   4 +-
 .../component/netty/NettyEndpointUriAssembler.java |  36 ---
 .../component/netty/NettyEndpointUriFactory.java   |  36 +++
 .../org/apache/camel/urifactory/netty-endpoint     |   2 +
 .../nitrite/NitriteEndpointUriAssembler.java       |  34 ---
 .../nitrite/NitriteEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/nitrite-endpoint   |   2 +
 .../component/nsq/NsqEndpointUriAssembler.java     |  34 ---
 .../camel/component/nsq/NsqEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/nsq-endpoint       |   2 +
 .../component/OAIPMHEndpointUriAssembler.java      |  34 ---
 .../oaipmh/component/OAIPMHEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/oaipmh-endpoint    |   2 +
 .../olingo2/Olingo2EndpointUriAssembler.java       |  35 ---
 .../olingo2/Olingo2EndpointUriFactory.java         |  35 +++
 .../org/apache/camel/urifactory/olingo2-endpoint   |   2 +
 .../olingo4/Olingo4EndpointUriAssembler.java       |  35 ---
 .../olingo4/Olingo4EndpointUriFactory.java         |  35 +++
 .../org/apache/camel/urifactory/olingo4-endpoint   |   2 +
 .../cinder/CinderEndpointUriAssembler.java         |  34 ---
 .../openstack/cinder/CinderEndpointUriFactory.java |  34 +++
 .../glance/GlanceEndpointUriAssembler.java         |  34 ---
 .../openstack/glance/GlanceEndpointUriFactory.java |  34 +++
 .../keystone/KeystoneEndpointUriAssembler.java     |  34 ---
 .../keystone/KeystoneEndpointUriFactory.java       |  34 +++
 .../neutron/NeutronEndpointUriAssembler.java       |  34 ---
 .../neutron/NeutronEndpointUriFactory.java         |  34 +++
 .../openstack/nova/NovaEndpointUriAssembler.java   |  34 ---
 .../openstack/nova/NovaEndpointUriFactory.java     |  34 +++
 .../openstack/swift/SwiftEndpointUriAssembler.java |  34 ---
 .../openstack/swift/SwiftEndpointUriFactory.java   |  34 +++
 .../camel/urifactory/openstack-cinder-endpoint     |   2 +
 .../camel/urifactory/openstack-glance-endpoint     |   2 +
 .../camel/urifactory/openstack-keystone-endpoint   |   2 +
 .../camel/urifactory/openstack-neutron-endpoint    |   2 +
 .../camel/urifactory/openstack-nova-endpoint       |   2 +
 .../camel/urifactory/openstack-swift-endpoint      |   2 +
 .../OptaPlannerEndpointUriAssembler.java           |  34 ---
 .../optaplanner/OptaPlannerEndpointUriFactory.java |  34 +++
 .../apache/camel/urifactory/optaplanner-endpoint   |   2 +
 .../component/paho/PahoEndpointUriAssembler.java   |  34 ---
 .../component/paho/PahoEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/paho-endpoint      |   2 +
 .../component/pdf/PdfEndpointUriAssembler.java     |  34 ---
 .../camel/component/pdf/PdfEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/pdf-endpoint       |   2 +
 .../PgReplicationSlotEndpointUriAssembler.java     |  38 ---
 .../slot/PgReplicationSlotEndpointUriFactory.java  |  38 +++
 .../camel/urifactory/pg-replication-slot-endpoint  |   2 +
 .../pgevent/PgEventEndpointUriAssembler.java       |  37 ---
 .../pgevent/PgEventEndpointUriFactory.java         |  37 +++
 .../org/apache/camel/urifactory/pgevent-endpoint   |   2 +
 .../http/PlatformHttpEndpointUriAssembler.java     |  34 ---
 .../http/PlatformHttpEndpointUriFactory.java       |  34 +++
 .../apache/camel/urifactory/platform-http-endpoint |   2 +
 .../printer/PrinterEndpointUriAssembler.java       |  36 ---
 .../printer/PrinterEndpointUriFactory.java         |  36 +++
 .../org/apache/camel/urifactory/lpr-endpoint       |   2 +
 .../pubnub/PubNubEndpointUriAssembler.java         |  34 ---
 .../component/pubnub/PubNubEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/pubnub-endpoint    |   2 +
 .../pulsar/PulsarEndpointUriAssembler.java         |  37 ---
 .../component/pulsar/PulsarEndpointUriFactory.java |  37 +++
 .../org/apache/camel/urifactory/pulsar-endpoint    |   2 +
 .../quartz/QuartzEndpointUriAssembler.java         |  35 ---
 .../component/quartz/QuartzEndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/quartz-endpoint    |   2 +
 .../quickfixj/QuickfixjEndpointUriAssembler.java   |  34 ---
 .../quickfixj/QuickfixjEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/quickfix-endpoint  |   2 +
 .../rabbitmq/RabbitMQEndpointUriAssembler.java     |  34 ---
 .../rabbitmq/RabbitMQEndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/rabbitmq-endpoint  |   2 +
 .../ReactiveStreamsEndpointUriAssembler.java       |  34 ---
 .../streams/ReactiveStreamsEndpointUriFactory.java |  34 +++
 .../camel/urifactory/reactive-streams-endpoint     |   2 +
 .../component/ref/RefEndpointUriAssembler.java     |  34 ---
 .../camel/component/ref/RefEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/ref-endpoint       |   2 +
 .../openapi/RestOpenApiEndpointUriAssembler.java   |  35 ---
 .../openapi/RestOpenApiEndpointUriFactory.java     |  35 +++
 .../apache/camel/urifactory/rest-openapi-endpoint  |   2 +
 .../swagger/RestSwaggerEndpointUriAssembler.java   |  35 ---
 .../swagger/RestSwaggerEndpointUriFactory.java     |  35 +++
 .../apache/camel/urifactory/rest-swagger-endpoint  |   2 +
 .../rest/RestApiEndpointUriAssembler.java          |  35 ---
 .../component/rest/RestApiEndpointUriFactory.java  |  35 +++
 .../component/rest/RestEndpointUriAssembler.java   |  36 ---
 .../component/rest/RestEndpointUriFactory.java     |  36 +++
 .../org/apache/camel/urifactory/rest-api-endpoint  |   2 +
 .../org/apache/camel/urifactory/rest-endpoint      |   2 +
 .../resteasy/ResteasyEndpointUriAssembler.java     |  34 ---
 .../resteasy/ResteasyEndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/resteasy-endpoint  |   2 +
 .../RobotFrameworkEndpointUriAssembler.java        |  34 ---
 .../RobotFrameworkEndpointUriFactory.java          |  34 +++
 .../camel/urifactory/robotframework-endpoint       |   2 +
 .../component/rss/RssEndpointUriAssembler.java     |  34 ---
 .../camel/component/rss/RssEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/rss-endpoint       |   2 +
 .../component/saga/SagaEndpointUriAssembler.java   |  34 ---
 .../component/saga/SagaEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/saga-endpoint      |   2 +
 .../salesforce/SalesforceEndpointUriAssembler.java |  35 ---
 .../salesforce/SalesforceEndpointUriFactory.java   |  35 +++
 .../apache/camel/urifactory/salesforce-endpoint    |   2 +
 .../netweaver/NetWeaverEndpointUriAssembler.java   |  34 ---
 .../sap/netweaver/NetWeaverEndpointUriFactory.java |  34 +++
 .../apache/camel/urifactory/sap-netweaver-endpoint |   2 +
 .../xquery/XQueryEndpointUriAssembler.java         |  34 ---
 .../component/xquery/XQueryEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/xquery-endpoint    |   2 +
 .../scheduler/SchedulerEndpointUriAssembler.java   |  34 ---
 .../scheduler/SchedulerEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/scheduler-endpoint |   2 +
 .../schematron/SchematronEndpointUriAssembler.java |  34 ---
 .../schematron/SchematronEndpointUriFactory.java   |  34 +++
 .../apache/camel/urifactory/schematron-endpoint    |   2 +
 .../component/seda/SedaEndpointUriAssembler.java   |  34 ---
 .../component/seda/SedaEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/seda-endpoint      |   2 +
 .../service/ServiceEndpointUriAssembler.java       |  34 ---
 .../service/ServiceEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/service-endpoint   |   2 +
 .../servicenow/ServiceNowEndpointUriAssembler.java |  34 ---
 .../servicenow/ServiceNowEndpointUriFactory.java   |  34 +++
 .../apache/camel/urifactory/servicenow-endpoint    |   2 +
 .../servlet/ServletEndpointUriAssembler.java       |  34 ---
 .../servlet/ServletEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/servlet-endpoint   |   2 +
 .../component/sip/SipEndpointUriAssembler.java     |  40 ---
 .../camel/component/sip/SipEndpointUriFactory.java |  40 +++
 .../org/apache/camel/urifactory/sip-endpoint       |   2 +
 .../org/apache/camel/urifactory/sips-endpoint      |   2 +
 .../component/sjms/SjmsEndpointUriAssembler.java   |  35 ---
 .../component/sjms/SjmsEndpointUriFactory.java     |  35 +++
 .../sjms/batch/SjmsBatchEndpointUriAssembler.java  |  34 ---
 .../sjms/batch/SjmsBatchEndpointUriFactory.java    |  34 +++
 .../apache/camel/urifactory/sjms-batch-endpoint    |   2 +
 .../org/apache/camel/urifactory/sjms-endpoint      |   2 +
 .../component/sjms2/Sjms2EndpointUriAssembler.java |  35 ---
 .../component/sjms2/Sjms2EndpointUriFactory.java   |  35 +++
 .../org/apache/camel/urifactory/sjms2-endpoint     |   2 +
 .../component/slack/SlackEndpointUriAssembler.java |  34 ---
 .../component/slack/SlackEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/slack-endpoint     |   2 +
 .../component/smpp/SmppEndpointUriAssembler.java   |  41 ---
 .../component/smpp/SmppEndpointUriFactory.java     |  41 +++
 .../org/apache/camel/urifactory/smpp-endpoint      |   2 +
 .../org/apache/camel/urifactory/smpps-endpoint     |   2 +
 .../component/snmp/SnmpEndpointUriAssembler.java   |  35 ---
 .../component/snmp/SnmpEndpointUriFactory.java     |  35 +++
 .../org/apache/camel/urifactory/snmp-endpoint      |   2 +
 .../component/solr/SolrEndpointUriAssembler.java   |  40 ---
 .../component/solr/SolrEndpointUriFactory.java     |  40 +++
 .../org/apache/camel/urifactory/solr-endpoint      |   2 +
 .../org/apache/camel/urifactory/solrCloud-endpoint |   2 +
 .../org/apache/camel/urifactory/solrs-endpoint     |   2 +
 .../component/SoroushBotEndpointUriAssembler.java  |  34 ---
 .../component/SoroushBotEndpointUriFactory.java    |  34 +++
 .../org/apache/camel/urifactory/soroush-endpoint   |   2 +
 .../component/spark/SparkEndpointUriAssembler.java |  34 ---
 .../component/spark/SparkEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/spark-endpoint     |   2 +
 .../splunkhec/SplunkHECEndpointUriAssembler.java   |  35 ---
 .../splunkhec/SplunkHECEndpointUriFactory.java     |  35 +++
 .../apache/camel/urifactory/splunk-hec-endpoint    |   2 +
 .../splunk/SplunkEndpointUriAssembler.java         |  34 ---
 .../component/splunk/SplunkEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/splunk-endpoint    |   2 +
 .../batch/SpringBatchEndpointUriAssembler.java     |  34 ---
 .../batch/SpringBatchEndpointUriFactory.java       |  34 +++
 .../apache/camel/urifactory/spring-batch-endpoint  |   2 +
 .../SpringIntegrationEndpointUriAssembler.java     |  34 ---
 .../SpringIntegrationEndpointUriFactory.java       |  34 +++
 .../camel/urifactory/spring-integration-endpoint   |   2 +
 .../springldap/SpringLdapEndpointUriAssembler.java |  34 ---
 .../springldap/SpringLdapEndpointUriFactory.java   |  34 +++
 .../apache/camel/urifactory/spring-ldap-endpoint   |   2 +
 .../component/redis/RedisEndpointUriAssembler.java |  35 ---
 .../component/redis/RedisEndpointUriFactory.java   |  35 +++
 .../apache/camel/urifactory/spring-redis-endpoint  |   2 +
 .../ws/SpringWebserviceEndpointUriAssembler.java   |  37 ---
 .../ws/SpringWebserviceEndpointUriFactory.java     |  37 +++
 .../org/apache/camel/urifactory/spring-ws-endpoint |   2 +
 .../component/event/EventEndpointUriAssembler.java |  34 ---
 .../component/event/EventEndpointUriFactory.java   |  34 +++
 .../apache/camel/urifactory/spring-event-endpoint  |   2 +
 .../component/sql/SqlEndpointUriAssembler.java     |  34 ---
 .../camel/component/sql/SqlEndpointUriFactory.java |  34 +++
 .../sql/stored/SqlStoredEndpointUriAssembler.java  |  34 ---
 .../sql/stored/SqlStoredEndpointUriFactory.java    |  34 +++
 .../org/apache/camel/urifactory/sql-endpoint       |   2 +
 .../apache/camel/urifactory/sql-stored-endpoint    |   2 +
 .../component/ssh/SshEndpointUriAssembler.java     |  35 ---
 .../camel/component/ssh/SshEndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/ssh-endpoint       |   2 +
 .../component/stax/StAXEndpointUriAssembler.java   |  34 ---
 .../component/stax/StAXEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/stax-endpoint      |   2 +
 .../component/stomp/StompEndpointUriAssembler.java |  34 ---
 .../component/stomp/StompEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/stomp-endpoint     |   2 +
 .../stream/StreamEndpointUriAssembler.java         |  34 ---
 .../component/stream/StreamEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/stream-endpoint    |   2 +
 .../StringTemplateEndpointUriAssembler.java        |  34 ---
 .../StringTemplateEndpointUriFactory.java          |  34 +++
 .../camel/urifactory/string-template-endpoint      |   2 +
 .../component/stub/StubEndpointUriAssembler.java   |  34 ---
 .../component/stub/StubEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/stub-endpoint      |   2 +
 .../telegram/TelegramEndpointUriAssembler.java     |  34 ---
 .../telegram/TelegramEndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/telegram-endpoint  |   2 +
 .../thrift/ThriftEndpointUriAssembler.java         |  36 ---
 .../component/thrift/ThriftEndpointUriFactory.java |  36 +++
 .../org/apache/camel/urifactory/thrift-endpoint    |   2 +
 .../component/tika/TikaEndpointUriAssembler.java   |  34 ---
 .../component/tika/TikaEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/tika-endpoint      |   2 +
 .../component/timer/TimerEndpointUriAssembler.java |  34 ---
 .../component/timer/TimerEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/timer-endpoint     |   2 +
 .../twilio/TwilioEndpointUriAssembler.java         |  35 ---
 .../component/twilio/TwilioEndpointUriFactory.java |  35 +++
 .../org/apache/camel/urifactory/twilio-endpoint    |   2 +
 .../TwitterDirectMessageEndpointUriAssembler.java  |  34 ---
 .../TwitterDirectMessageEndpointUriFactory.java    |  34 +++
 .../search/TwitterSearchEndpointUriAssembler.java  |  34 ---
 .../search/TwitterSearchEndpointUriFactory.java    |  34 +++
 .../TwitterTimelineEndpointUriAssembler.java       |  34 ---
 .../TwitterTimelineEndpointUriFactory.java         |  34 +++
 .../urifactory/twitter-directmessage-endpoint      |   2 +
 .../camel/urifactory/twitter-search-endpoint       |   2 +
 .../camel/urifactory/twitter-timeline-endpoint     |   2 +
 .../undertow/UndertowEndpointUriAssembler.java     |  34 ---
 .../undertow/UndertowEndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/undertow-endpoint  |   2 +
 .../validator/ValidatorEndpointUriAssembler.java   |  34 ---
 .../validator/ValidatorEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/validator-endpoint |   2 +
 .../velocity/VelocityEndpointUriAssembler.java     |  34 ---
 .../velocity/VelocityEndpointUriFactory.java       |  34 +++
 .../org/apache/camel/urifactory/velocity-endpoint  |   2 +
 .../vertx/http/VertxHttpEndpointUriAssembler.java  |  34 ---
 .../vertx/http/VertxHttpEndpointUriFactory.java    |  34 +++
 .../apache/camel/urifactory/vertx-http-endpoint    |   2 +
 .../VertxWebsocketEndpointUriAssembler.java        |  36 ---
 .../VertxWebsocketEndpointUriFactory.java          |  36 +++
 .../camel/urifactory/vertx-websocket-endpoint      |   2 +
 .../component/vertx/VertxEndpointUriAssembler.java |  34 ---
 .../component/vertx/VertxEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/vertx-endpoint     |   2 +
 .../camel/component/vm/VmEndpointUriAssembler.java |  34 ---
 .../camel/component/vm/VmEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/vm-endpoint        |   2 +
 .../weather/WeatherEndpointUriAssembler.java       |  34 ---
 .../weather/WeatherEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/weather-endpoint   |   2 +
 .../component/web3j/Web3jEndpointUriAssembler.java |  34 ---
 .../component/web3j/Web3jEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/web3j-endpoint     |   2 +
 .../webhook/WebhookEndpointUriAssembler.java       |  34 ---
 .../webhook/WebhookEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/webhook-endpoint   |   2 +
 .../JSR356WebSocketEndpointUriAssembler.java       |  34 ---
 .../jsr356/JSR356WebSocketEndpointUriFactory.java  |  34 +++
 .../camel/urifactory/websocket-jsr356-endpoint     |   2 +
 .../websocket/WebsocketEndpointUriAssembler.java   |  36 ---
 .../websocket/WebsocketEndpointUriFactory.java     |  36 +++
 .../org/apache/camel/urifactory/websocket-endpoint |   2 +
 .../component/weka/WekaEndpointUriAssembler.java   |  34 ---
 .../component/weka/WekaEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/weka-endpoint      |   2 +
 .../wordpress/WordpressEndpointUriAssembler.java   |  35 ---
 .../wordpress/WordpressEndpointUriFactory.java     |  35 +++
 .../org/apache/camel/urifactory/wordpress-endpoint |   2 +
 .../workday/WorkdayEndpointUriAssembler.java       |  35 ---
 .../workday/WorkdayEndpointUriFactory.java         |  35 +++
 .../org/apache/camel/urifactory/workday-endpoint   |   2 +
 .../xchange/XChangeEndpointUriAssembler.java       |  34 ---
 .../xchange/XChangeEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/xchange-endpoint   |   2 +
 .../camel/component/xj/XJEndpointUriAssembler.java |  34 ---
 .../camel/component/xj/XJEndpointUriFactory.java   |  34 +++
 .../org/apache/camel/urifactory/xj-endpoint        |   2 +
 .../xmlsecurity/XmlSignerEndpointUriAssembler.java |  34 ---
 .../xmlsecurity/XmlSignerEndpointUriFactory.java   |  34 +++
 .../XmlVerifierEndpointUriAssembler.java           |  34 ---
 .../xmlsecurity/XmlVerifierEndpointUriFactory.java |  34 +++
 .../camel/urifactory/xmlsecurity-sign-endpoint     |   2 +
 .../camel/urifactory/xmlsecurity-verify-endpoint   |   2 +
 .../component/xmpp/XmppEndpointUriAssembler.java   |  36 ---
 .../component/xmpp/XmppEndpointUriFactory.java     |  36 +++
 .../org/apache/camel/urifactory/xmpp-endpoint      |   2 +
 .../xslt/saxon/XsltSaxonEndpointUriAssembler.java  |  34 ---
 .../xslt/saxon/XsltSaxonEndpointUriFactory.java    |  34 +++
 .../apache/camel/urifactory/xslt-saxon-endpoint    |   2 +
 .../component/xslt/XsltEndpointUriAssembler.java   |  34 ---
 .../component/xslt/XsltEndpointUriFactory.java     |  34 +++
 .../org/apache/camel/urifactory/xslt-endpoint      |   2 +
 .../yammer/YammerEndpointUriAssembler.java         |  34 ---
 .../component/yammer/YammerEndpointUriFactory.java |  34 +++
 .../org/apache/camel/urifactory/yammer-endpoint    |   2 +
 .../zendesk/ZendeskEndpointUriAssembler.java       |  34 ---
 .../zendesk/ZendeskEndpointUriFactory.java         |  34 +++
 .../org/apache/camel/urifactory/zendesk-endpoint   |   2 +
 .../MasterEndpointUriAssembler.java                |  35 ---
 .../zookeepermaster/MasterEndpointUriFactory.java  |  35 +++
 .../camel/urifactory/zookeeper-master-endpoint     |   2 +
 .../zookeeper/ZooKeeperEndpointUriAssembler.java   |  35 ---
 .../zookeeper/ZooKeeperEndpointUriFactory.java     |  35 +++
 .../org/apache/camel/urifactory/zookeeper-endpoint |   2 +
 .../org/apache/camel/ExtendedCamelContext.java     |  16 +-
 .../apache/camel/catalog/RuntimeCamelCatalog.java  |   3 +-
 .../org/apache/camel/spi/AssemblerResolver.java    |  34 ---
 .../org/apache/camel/spi/EndpointUriAssembler.java |  43 ---
 .../org/apache/camel/spi/EndpointUriFactory.java   |  45 ++++
 .../org/apache/camel/spi/UriFactoryResolver.java   |  34 +++
 .../camel/impl/engine/AbstractCamelContext.java    |  28 +-
 .../impl/engine/DefaultAssemblerResolver.java      | 128 ---------
 .../impl/engine/DefaultUriFactoryResolver.java     | 128 +++++++++
 .../camel/impl/engine/SimpleCamelContext.java      |   6 +-
 .../camel/impl/ExtendedCamelContextConfigurer.java |  10 +-
 .../camel/impl/lw/LightweightCamelContext.java     |  16 +-
 .../impl/lw/LightweightRuntimeCamelContext.java    |  10 +-
 .../catalog/CustomEndpointUriAssemblerTest.java    | 289 ---------------------
 .../catalog/CustomEndpointUriFactoryTest.java      | 289 +++++++++++++++++++++
 ...untimeCamelCatalogEndpointUriAssemblerTest.java |   4 +-
 .../component/log/LogEndpointUriAssemblerTest.java |   4 +-
 .../component/EndpointUriAssemblerSupport.java     |  93 -------
 .../component/EndpointUriFactorySupport.java       |  94 +++++++
 .../packaging/EndpointUriAssemblerGenerator.java   | 122 ---------
 .../packaging/EndpointUriFactoryGenerator.java     | 122 +++++++++
 .../maven/packaging/GenerateComponentMojo.java     |   4 +-
 .../packaging/GenerateEndpointUriFactoryMojo.java  | 232 +++++++++++++++++
 .../apache/camel/maven/packaging/GenerateMojo.java |   4 +-
 .../GenerateUriEndpointAssemblerMojo.java          | 232 -----------------
 1059 files changed, 13367 insertions(+), 12645 deletions(-)

diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java
deleted file mode 100644
index f4af9dd..0000000
--- a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.activemq;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class ActiveMQEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":destinationType:destinationName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "activemq".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
-        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriFactory.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriFactory.java
new file mode 100644
index 0000000..9692268
--- /dev/null
+++ b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.activemq;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ActiveMQEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":destinationType:destinationName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "activemq".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
+        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/activemq-endpoint b/components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/activemq-endpoint
new file mode 100644
index 0000000..1b3694f
--- /dev/null
+++ b/components/camel-activemq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/activemq-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.activemq.ActiveMQEndpointUriFactory
diff --git a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java
deleted file mode 100644
index 59c22d1..0000000
--- a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriAssembler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.ahc.ws;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class WsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":httpUri";
-    private static final String[] SCHEMES = new String[]{"ahc-ws", "ahc-wss"};
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        for (String s : SCHEMES) {
-            if (s.equals(scheme)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriFactory.java b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriFactory.java
new file mode 100644
index 0000000..befd545
--- /dev/null
+++ b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointUriFactory.java
@@ -0,0 +1,40 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.ahc.ws;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class WsEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":httpUri";
+    private static final String[] SCHEMES = new String[]{"ahc-ws", "ahc-wss"};
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        for (String s : SCHEMES) {
+            if (s.equals(scheme)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ahc-ws-endpoint b/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ahc-ws-endpoint
new file mode 100644
index 0000000..54a3a6a
--- /dev/null
+++ b/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ahc-ws-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ahc.ws.WsEndpointUriFactory
diff --git a/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ahc-wss-endpoint b/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ahc-wss-endpoint
new file mode 100644
index 0000000..54a3a6a
--- /dev/null
+++ b/components/camel-ahc-ws/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ahc-wss-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ahc.ws.WsEndpointUriFactory
diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
deleted file mode 100644
index e259d0e..0000000
--- a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.ahc;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AhcEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":httpUri";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "ahc".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriFactory.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriFactory.java
new file mode 100644
index 0000000..d979949
--- /dev/null
+++ b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.ahc;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AhcEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":httpUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "ahc".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-ahc/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ahc-endpoint b/components/camel-ahc/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ahc-endpoint
new file mode 100644
index 0000000..e3e9a2c
--- /dev/null
+++ b/components/camel-ahc/src/generated/resources/META-INF/services/org/apache/camel/urifactory/ahc-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.ahc.AhcEndpointUriFactory
diff --git a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java
deleted file mode 100644
index 5fb9cef..0000000
--- a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.amqp;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AMQPEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":destinationType:destinationName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "amqp".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
-        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriFactory.java b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriFactory.java
new file mode 100644
index 0000000..74e2b26
--- /dev/null
+++ b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.amqp;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AMQPEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":destinationType:destinationName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "amqp".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "destinationType", "queue", false, copy);
+        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/urifactory/amqp-endpoint b/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/urifactory/amqp-endpoint
new file mode 100644
index 0000000..dc6de15
--- /dev/null
+++ b/components/camel-amqp/src/generated/resources/META-INF/services/org/apache/camel/urifactory/amqp-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.amqp.AMQPEndpointUriFactory
diff --git a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java
deleted file mode 100644
index bbba4aa..0000000
--- a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.apns;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class ApnsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "apns".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriFactory.java b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriFactory.java
new file mode 100644
index 0000000..48cf366
--- /dev/null
+++ b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.apns;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ApnsEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "apns".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-apns/src/generated/resources/META-INF/services/org/apache/camel/urifactory/apns-endpoint b/components/camel-apns/src/generated/resources/META-INF/services/org/apache/camel/urifactory/apns-endpoint
new file mode 100644
index 0000000..25e689c
--- /dev/null
+++ b/components/camel-apns/src/generated/resources/META-INF/services/org/apache/camel/urifactory/apns-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.apns.ApnsEndpointUriFactory
diff --git a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java
deleted file mode 100644
index aa02bdc..0000000
--- a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.arangodb;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class ArangoDbEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":database";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "arangodb".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "database", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriFactory.java b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriFactory.java
new file mode 100644
index 0000000..6c1495a
--- /dev/null
+++ b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.arangodb;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ArangoDbEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":database";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "arangodb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "database", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/arangodb-endpoint b/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/arangodb-endpoint
new file mode 100644
index 0000000..b5c4d64
--- /dev/null
+++ b/components/camel-arangodb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/arangodb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.arangodb.ArangoDbEndpointUriFactory
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java
deleted file mode 100644
index 976026a..0000000
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.as2;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AS2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":apiName/methodName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "as2".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriFactory.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriFactory.java
new file mode 100644
index 0000000..1fa8469
--- /dev/null
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.as2;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AS2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":apiName/methodName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "as2".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-as2/camel-as2-component/src/generated/resources/META-INF/services/org/apache/camel/urifactory/as2-endpoint b/components/camel-as2/camel-as2-component/src/generated/resources/META-INF/services/org/apache/camel/urifactory/as2-endpoint
new file mode 100644
index 0000000..d474ce3
--- /dev/null
+++ b/components/camel-as2/camel-as2-component/src/generated/resources/META-INF/services/org/apache/camel/urifactory/as2-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.as2.AS2EndpointUriFactory
diff --git a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java
deleted file mode 100644
index 3b0f7f4..0000000
--- a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.asterisk;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AsteriskEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "asterisk".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriFactory.java b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriFactory.java
new file mode 100644
index 0000000..d16d4de
--- /dev/null
+++ b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.asterisk;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AsteriskEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "asterisk".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-asterisk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/asterisk-endpoint b/components/camel-asterisk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/asterisk-endpoint
new file mode 100644
index 0000000..da26b02
--- /dev/null
+++ b/components/camel-asterisk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/asterisk-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.asterisk.AsteriskEndpointUriFactory
diff --git a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java
deleted file mode 100644
index 8639147..0000000
--- a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.atmos;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AtmosEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name/operation";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "atmos".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, false, copy);
-        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriFactory.java b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriFactory.java
new file mode 100644
index 0000000..76341e2
--- /dev/null
+++ b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atmos;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtmosEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name/operation";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atmos".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atmos/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atmos-endpoint b/components/camel-atmos/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atmos-endpoint
new file mode 100644
index 0000000..dcfdcc5
--- /dev/null
+++ b/components/camel-atmos/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atmos-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atmos.AtmosEndpointUriFactory
diff --git a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java
deleted file mode 100644
index a27f171..0000000
--- a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.atmosphere.websocket;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class WebsocketEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":servicePath";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "atmosphere-websocket".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "servicePath", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriFactory.java b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriFactory.java
new file mode 100644
index 0000000..79a0095
--- /dev/null
+++ b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atmosphere.websocket;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class WebsocketEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":servicePath";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atmosphere-websocket".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "servicePath", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atmosphere-websocket/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atmosphere-websocket-endpoint b/components/camel-atmosphere-websocket/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atmosphere-websocket-endpoint
new file mode 100644
index 0000000..088fd31
--- /dev/null
+++ b/components/camel-atmosphere-websocket/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atmosphere-websocket-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atmosphere.websocket.WebsocketEndpointUriFactory
diff --git a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java
deleted file mode 100644
index bf8073f..0000000
--- a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.atom;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AtomEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":feedUri";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "atom".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "feedUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriFactory.java b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriFactory.java
new file mode 100644
index 0000000..3eee085
--- /dev/null
+++ b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atom;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":feedUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atom".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "feedUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atom/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atom-endpoint b/components/camel-atom/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atom-endpoint
new file mode 100644
index 0000000..51271d4
--- /dev/null
+++ b/components/camel-atom/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atom-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atom.AtomEndpointUriFactory
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java
deleted file mode 100644
index ba8db28..0000000
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.atomix.client.map;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AtomixMapEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":resourceName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "atomix-map".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriFactory.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriFactory.java
new file mode 100644
index 0000000..7a22908
--- /dev/null
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atomix.client.map;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomixMapEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":resourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atomix-map".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java
deleted file mode 100644
index de5438a..0000000
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.atomix.client.messaging;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AtomixMessagingEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":resourceName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "atomix-messaging".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriFactory.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriFactory.java
new file mode 100644
index 0000000..d291683
--- /dev/null
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atomix.client.messaging;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomixMessagingEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":resourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atomix-messaging".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java
deleted file mode 100644
index 231d8a1..0000000
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.atomix.client.multimap;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AtomixMultiMapEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":resourceName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "atomix-multimap".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriFactory.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriFactory.java
new file mode 100644
index 0000000..d530c2b
--- /dev/null
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atomix.client.multimap;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomixMultiMapEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":resourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atomix-multimap".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java
deleted file mode 100644
index 20adcd9..0000000
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.atomix.client.queue;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AtomixQueueEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":resourceName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "atomix-queue".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriFactory.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriFactory.java
new file mode 100644
index 0000000..16c9263
--- /dev/null
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atomix.client.queue;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomixQueueEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":resourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atomix-queue".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java
deleted file mode 100644
index 98a92e3..0000000
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.atomix.client.set;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AtomixSetEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":resourceName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "atomix-set".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriFactory.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriFactory.java
new file mode 100644
index 0000000..d0fe18e
--- /dev/null
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atomix.client.set;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomixSetEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":resourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atomix-set".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java
deleted file mode 100644
index 415d18e..0000000
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.atomix.client.value;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AtomixValueEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":resourceName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "atomix-value".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriFactory.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriFactory.java
new file mode 100644
index 0000000..744f15c
--- /dev/null
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.atomix.client.value;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AtomixValueEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":resourceName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "atomix-value".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-map-endpoint b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-map-endpoint
new file mode 100644
index 0000000..13c6ee7
--- /dev/null
+++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-map-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atomix.client.map.AtomixMapEndpointUriFactory
diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-messaging-endpoint b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-messaging-endpoint
new file mode 100644
index 0000000..52ed961
--- /dev/null
+++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-messaging-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atomix.client.messaging.AtomixMessagingEndpointUriFactory
diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-multimap-endpoint b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-multimap-endpoint
new file mode 100644
index 0000000..eb90da8
--- /dev/null
+++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-multimap-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atomix.client.multimap.AtomixMultiMapEndpointUriFactory
diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-queue-endpoint b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-queue-endpoint
new file mode 100644
index 0000000..d0544a3
--- /dev/null
+++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-queue-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atomix.client.queue.AtomixQueueEndpointUriFactory
diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-set-endpoint b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-set-endpoint
new file mode 100644
index 0000000..53e021e
--- /dev/null
+++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-set-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atomix.client.set.AtomixSetEndpointUriFactory
diff --git a/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-value-endpoint b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-value-endpoint
new file mode 100644
index 0000000..2f987c6
--- /dev/null
+++ b/components/camel-atomix/src/generated/resources/META-INF/services/org/apache/camel/urifactory/atomix-value-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.atomix.client.value.AtomixValueEndpointUriFactory
diff --git a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java
deleted file mode 100644
index b48b4bb..0000000
--- a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriAssembler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.avro;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AvroEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":transport:host:port/messageName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "avro".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "transport", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "messageName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriFactory.java b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriFactory.java
new file mode 100644
index 0000000..f214efd
--- /dev/null
+++ b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointUriFactory.java
@@ -0,0 +1,37 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.avro;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AvroEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":transport:host:port/messageName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "avro".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "transport", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "messageName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-avro-rpc/src/generated/resources/META-INF/services/org/apache/camel/urifactory/avro-endpoint b/components/camel-avro-rpc/src/generated/resources/META-INF/services/org/apache/camel/urifactory/avro-endpoint
new file mode 100644
index 0000000..5dc86e5
--- /dev/null
+++ b/components/camel-avro-rpc/src/generated/resources/META-INF/services/org/apache/camel/urifactory/avro-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.avro.AvroEndpointUriFactory
diff --git a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java
deleted file mode 100644
index 1ad8bc5..0000000
--- a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.cw;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CwEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":namespace";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-cw".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriFactory.java b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriFactory.java
new file mode 100644
index 0000000..bc7b483
--- /dev/null
+++ b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.cw;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CwEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":namespace";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-cw".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-cw/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-cw-endpoint b/components/camel-aws-cw/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-cw-endpoint
new file mode 100644
index 0000000..1419747
--- /dev/null
+++ b/components/camel-aws-cw/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-cw-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.cw.CwEndpointUriFactory
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java
deleted file mode 100644
index 7baa28f..0000000
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.ddb;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class DdbEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":tableName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-ddb".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriFactory.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriFactory.java
new file mode 100644
index 0000000..0a0971a
--- /dev/null
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.ddb;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DdbEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":tableName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-ddb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java
deleted file mode 100644
index 6901a96..0000000
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.ddbstream;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class DdbStreamEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":tableName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-ddbstream".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriFactory.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriFactory.java
new file mode 100644
index 0000000..430a935
--- /dev/null
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.ddbstream;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DdbStreamEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":tableName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-ddbstream".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-ddb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ddb-endpoint b/components/camel-aws-ddb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ddb-endpoint
new file mode 100644
index 0000000..b399213
--- /dev/null
+++ b/components/camel-aws-ddb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ddb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.ddb.DdbEndpointUriFactory
diff --git a/components/camel-aws-ddb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ddbstream-endpoint b/components/camel-aws-ddb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ddbstream-endpoint
new file mode 100644
index 0000000..8390606
--- /dev/null
+++ b/components/camel-aws-ddb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ddbstream-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.ddbstream.DdbStreamEndpointUriFactory
diff --git a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java
deleted file mode 100644
index 5b4327b..0000000
--- a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.ec2;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class EC2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-ec2".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriFactory.java b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriFactory.java
new file mode 100644
index 0000000..6c552d6
--- /dev/null
+++ b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.ec2;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EC2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-ec2".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-ec2/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ec2-endpoint b/components/camel-aws-ec2/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ec2-endpoint
new file mode 100644
index 0000000..e4218d6
--- /dev/null
+++ b/components/camel-aws-ec2/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ec2-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.ec2.EC2EndpointUriFactory
diff --git a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java
deleted file mode 100644
index e3ceb37..0000000
--- a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.ecs;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class ECSEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-ecs".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriFactory.java b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriFactory.java
new file mode 100644
index 0000000..1500747
--- /dev/null
+++ b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.ecs;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ECSEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-ecs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-ecs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ecs-endpoint b/components/camel-aws-ecs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ecs-endpoint
new file mode 100644
index 0000000..836bcbd
--- /dev/null
+++ b/components/camel-aws-ecs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ecs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.ecs.ECSEndpointUriFactory
diff --git a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java
deleted file mode 100644
index ffefd0e..0000000
--- a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.eks;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class EKSEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-eks".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriFactory.java b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriFactory.java
new file mode 100644
index 0000000..665dfe6
--- /dev/null
+++ b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.eks;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EKSEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-eks".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-eks/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-eks-endpoint b/components/camel-aws-eks/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-eks-endpoint
new file mode 100644
index 0000000..9c370c9
--- /dev/null
+++ b/components/camel-aws-eks/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-eks-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.eks.EKSEndpointUriFactory
diff --git a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java
deleted file mode 100644
index 1ec46c5..0000000
--- a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.iam;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class IAMEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-iam".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriFactory.java b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriFactory.java
new file mode 100644
index 0000000..6783ee7
--- /dev/null
+++ b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.iam;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class IAMEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-iam".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-iam/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-iam-endpoint b/components/camel-aws-iam/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-iam-endpoint
new file mode 100644
index 0000000..d5cea95
--- /dev/null
+++ b/components/camel-aws-iam/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-iam-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.iam.IAMEndpointUriFactory
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java
deleted file mode 100644
index f6d681d..0000000
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.firehose;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class KinesisFirehoseEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":streamName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-kinesis-firehose".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriFactory.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriFactory.java
new file mode 100644
index 0000000..3f1ee0b
--- /dev/null
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.firehose;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KinesisFirehoseEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":streamName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-kinesis-firehose".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java
deleted file mode 100644
index da4468a..0000000
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.kinesis;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class KinesisEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":streamName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-kinesis".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriFactory.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriFactory.java
new file mode 100644
index 0000000..0c07ff1
--- /dev/null
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.kinesis;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KinesisEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":streamName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-kinesis".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-kinesis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-kinesis-endpoint b/components/camel-aws-kinesis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-kinesis-endpoint
new file mode 100644
index 0000000..a24a58c
--- /dev/null
+++ b/components/camel-aws-kinesis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-kinesis-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.kinesis.KinesisEndpointUriFactory
diff --git a/components/camel-aws-kinesis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-kinesis-firehose-endpoint b/components/camel-aws-kinesis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-kinesis-firehose-endpoint
new file mode 100644
index 0000000..3574331
--- /dev/null
+++ b/components/camel-aws-kinesis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-kinesis-firehose-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.firehose.KinesisFirehoseEndpointUriFactory
diff --git a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java
deleted file mode 100644
index e9d39a1..0000000
--- a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.kms;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class KMSEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-kms".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriFactory.java b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriFactory.java
new file mode 100644
index 0000000..a90aff0
--- /dev/null
+++ b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.kms;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KMSEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-kms".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-kms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-kms-endpoint b/components/camel-aws-kms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-kms-endpoint
new file mode 100644
index 0000000..a8def84
--- /dev/null
+++ b/components/camel-aws-kms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-kms-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.kms.KMSEndpointUriFactory
diff --git a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java
deleted file mode 100644
index 18c219f..0000000
--- a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.lambda;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class LambdaEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":function";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-lambda".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "function", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriFactory.java b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriFactory.java
new file mode 100644
index 0000000..00c29e0
--- /dev/null
+++ b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.lambda;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class LambdaEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":function";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-lambda".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "function", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-lambda/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-lambda-endpoint b/components/camel-aws-lambda/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-lambda-endpoint
new file mode 100644
index 0000000..a960e40
--- /dev/null
+++ b/components/camel-aws-lambda/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-lambda-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.lambda.LambdaEndpointUriFactory
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java
deleted file mode 100644
index 537c8fe..0000000
--- a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.mq;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class MQEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-mq".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriFactory.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriFactory.java
new file mode 100644
index 0000000..71b0c36
--- /dev/null
+++ b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.mq;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class MQEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-mq".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-mq-endpoint b/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-mq-endpoint
new file mode 100644
index 0000000..2ca60ea
--- /dev/null
+++ b/components/camel-aws-mq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-mq-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.mq.MQEndpointUriFactory
diff --git a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java
deleted file mode 100644
index 5c721ae..0000000
--- a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.msk;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class MSKEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-msk".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriFactory.java b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriFactory.java
new file mode 100644
index 0000000..aff28b1
--- /dev/null
+++ b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.msk;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class MSKEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-msk".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-msk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-msk-endpoint b/components/camel-aws-msk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-msk-endpoint
new file mode 100644
index 0000000..ad68737
--- /dev/null
+++ b/components/camel-aws-msk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-msk-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.msk.MSKEndpointUriFactory
diff --git a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java
deleted file mode 100644
index acdb5c8..0000000
--- a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.s3;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class S3EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = "://bucketNameOrArn";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-s3".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "bucketNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriFactory.java b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriFactory.java
new file mode 100644
index 0000000..3b90b2b
--- /dev/null
+++ b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.s3;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class S3EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = "://bucketNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-s3".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "bucketNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-s3/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-s3-endpoint b/components/camel-aws-s3/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-s3-endpoint
new file mode 100644
index 0000000..459577f
--- /dev/null
+++ b/components/camel-aws-s3/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-s3-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.s3.S3EndpointUriFactory
diff --git a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java
deleted file mode 100644
index 3363d4d..0000000
--- a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.sdb;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class SdbEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":domainName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-sdb".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "domainName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriFactory.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriFactory.java
new file mode 100644
index 0000000..b3285e3
--- /dev/null
+++ b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.sdb;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class SdbEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":domainName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-sdb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "domainName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-sdb-endpoint b/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-sdb-endpoint
new file mode 100644
index 0000000..ba31bb1
--- /dev/null
+++ b/components/camel-aws-sdb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-sdb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.sdb.SdbEndpointUriFactory
diff --git a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java
deleted file mode 100644
index 3edf071..0000000
--- a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.ses;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class SesEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":from";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-ses".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "from", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriFactory.java b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriFactory.java
new file mode 100644
index 0000000..645b107
--- /dev/null
+++ b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.ses;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class SesEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":from";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-ses".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "from", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-ses/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ses-endpoint b/components/camel-aws-ses/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ses-endpoint
new file mode 100644
index 0000000..f4bff66
--- /dev/null
+++ b/components/camel-aws-ses/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-ses-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.ses.SesEndpointUriFactory
diff --git a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java
deleted file mode 100644
index a7a147f..0000000
--- a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.sns;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class SnsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":topicNameOrArn";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-sns".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "topicNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriFactory.java b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriFactory.java
new file mode 100644
index 0000000..80787fb
--- /dev/null
+++ b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.sns;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class SnsEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":topicNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-sns".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "topicNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-sns/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-sns-endpoint b/components/camel-aws-sns/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-sns-endpoint
new file mode 100644
index 0000000..da56995
--- /dev/null
+++ b/components/camel-aws-sns/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-sns-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.sns.SnsEndpointUriFactory
diff --git a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java
deleted file mode 100644
index d06b3ec..0000000
--- a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.sqs;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class SqsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":queueNameOrArn";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-sqs".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "queueNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriFactory.java b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriFactory.java
new file mode 100644
index 0000000..f153bc4
--- /dev/null
+++ b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.sqs;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class SqsEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":queueNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-sqs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "queueNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-sqs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-sqs-endpoint b/components/camel-aws-sqs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-sqs-endpoint
new file mode 100644
index 0000000..21555d2
--- /dev/null
+++ b/components/camel-aws-sqs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-sqs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.sqs.SqsEndpointUriFactory
diff --git a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java
deleted file mode 100644
index 59c13b2..0000000
--- a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.swf;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class SWFEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":type";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-swf".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriFactory.java b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriFactory.java
new file mode 100644
index 0000000..e6f4ab0
--- /dev/null
+++ b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.swf;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class SWFEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":type";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-swf".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-swf/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-swf-endpoint b/components/camel-aws-swf/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-swf-endpoint
new file mode 100644
index 0000000..55cc2a2
--- /dev/null
+++ b/components/camel-aws-swf/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-swf-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.swf.SWFEndpointUriFactory
diff --git a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java
deleted file mode 100644
index 6ce19aa..0000000
--- a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws.translate;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class TranslateEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws-translate".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriFactory.java b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriFactory.java
new file mode 100644
index 0000000..0b8798a
--- /dev/null
+++ b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws.translate;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class TranslateEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws-translate".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws-translate/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-translate-endpoint b/components/camel-aws-translate/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-translate-endpoint
new file mode 100644
index 0000000..fcd4fe130c
--- /dev/null
+++ b/components/camel-aws-translate/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws-translate-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws.translate.TranslateEndpointUriFactory
diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java
deleted file mode 100644
index cfe4a58..0000000
--- a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.athena;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class Athena2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-athena".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriFactory.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriFactory.java
new file mode 100644
index 0000000..03d8da4
--- /dev/null
+++ b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.athena;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Athena2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-athena".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-athena/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-athena-endpoint b/components/camel-aws2-athena/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-athena-endpoint
new file mode 100644
index 0000000..302a620
--- /dev/null
+++ b/components/camel-aws2-athena/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-athena-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.athena.Athena2EndpointUriFactory
diff --git a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java
deleted file mode 100644
index 39cdcd8..0000000
--- a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.cw;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class Cw2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":namespace";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-cw".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriFactory.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriFactory.java
new file mode 100644
index 0000000..5ebc285
--- /dev/null
+++ b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.cw;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Cw2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":namespace";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-cw".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-cw-endpoint b/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-cw-endpoint
new file mode 100644
index 0000000..6b7b898
--- /dev/null
+++ b/components/camel-aws2-cw/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-cw-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.cw.Cw2EndpointUriFactory
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java
deleted file mode 100644
index 54d442f..0000000
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.ddb;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class Ddb2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":tableName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-ddb".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriFactory.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriFactory.java
new file mode 100644
index 0000000..974d9d6
--- /dev/null
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.ddb;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Ddb2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":tableName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-ddb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java
deleted file mode 100644
index 63989fa..0000000
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.ddbstream;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class Ddb2StreamEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":tableName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-ddbstream".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriFactory.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriFactory.java
new file mode 100644
index 0000000..2436740
--- /dev/null
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.ddbstream;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Ddb2StreamEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":tableName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-ddbstream".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ddb-endpoint b/components/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ddb-endpoint
new file mode 100644
index 0000000..9462e73
--- /dev/null
+++ b/components/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ddb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.ddb.Ddb2EndpointUriFactory
diff --git a/components/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ddbstream-endpoint b/components/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ddbstream-endpoint
new file mode 100644
index 0000000..258e780
--- /dev/null
+++ b/components/camel-aws2-ddb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ddbstream-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.ddbstream.Ddb2StreamEndpointUriFactory
diff --git a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java
deleted file mode 100644
index b9f81a5..0000000
--- a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.ec2;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AWS2EC2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-ec2".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriFactory.java b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriFactory.java
new file mode 100644
index 0000000..97f8a44
--- /dev/null
+++ b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.ec2;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AWS2EC2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-ec2".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-ec2/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ec2-endpoint b/components/camel-aws2-ec2/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ec2-endpoint
new file mode 100644
index 0000000..2121e03
--- /dev/null
+++ b/components/camel-aws2-ec2/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ec2-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.ec2.AWS2EC2EndpointUriFactory
diff --git a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java
deleted file mode 100644
index 85227c4..0000000
--- a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.ecs;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class ECS2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-ecs".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriFactory.java b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriFactory.java
new file mode 100644
index 0000000..260b65c
--- /dev/null
+++ b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.ecs;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ECS2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-ecs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ecs-endpoint b/components/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ecs-endpoint
new file mode 100644
index 0000000..d62987b
--- /dev/null
+++ b/components/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ecs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.ecs.ECS2EndpointUriFactory
diff --git a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java
deleted file mode 100644
index 5eaf045..0000000
--- a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.eks;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class EKS2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-eks".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriFactory.java b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriFactory.java
new file mode 100644
index 0000000..ff60375
--- /dev/null
+++ b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.eks;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EKS2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-eks".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-eks/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-eks-endpoint b/components/camel-aws2-eks/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-eks-endpoint
new file mode 100644
index 0000000..76ce276
--- /dev/null
+++ b/components/camel-aws2-eks/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-eks-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.eks.EKS2EndpointUriFactory
diff --git a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
deleted file mode 100644
index bd0edf2..0000000
--- a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.eventbridge;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class EventbridgeEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = "://eventbusNameOrArn";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-eventbridge".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "eventbusNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriFactory.java b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriFactory.java
new file mode 100644
index 0000000..ba19edf
--- /dev/null
+++ b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.eventbridge;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EventbridgeEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = "://eventbusNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-eventbridge".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "eventbusNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-eventbridge/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-eventbridge-endpoint b/components/camel-aws2-eventbridge/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-eventbridge-endpoint
new file mode 100644
index 0000000..addc576
--- /dev/null
+++ b/components/camel-aws2-eventbridge/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-eventbridge-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.eventbridge.EventbridgeEndpointUriFactory
diff --git a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java
deleted file mode 100644
index 342092b..0000000
--- a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.iam;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class IAM2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-iam".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriFactory.java b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriFactory.java
new file mode 100644
index 0000000..848fd39
--- /dev/null
+++ b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.iam;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class IAM2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-iam".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-iam/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-iam-endpoint b/components/camel-aws2-iam/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-iam-endpoint
new file mode 100644
index 0000000..7be24c7
--- /dev/null
+++ b/components/camel-aws2-iam/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-iam-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.iam.IAM2EndpointUriFactory
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java
deleted file mode 100644
index f6fbaa7..0000000
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.firehose;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class KinesisFirehose2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":streamName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-kinesis-firehose".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriFactory.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriFactory.java
new file mode 100644
index 0000000..9ab2501
--- /dev/null
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.firehose;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KinesisFirehose2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":streamName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-kinesis-firehose".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java
deleted file mode 100644
index 84a2137..0000000
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.kinesis;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class Kinesis2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":streamName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-kinesis".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriFactory.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriFactory.java
new file mode 100644
index 0000000..c760cac
--- /dev/null
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.kinesis;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Kinesis2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":streamName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-kinesis".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-kinesis-endpoint b/components/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-kinesis-endpoint
new file mode 100644
index 0000000..689bb94
--- /dev/null
+++ b/components/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-kinesis-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.kinesis.Kinesis2EndpointUriFactory
diff --git a/components/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-kinesis-firehose-endpoint b/components/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-kinesis-firehose-endpoint
new file mode 100644
index 0000000..5b3f33f
--- /dev/null
+++ b/components/camel-aws2-kinesis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-kinesis-firehose-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.firehose.KinesisFirehose2EndpointUriFactory
diff --git a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java
deleted file mode 100644
index 99c4fca..0000000
--- a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.kms;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class KMS2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-kms".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriFactory.java b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriFactory.java
new file mode 100644
index 0000000..7aebdfe
--- /dev/null
+++ b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.kms;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class KMS2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-kms".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-kms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-kms-endpoint b/components/camel-aws2-kms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-kms-endpoint
new file mode 100644
index 0000000..0da18ea
--- /dev/null
+++ b/components/camel-aws2-kms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-kms-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.kms.KMS2EndpointUriFactory
diff --git a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java
deleted file mode 100644
index f538530..0000000
--- a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.lambda;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class Lambda2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":function";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-lambda".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "function", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriFactory.java b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriFactory.java
new file mode 100644
index 0000000..25e9e9e
--- /dev/null
+++ b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.lambda;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Lambda2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":function";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-lambda".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "function", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-lambda/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-lambda-endpoint b/components/camel-aws2-lambda/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-lambda-endpoint
new file mode 100644
index 0000000..03c0993
--- /dev/null
+++ b/components/camel-aws2-lambda/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-lambda-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.lambda.Lambda2EndpointUriFactory
diff --git a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java
deleted file mode 100644
index fd63e22..0000000
--- a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.mq;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class MQ2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-mq".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriFactory.java b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriFactory.java
new file mode 100644
index 0000000..aaa6da2
--- /dev/null
+++ b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.mq;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class MQ2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-mq".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-mq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-mq-endpoint b/components/camel-aws2-mq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-mq-endpoint
new file mode 100644
index 0000000..502a361
--- /dev/null
+++ b/components/camel-aws2-mq/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-mq-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.mq.MQ2EndpointUriFactory
diff --git a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java
deleted file mode 100644
index a9094e9..0000000
--- a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.msk;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class MSK2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-msk".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriFactory.java b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriFactory.java
new file mode 100644
index 0000000..efd1e30
--- /dev/null
+++ b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.msk;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class MSK2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-msk".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-msk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-msk-endpoint b/components/camel-aws2-msk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-msk-endpoint
new file mode 100644
index 0000000..ea2949e
--- /dev/null
+++ b/components/camel-aws2-msk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-msk-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.msk.MSK2EndpointUriFactory
diff --git a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java
deleted file mode 100644
index 5d6b83d..0000000
--- a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.s3;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class AWS2S3EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = "://bucketNameOrArn";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-s3".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "bucketNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java
new file mode 100644
index 0000000..14ea138
--- /dev/null
+++ b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.s3;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class AWS2S3EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = "://bucketNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-s3".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "bucketNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-s3-endpoint b/components/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-s3-endpoint
new file mode 100644
index 0000000..2ea54ab
--- /dev/null
+++ b/components/camel-aws2-s3/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-s3-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.s3.AWS2S3EndpointUriFactory
diff --git a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java
deleted file mode 100644
index a1224a9..0000000
--- a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.ses;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class Ses2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":from";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-ses".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "from", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriFactory.java b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriFactory.java
new file mode 100644
index 0000000..b0c47f4
--- /dev/null
+++ b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.ses;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Ses2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":from";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-ses".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "from", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-ses/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ses-endpoint b/components/camel-aws2-ses/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ses-endpoint
new file mode 100644
index 0000000..1d1f4f3
--- /dev/null
+++ b/components/camel-aws2-ses/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-ses-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.ses.Ses2EndpointUriFactory
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java
deleted file mode 100644
index 64b8a50..0000000
--- a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.sns;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class Sns2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":topicNameOrArn";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-sns".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "topicNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriFactory.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriFactory.java
new file mode 100644
index 0000000..666ef5e
--- /dev/null
+++ b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.sns;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Sns2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":topicNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-sns".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "topicNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-sns/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-sns-endpoint b/components/camel-aws2-sns/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-sns-endpoint
new file mode 100644
index 0000000..2ccedbb
--- /dev/null
+++ b/components/camel-aws2-sns/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-sns-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.sns.Sns2EndpointUriFactory
diff --git a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java
deleted file mode 100644
index b723d14..0000000
--- a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.sqs;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class Sqs2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":queueNameOrArn";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-sqs".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "queueNameOrArn", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriFactory.java b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriFactory.java
new file mode 100644
index 0000000..078cb14
--- /dev/null
+++ b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.sqs;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Sqs2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":queueNameOrArn";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-sqs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "queueNameOrArn", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-sqs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-sqs-endpoint b/components/camel-aws2-sqs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-sqs-endpoint
new file mode 100644
index 0000000..b1025a7
--- /dev/null
+++ b/components/camel-aws2-sqs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-sqs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.sqs.Sqs2EndpointUriFactory
diff --git a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java
deleted file mode 100644
index 1bdf770..0000000
--- a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.sts;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class STS2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-sts".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriFactory.java b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriFactory.java
new file mode 100644
index 0000000..d3e887b
--- /dev/null
+++ b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.sts;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class STS2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-sts".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-sts/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-sts-endpoint b/components/camel-aws2-sts/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-sts-endpoint
new file mode 100644
index 0000000..60399ab
--- /dev/null
+++ b/components/camel-aws2-sts/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-sts-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.sts.STS2EndpointUriFactory
diff --git a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java
deleted file mode 100644
index f5167f4..0000000
--- a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.aws2.translate;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class Translate2EndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "aws2-translate".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriFactory.java b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriFactory.java
new file mode 100644
index 0000000..b237038
--- /dev/null
+++ b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.aws2.translate;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class Translate2EndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "aws2-translate".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-aws2-translate/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-translate-endpoint b/components/camel-aws2-translate/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-translate-endpoint
new file mode 100644
index 0000000..5509f67
--- /dev/null
+++ b/components/camel-aws2-translate/src/generated/resources/META-INF/services/org/apache/camel/urifactory/aws2-translate-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.aws2.translate.Translate2EndpointUriFactory
diff --git a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java
deleted file mode 100644
index 186fde1..0000000
--- a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.azure.eventhubs;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class EventHubsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":namespace/eventHubName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "azure-eventhubs".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "namespace", null, false, copy);
-        uri = buildPathParameter(syntax, uri, "eventHubName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriFactory.java b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriFactory.java
new file mode 100644
index 0000000..b1ac1cc
--- /dev/null
+++ b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.azure.eventhubs;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class EventHubsEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":namespace/eventHubName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "azure-eventhubs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "namespace", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "eventHubName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-azure-eventhubs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-eventhubs-endpoint b/components/camel-azure-eventhubs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-eventhubs-endpoint
new file mode 100644
index 0000000..e865df1
--- /dev/null
+++ b/components/camel-azure-eventhubs/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-eventhubs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.azure.eventhubs.EventHubsEndpointUriFactory
diff --git a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java
deleted file mode 100644
index 23b13d7..0000000
--- a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.azure.storage.blob;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class BlobEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":accountName/containerName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "azure-storage-blob".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "accountName", null, false, copy);
-        uri = buildPathParameter(syntax, uri, "containerName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriFactory.java b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriFactory.java
new file mode 100644
index 0000000..f4fa1f9
--- /dev/null
+++ b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.azure.storage.blob;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BlobEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":accountName/containerName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "azure-storage-blob".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "accountName", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "containerName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-azure-storage-blob/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-storage-blob-endpoint b/components/camel-azure-storage-blob/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-storage-blob-endpoint
new file mode 100644
index 0000000..cd307b4
--- /dev/null
+++ b/components/camel-azure-storage-blob/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-storage-blob-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.azure.storage.blob.BlobEndpointUriFactory
diff --git a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java
deleted file mode 100644
index e07b51a..0000000
--- a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.azure.storage.queue;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class QueueEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":accountName/queueName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "azure-storage-queue".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "accountName", null, false, copy);
-        uri = buildPathParameter(syntax, uri, "queueName", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriFactory.java b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriFactory.java
new file mode 100644
index 0000000..d7b9ccf
--- /dev/null
+++ b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.azure.storage.queue;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class QueueEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":accountName/queueName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "azure-storage-queue".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "accountName", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "queueName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-azure-storage-queue/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-storage-queue-endpoint b/components/camel-azure-storage-queue/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-storage-queue-endpoint
new file mode 100644
index 0000000..17526a1
--- /dev/null
+++ b/components/camel-azure-storage-queue/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-storage-queue-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.azure.storage.queue.QueueEndpointUriFactory
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java
deleted file mode 100644
index 97d5514..0000000
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.azure.blob;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class BlobServiceEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":containerOrBlobUri";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "azure-blob".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "containerOrBlobUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriFactory.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriFactory.java
new file mode 100644
index 0000000..d1adabc
--- /dev/null
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.azure.blob;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BlobServiceEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":containerOrBlobUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "azure-blob".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "containerOrBlobUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java
deleted file mode 100644
index 285b1ca..0000000
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.azure.queue;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class QueueServiceEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":containerAndQueueUri";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "azure-queue".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "containerAndQueueUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriFactory.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriFactory.java
new file mode 100644
index 0000000..ef4edf8
--- /dev/null
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.azure.queue;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class QueueServiceEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":containerAndQueueUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "azure-queue".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "containerAndQueueUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-blob-endpoint b/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-blob-endpoint
new file mode 100644
index 0000000..91e3679
--- /dev/null
+++ b/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-blob-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.azure.blob.BlobServiceEndpointUriFactory
diff --git a/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-queue-endpoint b/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-queue-endpoint
new file mode 100644
index 0000000..0bc8046
--- /dev/null
+++ b/components/camel-azure/src/generated/resources/META-INF/services/org/apache/camel/urifactory/azure-queue-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.azure.queue.QueueServiceEndpointUriFactory
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java
deleted file mode 100644
index 812b716..0000000
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.bean.validator;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class BeanValidatorEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":label";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "bean-validator".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriFactory.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriFactory.java
new file mode 100644
index 0000000..f1ac308
--- /dev/null
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.bean.validator;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BeanValidatorEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":label";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "bean-validator".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-bean-validator/src/generated/resources/META-INF/services/org/apache/camel/urifactory/bean-validator-endpoint b/components/camel-bean-validator/src/generated/resources/META-INF/services/org/apache/camel/urifactory/bean-validator-endpoint
new file mode 100644
index 0000000..8e2eea3
--- /dev/null
+++ b/components/camel-bean-validator/src/generated/resources/META-INF/services/org/apache/camel/urifactory/bean-validator-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.bean.validator.BeanValidatorEndpointUriFactory
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java
deleted file mode 100644
index dbb093f..0000000
--- a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.bean;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class BeanEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":beanName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "bean".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "beanName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriFactory.java b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriFactory.java
new file mode 100644
index 0000000..06a4942
--- /dev/null
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/bean/BeanEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.bean;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BeanEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":beanName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "bean".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "beanName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java
deleted file mode 100644
index 15ee8c2..0000000
--- a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.beanclass;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class ClassEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":beanName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "class".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "beanName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriFactory.java b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriFactory.java
new file mode 100644
index 0000000..8c27eeb
--- /dev/null
+++ b/components/camel-bean/src/generated/java/org/apache/camel/component/beanclass/ClassEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.beanclass;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ClassEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":beanName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "class".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "beanName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/urifactory/bean-endpoint b/components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/urifactory/bean-endpoint
new file mode 100644
index 0000000..196751b
--- /dev/null
+++ b/components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/urifactory/bean-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.bean.BeanEndpointUriFactory
diff --git a/components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/urifactory/class-endpoint b/components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/urifactory/class-endpoint
new file mode 100644
index 0000000..dd77c99
--- /dev/null
+++ b/components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/urifactory/class-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.beanclass.ClassEndpointUriFactory
diff --git a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java
deleted file mode 100644
index 674aa16..0000000
--- a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.beanstalk;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class BeanstalkEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":connectionSettings";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "beanstalk".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "connectionSettings", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriFactory.java b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriFactory.java
new file mode 100644
index 0000000..24ef4ba
--- /dev/null
+++ b/components/camel-beanstalk/src/generated/java/org/apache/camel/component/beanstalk/BeanstalkEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.beanstalk;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BeanstalkEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":connectionSettings";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "beanstalk".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "connectionSettings", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-beanstalk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/beanstalk-endpoint b/components/camel-beanstalk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/beanstalk-endpoint
new file mode 100644
index 0000000..39d4838
--- /dev/null
+++ b/components/camel-beanstalk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/beanstalk-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.beanstalk.BeanstalkEndpointUriFactory
diff --git a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java
deleted file mode 100644
index 1a26407..0000000
--- a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.bonita;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class BonitaEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":operation";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "bonita".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriFactory.java b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriFactory.java
new file mode 100644
index 0000000..a7f522a
--- /dev/null
+++ b/components/camel-bonita/src/generated/java/org/apache/camel/component/bonita/BonitaEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.bonita;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BonitaEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":operation";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "bonita".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-bonita/src/generated/resources/META-INF/services/org/apache/camel/urifactory/bonita-endpoint b/components/camel-bonita/src/generated/resources/META-INF/services/org/apache/camel/urifactory/bonita-endpoint
new file mode 100644
index 0000000..1ecec10
--- /dev/null
+++ b/components/camel-bonita/src/generated/resources/META-INF/services/org/apache/camel/urifactory/bonita-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.bonita.BonitaEndpointUriFactory
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java
deleted file mode 100644
index 4a992a0..0000000
--- a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.box;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class BoxEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":apiName/methodName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "box".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriFactory.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriFactory.java
new file mode 100644
index 0000000..bf0e708
--- /dev/null
+++ b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.box;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BoxEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":apiName/methodName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "box".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-box/camel-box-component/src/generated/resources/META-INF/services/org/apache/camel/urifactory/box-endpoint b/components/camel-box/camel-box-component/src/generated/resources/META-INF/services/org/apache/camel/urifactory/box-endpoint
new file mode 100644
index 0000000..94464be
--- /dev/null
+++ b/components/camel-box/camel-box-component/src/generated/resources/META-INF/services/org/apache/camel/urifactory/box-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.box.BoxEndpointUriFactory
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java
deleted file mode 100644
index 7851114..0000000
--- a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.braintree;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class BraintreeEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":apiName/methodName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "braintree".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriFactory.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriFactory.java
new file mode 100644
index 0000000..e378d08
--- /dev/null
+++ b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.braintree;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BraintreeEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":apiName/methodName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "braintree".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-braintree/src/generated/resources/META-INF/services/org/apache/camel/urifactory/braintree-endpoint b/components/camel-braintree/src/generated/resources/META-INF/services/org/apache/camel/urifactory/braintree-endpoint
new file mode 100644
index 0000000..b2d9cb8
--- /dev/null
+++ b/components/camel-braintree/src/generated/resources/META-INF/services/org/apache/camel/urifactory/braintree-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.braintree.BraintreeEndpointUriFactory
diff --git a/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java b/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java
deleted file mode 100644
index ff0f401..0000000
--- a/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.browse;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class BrowseEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "browse".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriFactory.java b/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriFactory.java
new file mode 100644
index 0000000..bd14883
--- /dev/null
+++ b/components/camel-browse/src/generated/java/org/apache/camel/component/browse/BrowseEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.browse;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class BrowseEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "browse".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-browse/src/generated/resources/META-INF/services/org/apache/camel/urifactory/browse-endpoint b/components/camel-browse/src/generated/resources/META-INF/services/org/apache/camel/urifactory/browse-endpoint
new file mode 100644
index 0000000..8fd00e5
--- /dev/null
+++ b/components/camel-browse/src/generated/resources/META-INF/services/org/apache/camel/urifactory/browse-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.browse.BrowseEndpointUriFactory
diff --git a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java
deleted file mode 100644
index d1d412b..0000000
--- a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.caffeine.cache;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CaffeineCacheEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":cacheName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "caffeine-cache".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriFactory.java b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriFactory.java
new file mode 100644
index 0000000..b4122b1
--- /dev/null
+++ b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/cache/CaffeineCacheEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.caffeine.cache;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CaffeineCacheEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "caffeine-cache".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java
deleted file mode 100644
index c4a4c93..0000000
--- a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.caffeine.load;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CaffeineLoadCacheEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":cacheName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "caffeine-loadcache".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriFactory.java b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriFactory.java
new file mode 100644
index 0000000..aa1d85c
--- /dev/null
+++ b/components/camel-caffeine/src/generated/java/org/apache/camel/component/caffeine/load/CaffeineLoadCacheEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.caffeine.load;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CaffeineLoadCacheEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":cacheName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "caffeine-loadcache".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/urifactory/caffeine-cache-endpoint b/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/urifactory/caffeine-cache-endpoint
new file mode 100644
index 0000000..f9d288a
--- /dev/null
+++ b/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/urifactory/caffeine-cache-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.caffeine.cache.CaffeineCacheEndpointUriFactory
diff --git a/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/urifactory/caffeine-loadcache-endpoint b/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/urifactory/caffeine-loadcache-endpoint
new file mode 100644
index 0000000..a9ccbf3
--- /dev/null
+++ b/components/camel-caffeine/src/generated/resources/META-INF/services/org/apache/camel/urifactory/caffeine-loadcache-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.caffeine.load.CaffeineLoadCacheEndpointUriFactory
diff --git a/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java b/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java
deleted file mode 100644
index 609d9d6..0000000
--- a/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriAssembler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.cassandra;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CassandraEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":beanRef:hosts:port/keyspace";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "cql".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "beanRef", null, false, copy);
-        uri = buildPathParameter(syntax, uri, "hosts", null, false, copy);
-        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(syntax, uri, "keyspace", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriFactory.java b/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriFactory.java
new file mode 100644
index 0000000..c603dae
--- /dev/null
+++ b/components/camel-cassandraql/src/generated/java/org/apache/camel/component/cassandra/CassandraEndpointUriFactory.java
@@ -0,0 +1,37 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cassandra;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CassandraEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":beanRef:hosts:port/keyspace";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "cql".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "beanRef", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "hosts", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "keyspace", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cassandraql/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cql-endpoint b/components/camel-cassandraql/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cql-endpoint
new file mode 100644
index 0000000..2e067f8
--- /dev/null
+++ b/components/camel-cassandraql/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cql-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cassandra.CassandraEndpointUriFactory
diff --git a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java b/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java
deleted file mode 100644
index 89cfd6c..0000000
--- a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriAssembler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.chatscript;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class ChatScriptEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":host:port/botName";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "chatscript".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "port", "1024", false, copy);
-        uri = buildPathParameter(syntax, uri, "botName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriFactory.java b/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriFactory.java
new file mode 100644
index 0000000..e5e24f7
--- /dev/null
+++ b/components/camel-chatscript/src/generated/java/org/apache/camel/component/chatscript/ChatScriptEndpointUriFactory.java
@@ -0,0 +1,36 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.chatscript;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ChatScriptEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":host:port/botName";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "chatscript".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "1024", false, copy);
+        uri = buildPathParameter(syntax, uri, "botName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/urifactory/chatscript-endpoint b/components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/urifactory/chatscript-endpoint
new file mode 100644
index 0000000..b6cf1ea
--- /dev/null
+++ b/components/camel-chatscript/src/generated/resources/META-INF/services/org/apache/camel/urifactory/chatscript-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.chatscript.ChatScriptEndpointUriFactory
diff --git a/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java b/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java
deleted file mode 100644
index 8e6ba17..0000000
--- a/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.chunk;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class ChunkEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":resourceUri";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "chunk".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriFactory.java b/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriFactory.java
new file mode 100644
index 0000000..2eb9bd5
--- /dev/null
+++ b/components/camel-chunk/src/generated/java/org/apache/camel/component/chunk/ChunkEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.chunk;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ChunkEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":resourceUri";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "chunk".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-chunk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/chunk-endpoint b/components/camel-chunk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/chunk-endpoint
new file mode 100644
index 0000000..c7a2db7
--- /dev/null
+++ b/components/camel-chunk/src/generated/resources/META-INF/services/org/apache/camel/urifactory/chunk-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.chunk.ChunkEndpointUriFactory
diff --git a/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java b/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java
deleted file mode 100644
index 4858aa7..0000000
--- a/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.cm;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CMEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":host";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "cm-sms".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriFactory.java b/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriFactory.java
new file mode 100644
index 0000000..4091796
--- /dev/null
+++ b/components/camel-cm-sms/src/generated/java/org/apache/camel/component/cm/CMEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cm;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CMEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":host";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "cm-sms".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cm-sms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cm-sms-endpoint b/components/camel-cm-sms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cm-sms-endpoint
new file mode 100644
index 0000000..292f7d2
--- /dev/null
+++ b/components/camel-cm-sms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cm-sms-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cm.CMEndpointUriFactory
diff --git a/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java b/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java
deleted file mode 100644
index ed65396..0000000
--- a/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.cmis;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CMISEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":cmsUrl";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "cmis".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "cmsUrl", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriFactory.java b/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriFactory.java
new file mode 100644
index 0000000..e514cc9
--- /dev/null
+++ b/components/camel-cmis/src/generated/java/org/apache/camel/component/cmis/CMISEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cmis;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CMISEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":cmsUrl";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "cmis".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "cmsUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cmis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cmis-endpoint b/components/camel-cmis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cmis-endpoint
new file mode 100644
index 0000000..6217d4e
--- /dev/null
+++ b/components/camel-cmis/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cmis-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cmis.CMISEndpointUriFactory
diff --git a/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java b/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java
deleted file mode 100644
index ea4749b..0000000
--- a/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriAssembler.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.coap;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CoAPEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = "coaps+tcp:uri";
-    private static final String[] SCHEMES = new String[]{"coap", "coaps", "coap+tcp", "coaps+tcp"};
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        for (String s : SCHEMES) {
-            if (s.equals(scheme)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "uri", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriFactory.java b/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriFactory.java
new file mode 100644
index 0000000..c854af1
--- /dev/null
+++ b/components/camel-coap/src/generated/java/org/apache/camel/coap/CoAPEndpointUriFactory.java
@@ -0,0 +1,40 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.coap;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CoAPEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = "coaps+tcp:uri";
+    private static final String[] SCHEMES = new String[]{"coap", "coaps", "coap+tcp", "coaps+tcp"};
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        for (String s : SCHEMES) {
+            if (s.equals(scheme)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "uri", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/urifactory/coap+tcp-endpoint b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/urifactory/coap+tcp-endpoint
new file mode 100644
index 0000000..0354a5f
--- /dev/null
+++ b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/urifactory/coap+tcp-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.coap.CoAPEndpointUriFactory
diff --git a/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/urifactory/coap-endpoint b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/urifactory/coap-endpoint
new file mode 100644
index 0000000..0354a5f
--- /dev/null
+++ b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/urifactory/coap-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.coap.CoAPEndpointUriFactory
diff --git a/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/urifactory/coaps+tcp-endpoint b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/urifactory/coaps+tcp-endpoint
new file mode 100644
index 0000000..0354a5f
--- /dev/null
+++ b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/urifactory/coaps+tcp-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.coap.CoAPEndpointUriFactory
diff --git a/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/urifactory/coaps-endpoint b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/urifactory/coaps-endpoint
new file mode 100644
index 0000000..0354a5f
--- /dev/null
+++ b/components/camel-coap/src/generated/resources/META-INF/services/org/apache/camel/urifactory/coaps-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.coap.CoAPEndpointUriFactory
diff --git a/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java b/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java
deleted file mode 100644
index c507424..0000000
--- a/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriAssembler.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.cometd;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CometdEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":host:port/channelName";
-    private static final String[] SCHEMES = new String[]{"cometd", "cometds"};
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        for (String s : SCHEMES) {
-            if (s.equals(scheme)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "channelName", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriFactory.java b/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriFactory.java
new file mode 100644
index 0000000..a6c6ea3
--- /dev/null
+++ b/components/camel-cometd/src/generated/java/org/apache/camel/component/cometd/CometdEndpointUriFactory.java
@@ -0,0 +1,42 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cometd;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CometdEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":host:port/channelName";
+    private static final String[] SCHEMES = new String[]{"cometd", "cometds"};
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        for (String s : SCHEMES) {
+            if (s.equals(scheme)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "channelName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cometd/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cometd-endpoint b/components/camel-cometd/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cometd-endpoint
new file mode 100644
index 0000000..3ce60e5
--- /dev/null
+++ b/components/camel-cometd/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cometd-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cometd.CometdEndpointUriFactory
diff --git a/components/camel-cometd/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cometds-endpoint b/components/camel-cometd/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cometds-endpoint
new file mode 100644
index 0000000..3ce60e5
--- /dev/null
+++ b/components/camel-cometd/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cometds-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cometd.CometdEndpointUriFactory
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java
deleted file mode 100644
index 3f2ea51..0000000
--- a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.consul;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class ConsulEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":apiEndpoint";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "consul".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "apiEndpoint", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
new file mode 100644
index 0000000..769d75b
--- /dev/null
+++ b/components/camel-consul/src/generated/java/org/apache/camel/component/consul/ConsulEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.consul;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ConsulEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":apiEndpoint";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "consul".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "apiEndpoint", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-consul/src/generated/resources/META-INF/services/org/apache/camel/urifactory/consul-endpoint b/components/camel-consul/src/generated/resources/META-INF/services/org/apache/camel/urifactory/consul-endpoint
new file mode 100644
index 0000000..88ed369
--- /dev/null
+++ b/components/camel-consul/src/generated/resources/META-INF/services/org/apache/camel/urifactory/consul-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.consul.ConsulEndpointUriFactory
diff --git a/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java b/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java
deleted file mode 100644
index 87e9707..0000000
--- a/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.controlbus;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class ControlBusEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":command:language";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "controlbus".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "command", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "language", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriFactory.java b/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriFactory.java
new file mode 100644
index 0000000..09c845a
--- /dev/null
+++ b/components/camel-controlbus/src/generated/java/org/apache/camel/component/controlbus/ControlBusEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.controlbus;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class ControlBusEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":command:language";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "controlbus".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "command", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "language", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-controlbus/src/generated/resources/META-INF/services/org/apache/camel/urifactory/controlbus-endpoint b/components/camel-controlbus/src/generated/resources/META-INF/services/org/apache/camel/urifactory/controlbus-endpoint
new file mode 100644
index 0000000..24bca9a
--- /dev/null
+++ b/components/camel-controlbus/src/generated/resources/META-INF/services/org/apache/camel/urifactory/controlbus-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.controlbus.ControlBusEndpointUriFactory
diff --git a/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java
deleted file mode 100644
index 6a93dbb..0000000
--- a/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.corda;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CordaEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":node";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "corda".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "node", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriFactory.java b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriFactory.java
new file mode 100644
index 0000000..5da02b6
--- /dev/null
+++ b/components/camel-corda/src/generated/java/org/apache/camel/component/corda/CordaEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.corda;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CordaEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":node";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "corda".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "node", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-corda/src/generated/resources/META-INF/services/org/apache/camel/urifactory/corda-endpoint b/components/camel-corda/src/generated/resources/META-INF/services/org/apache/camel/urifactory/corda-endpoint
new file mode 100644
index 0000000..4e060a8
--- /dev/null
+++ b/components/camel-corda/src/generated/resources/META-INF/services/org/apache/camel/urifactory/corda-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.corda.CordaEndpointUriFactory
diff --git a/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java
deleted file mode 100644
index 2adeea4..0000000
--- a/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriAssembler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.couchbase;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CouchbaseEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":protocol:hostname:port";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "couchbase".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "port", "8091", false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriFactory.java b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriFactory.java
new file mode 100644
index 0000000..50fedfb
--- /dev/null
+++ b/components/camel-couchbase/src/generated/java/org/apache/camel/component/couchbase/CouchbaseEndpointUriFactory.java
@@ -0,0 +1,36 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.couchbase;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CouchbaseEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":protocol:hostname:port";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "couchbase".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "8091", false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-couchbase/src/generated/resources/META-INF/services/org/apache/camel/urifactory/couchbase-endpoint b/components/camel-couchbase/src/generated/resources/META-INF/services/org/apache/camel/urifactory/couchbase-endpoint
new file mode 100644
index 0000000..7529a9b
--- /dev/null
+++ b/components/camel-couchbase/src/generated/resources/META-INF/services/org/apache/camel/urifactory/couchbase-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.couchbase.CouchbaseEndpointUriFactory
diff --git a/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java b/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java
deleted file mode 100644
index d8fa528..0000000
--- a/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriAssembler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.couchdb;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CouchDbEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":protocol:hostname:port/database";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "couchdb".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "port", "5984", false, copy);
-        uri = buildPathParameter(syntax, uri, "database", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriFactory.java b/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriFactory.java
new file mode 100644
index 0000000..86578ab
--- /dev/null
+++ b/components/camel-couchdb/src/generated/java/org/apache/camel/component/couchdb/CouchDbEndpointUriFactory.java
@@ -0,0 +1,37 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.couchdb;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CouchDbEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":protocol:hostname:port/database";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "couchdb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "5984", false, copy);
+        uri = buildPathParameter(syntax, uri, "database", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-couchdb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/couchdb-endpoint b/components/camel-couchdb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/couchdb-endpoint
new file mode 100644
index 0000000..17841a9
--- /dev/null
+++ b/components/camel-couchdb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/couchdb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.couchdb.CouchDbEndpointUriFactory
diff --git a/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java b/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java
deleted file mode 100644
index d725d9d..0000000
--- a/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.cron;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CronEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "cron".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriFactory.java b/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriFactory.java
new file mode 100644
index 0000000..39d703f
--- /dev/null
+++ b/components/camel-cron/src/generated/java/org/apache/camel/component/cron/CronEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cron;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CronEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "cron".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cron/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cron-endpoint b/components/camel-cron/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cron-endpoint
new file mode 100644
index 0000000..22ef28b
--- /dev/null
+++ b/components/camel-cron/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cron-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cron.CronEndpointUriFactory
diff --git a/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java b/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java
deleted file mode 100644
index 2708f70..0000000
--- a/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.crypto.cms;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CryptoCmsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":cryptoOperation:name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "crypto-cms".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "cryptoOperation", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriFactory.java b/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriFactory.java
new file mode 100644
index 0000000..9f4ce7b
--- /dev/null
+++ b/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.crypto.cms;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CryptoCmsEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":cryptoOperation:name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "crypto-cms".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "cryptoOperation", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-crypto-cms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/crypto-cms-endpoint b/components/camel-crypto-cms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/crypto-cms-endpoint
new file mode 100644
index 0000000..ec14ba4
--- /dev/null
+++ b/components/camel-crypto-cms/src/generated/resources/META-INF/services/org/apache/camel/urifactory/crypto-cms-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.crypto.cms.CryptoCmsEndpointUriFactory
diff --git a/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java b/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java
deleted file mode 100644
index 57a4412..0000000
--- a/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.crypto;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class DigitalSignatureEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":cryptoOperation:name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "crypto".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "cryptoOperation", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriFactory.java b/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriFactory.java
new file mode 100644
index 0000000..d4a189e
--- /dev/null
+++ b/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.crypto;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DigitalSignatureEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":cryptoOperation:name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "crypto".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "cryptoOperation", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-crypto/src/generated/resources/META-INF/services/org/apache/camel/urifactory/crypto-endpoint b/components/camel-crypto/src/generated/resources/META-INF/services/org/apache/camel/urifactory/crypto-endpoint
new file mode 100644
index 0000000..f8e250e
--- /dev/null
+++ b/components/camel-crypto/src/generated/resources/META-INF/services/org/apache/camel/urifactory/crypto-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.crypto.DigitalSignatureEndpointUriFactory
diff --git a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java
deleted file mode 100644
index 099dcd0..0000000
--- a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.cxf;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CxfEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":beanId:address";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "cxf".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "beanId", null, false, copy);
-        uri = buildPathParameter(syntax, uri, "address", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriFactory.java b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriFactory.java
new file mode 100644
index 0000000..cd256de
--- /dev/null
+++ b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/CxfEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cxf;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CxfEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":beanId:address";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "cxf".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "beanId", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "address", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java
deleted file mode 100644
index 61dac40..0000000
--- a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.cxf.jaxrs;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class CxfRsEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":beanId:address";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "cxfrs".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "beanId", null, false, copy);
-        uri = buildPathParameter(syntax, uri, "address", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriFactory.java b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriFactory.java
new file mode 100644
index 0000000..9e0f96f
--- /dev/null
+++ b/components/camel-cxf/src/generated/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.cxf.jaxrs;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class CxfRsEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":beanId:address";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "cxfrs".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "beanId", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "address", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cxf-endpoint b/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cxf-endpoint
new file mode 100644
index 0000000..2e7e5f8
--- /dev/null
+++ b/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cxf-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cxf.CxfEndpointUriFactory
diff --git a/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cxfrs-endpoint b/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cxfrs-endpoint
new file mode 100644
index 0000000..ea9741b
--- /dev/null
+++ b/components/camel-cxf/src/generated/resources/META-INF/services/org/apache/camel/urifactory/cxfrs-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.cxf.jaxrs.CxfRsEndpointUriFactory
diff --git a/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java b/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java
deleted file mode 100644
index cdf7d0e..0000000
--- a/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriAssembler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.dataformat;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class DataFormatEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name:operation";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "dataformat".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriFactory.java b/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriFactory.java
new file mode 100644
index 0000000..e574daf
--- /dev/null
+++ b/components/camel-dataformat/src/generated/java/org/apache/camel/component/dataformat/DataFormatEndpointUriFactory.java
@@ -0,0 +1,35 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.dataformat;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DataFormatEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name:operation";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "dataformat".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-dataformat/src/generated/resources/META-INF/services/org/apache/camel/urifactory/dataformat-endpoint b/components/camel-dataformat/src/generated/resources/META-INF/services/org/apache/camel/urifactory/dataformat-endpoint
new file mode 100644
index 0000000..7e5aeec
--- /dev/null
+++ b/components/camel-dataformat/src/generated/resources/META-INF/services/org/apache/camel/urifactory/dataformat-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.dataformat.DataFormatEndpointUriFactory
diff --git a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java
deleted file mode 100644
index e4a6d0a..0000000
--- a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.dataset;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class DataSetEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "dataset".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriFactory.java b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriFactory.java
new file mode 100644
index 0000000..85b293c
--- /dev/null
+++ b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.dataset;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DataSetEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "dataset".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java
deleted file mode 100644
index 147aafa..0000000
--- a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.dataset;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class DataSetTestEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "dataset-test".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriFactory.java b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriFactory.java
new file mode 100644
index 0000000..7b420c0
--- /dev/null
+++ b/components/camel-dataset/src/generated/java/org/apache/camel/component/dataset/DataSetTestEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.dataset;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DataSetTestEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "dataset-test".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-dataset/src/generated/resources/META-INF/services/org/apache/camel/urifactory/dataset-endpoint b/components/camel-dataset/src/generated/resources/META-INF/services/org/apache/camel/urifactory/dataset-endpoint
new file mode 100644
index 0000000..c468044
--- /dev/null
+++ b/components/camel-dataset/src/generated/resources/META-INF/services/org/apache/camel/urifactory/dataset-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.dataset.DataSetEndpointUriFactory
diff --git a/components/camel-dataset/src/generated/resources/META-INF/services/org/apache/camel/urifactory/dataset-test-endpoint b/components/camel-dataset/src/generated/resources/META-INF/services/org/apache/camel/urifactory/dataset-test-endpoint
new file mode 100644
index 0000000..cbbb80e
--- /dev/null
+++ b/components/camel-dataset/src/generated/resources/META-INF/services/org/apache/camel/urifactory/dataset-test-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.dataset.DataSetTestEndpointUriFactory
diff --git a/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java b/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java
deleted file mode 100644
index 3a65791..0000000
--- a/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.debezium;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class DebeziumMongodbEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "debezium-mongodb".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriFactory.java b/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriFactory.java
new file mode 100644
index 0000000..4a91529
--- /dev/null
+++ b/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.debezium;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DebeziumMongodbEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "debezium-mongodb".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-debezium-mongodb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/debezium-mongodb-endpoint b/components/camel-debezium-mongodb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/debezium-mongodb-endpoint
new file mode 100644
index 0000000..7d6acb3
--- /dev/null
+++ b/components/camel-debezium-mongodb/src/generated/resources/META-INF/services/org/apache/camel/urifactory/debezium-mongodb-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.debezium.DebeziumMongodbEndpointUriFactory
diff --git a/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java b/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java
deleted file mode 100644
index 0bdf7b6..0000000
--- a/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.debezium;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class DebeziumMySqlEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "debezium-mysql".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriFactory.java b/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriFactory.java
new file mode 100644
index 0000000..fa7e686
--- /dev/null
+++ b/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.debezium;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DebeziumMySqlEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "debezium-mysql".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-debezium-mysql/src/generated/resources/META-INF/services/org/apache/camel/urifactory/debezium-mysql-endpoint b/components/camel-debezium-mysql/src/generated/resources/META-INF/services/org/apache/camel/urifactory/debezium-mysql-endpoint
new file mode 100644
index 0000000..96defcc
--- /dev/null
+++ b/components/camel-debezium-mysql/src/generated/resources/META-INF/services/org/apache/camel/urifactory/debezium-mysql-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.debezium.DebeziumMySqlEndpointUriFactory
diff --git a/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java b/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java
deleted file mode 100644
index 4ffad3e..0000000
--- a/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.debezium;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class DebeziumPostgresEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "debezium-postgres".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriFactory.java b/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriFactory.java
new file mode 100644
index 0000000..e32aef0
--- /dev/null
+++ b/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.debezium;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DebeziumPostgresEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "debezium-postgres".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-debezium-postgres/src/generated/resources/META-INF/services/org/apache/camel/urifactory/debezium-postgres-endpoint b/components/camel-debezium-postgres/src/generated/resources/META-INF/services/org/apache/camel/urifactory/debezium-postgres-endpoint
new file mode 100644
index 0000000..ceadfea
--- /dev/null
+++ b/components/camel-debezium-postgres/src/generated/resources/META-INF/services/org/apache/camel/urifactory/debezium-postgres-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.debezium.DebeziumPostgresEndpointUriFactory
diff --git a/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java b/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java
deleted file mode 100644
index 21569e7..0000000
--- a/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.debezium;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class DebeziumSqlserverEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "debezium-sqlserver".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriFactory.java b/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriFactory.java
new file mode 100644
index 0000000..f5cb243
--- /dev/null
+++ b/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.debezium;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DebeziumSqlserverEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "debezium-sqlserver".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-debezium-sqlserver/src/generated/resources/META-INF/services/org/apache/camel/urifactory/debezium-sqlserver-endpoint b/components/camel-debezium-sqlserver/src/generated/resources/META-INF/services/org/apache/camel/urifactory/debezium-sqlserver-endpoint
new file mode 100644
index 0000000..befa033
--- /dev/null
+++ b/components/camel-debezium-sqlserver/src/generated/resources/META-INF/services/org/apache/camel/urifactory/debezium-sqlserver-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.debezium.DebeziumSqlserverEndpointUriFactory
diff --git a/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java b/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java
deleted file mode 100644
index c51cbcc..0000000
--- a/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.digitalocean;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class DigitalOceanEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":operation";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "digitalocean".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "operation", null, false, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriFactory.java b/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriFactory.java
new file mode 100644
index 0000000..40a6fa4
--- /dev/null
+++ b/components/camel-digitalocean/src/generated/java/org/apache/camel/component/digitalocean/DigitalOceanEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.digitalocean;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DigitalOceanEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":operation";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "digitalocean".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "operation", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-digitalocean/src/generated/resources/META-INF/services/org/apache/camel/urifactory/digitalocean-endpoint b/components/camel-digitalocean/src/generated/resources/META-INF/services/org/apache/camel/urifactory/digitalocean-endpoint
new file mode 100644
index 0000000..20780b9
--- /dev/null
+++ b/components/camel-digitalocean/src/generated/resources/META-INF/services/org/apache/camel/urifactory/digitalocean-endpoint
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.digitalocean.DigitalOceanEndpointUriFactory
diff --git a/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java b/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java
deleted file mode 100644
index 37a34f7..0000000
--- a/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriAssembler.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.direct;
-
-import java.net.URISyntaxException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.spi.EndpointUriAssembler;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-public class DirectEndpointUriAssembler extends org.apache.camel.support.component.EndpointUriAssemblerSupport implements EndpointUriAssembler {
-
-    private static final String BASE = ":name";
-
-    @Override
-    public boolean isEnabled(String scheme) {
-        return "direct".equals(scheme);
-    }
-
-    @Override
-    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
-        String syntax = scheme + BASE;
-        String uri = syntax;
-
-        Map<String, Object> copy = new HashMap<>(parameters);
-
-        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(uri, copy);
-        return uri;
-    }
-}
-
diff --git a/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriFactory.java b/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriFactory.java
new file mode 100644
index 0000000..c5c22f0
--- /dev/null
+++ b/components/camel-direct/src/generated/java/org/apache/camel/component/direct/DirectEndpointUriFactory.java
@@ -0,0 +1,34 @@
+/* Generated by camel build tools - do NOT edit this file! */
+package org.apache.camel.component.direct;
+
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.EndpointUriFactory;
+
+/**
+ * Generated by camel build tools - do NOT edit this file!
+ */
+public class DirectEndpointUriFactory extends org.apache.camel.support.component.EndpointUriFactorySupport implements EndpointUriFactory {
+
+    private static final String BASE = ":name";
+
+    @Override
+    public boolean isEnabled(String scheme) {
+        return "direct".equals(scheme);
+    }
+
+    @Override
+    public String buildUri(String scheme, Map<String, Object> parameters) throws URISyntaxException {
+        String syntax = scheme + BASE;
+        String uri = syntax;
+
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
+        return uri;
+    }
+}
+
diff --git a/components/camel-direct/src/generated/resources/META-INF/services/org/apache/camel/urifactory/direct-endpoint b/components/camel-direct/src/generated/resources/META-INF/services/org/apache/camel/urifactory/direct-endpoint
new file mode 100644
index 0000000..f630c82
--- /dev/null
+++ b/components/camel-direct/src/generated/resources/META-INF/services/org/apache/camel/urifactory/direct-endpoint
... 23718 lines suppressed ...