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:10 UTC

[camel] 13/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 c88fdd0f9cdf7830c2afe2172f041b3ad3fbec27
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 17:32:28 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../component/activemq/ActiveMQEndpointUriAssembler.java  |  9 ++++-----
 .../camel/component/ahc/ws/WsEndpointUriAssembler.java    |  7 +++----
 .../camel/component/ahc/AhcEndpointUriAssembler.java      |  7 +++----
 .../camel/component/amqp/AMQPEndpointUriAssembler.java    |  9 ++++-----
 .../camel/component/apns/ApnsEndpointUriAssembler.java    |  7 +++----
 .../component/arangodb/ArangoDbEndpointUriAssembler.java  |  7 +++----
 .../camel/component/as2/AS2EndpointUriAssembler.java      |  9 ++++-----
 .../component/asterisk/AsteriskEndpointUriAssembler.java  |  7 +++----
 .../camel/component/atmos/AtmosEndpointUriAssembler.java  |  9 ++++-----
 .../websocket/WebsocketEndpointUriAssembler.java          |  7 +++----
 .../camel/component/atom/AtomEndpointUriAssembler.java    |  7 +++----
 .../atomix/client/map/AtomixMapEndpointUriAssembler.java  |  7 +++----
 .../messaging/AtomixMessagingEndpointUriAssembler.java    |  7 +++----
 .../multimap/AtomixMultiMapEndpointUriAssembler.java      |  7 +++----
 .../client/queue/AtomixQueueEndpointUriAssembler.java     |  7 +++----
 .../atomix/client/set/AtomixSetEndpointUriAssembler.java  |  7 +++----
 .../client/value/AtomixValueEndpointUriAssembler.java     |  7 +++----
 .../camel/component/avro/AvroEndpointUriAssembler.java    | 13 ++++++-------
 .../camel/component/aws/cw/CwEndpointUriAssembler.java    |  7 +++----
 .../camel/component/aws/ddb/DdbEndpointUriAssembler.java  |  7 +++----
 .../aws/ddbstream/DdbStreamEndpointUriAssembler.java      |  7 +++----
 .../camel/component/aws/ec2/EC2EndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/ecs/ECSEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/eks/EKSEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/iam/IAMEndpointUriAssembler.java  |  7 +++----
 .../aws/firehose/KinesisFirehoseEndpointUriAssembler.java |  7 +++----
 .../aws/kinesis/KinesisEndpointUriAssembler.java          |  7 +++----
 .../camel/component/aws/kms/KMSEndpointUriAssembler.java  |  7 +++----
 .../component/aws/lambda/LambdaEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/mq/MQEndpointUriAssembler.java    |  7 +++----
 .../camel/component/aws/msk/MSKEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/s3/S3EndpointUriAssembler.java    |  7 +++----
 .../camel/component/aws/sdb/SdbEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/ses/SesEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/sns/SnsEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/sqs/SqsEndpointUriAssembler.java  |  7 +++----
 .../camel/component/aws/swf/SWFEndpointUriAssembler.java  |  7 +++----
 .../aws/translate/TranslateEndpointUriAssembler.java      |  7 +++----
 .../aws2/athena/Athena2EndpointUriAssembler.java          |  7 +++----
 .../camel/component/aws2/cw/Cw2EndpointUriAssembler.java  |  7 +++----
 .../component/aws2/ddb/Ddb2EndpointUriAssembler.java      |  7 +++----
 .../aws2/ddbstream/Ddb2StreamEndpointUriAssembler.java    |  7 +++----
 .../component/aws2/ec2/AWS2EC2EndpointUriAssembler.java   |  7 +++----
 .../component/aws2/ecs/ECS2EndpointUriAssembler.java      |  7 +++----
 .../component/aws2/eks/EKS2EndpointUriAssembler.java      |  7 +++----
 .../aws2/eventbridge/EventbridgeEndpointUriAssembler.java |  7 +++----
 .../component/aws2/iam/IAM2EndpointUriAssembler.java      |  7 +++----
 .../firehose/KinesisFirehose2EndpointUriAssembler.java    |  7 +++----
 .../aws2/kinesis/Kinesis2EndpointUriAssembler.java        |  7 +++----
 .../component/aws2/kms/KMS2EndpointUriAssembler.java      |  7 +++----
 .../aws2/lambda/Lambda2EndpointUriAssembler.java          |  7 +++----
 .../camel/component/aws2/mq/MQ2EndpointUriAssembler.java  |  7 +++----
 .../component/aws2/msk/MSK2EndpointUriAssembler.java      |  7 +++----
 .../component/aws2/s3/AWS2S3EndpointUriAssembler.java     |  7 +++----
 .../component/aws2/ses/Ses2EndpointUriAssembler.java      |  7 +++----
 .../component/aws2/sns/Sns2EndpointUriAssembler.java      |  7 +++----
 .../component/aws2/sqs/Sqs2EndpointUriAssembler.java      |  7 +++----
 .../component/aws2/sts/STS2EndpointUriAssembler.java      |  7 +++----
 .../aws2/translate/Translate2EndpointUriAssembler.java    |  7 +++----
 .../azure/eventhubs/EventHubsEndpointUriAssembler.java    |  9 ++++-----
 .../azure/storage/blob/BlobEndpointUriAssembler.java      |  9 ++++-----
 .../azure/storage/queue/QueueEndpointUriAssembler.java    |  9 ++++-----
 .../azure/blob/BlobServiceEndpointUriAssembler.java       |  7 +++----
 .../azure/queue/QueueServiceEndpointUriAssembler.java     |  7 +++----
 .../bean/validator/BeanValidatorEndpointUriAssembler.java |  7 +++----
 .../camel/component/bean/BeanEndpointUriAssembler.java    |  7 +++----
 .../component/beanclass/ClassEndpointUriAssembler.java    |  7 +++----
 .../beanstalk/BeanstalkEndpointUriAssembler.java          |  7 +++----
 .../component/bonita/BonitaEndpointUriAssembler.java      |  7 +++----
 .../camel/component/box/BoxEndpointUriAssembler.java      |  9 ++++-----
 .../braintree/BraintreeEndpointUriAssembler.java          |  9 ++++-----
 .../component/browse/BrowseEndpointUriAssembler.java      |  7 +++----
 .../caffeine/cache/CaffeineCacheEndpointUriAssembler.java |  7 +++----
 .../load/CaffeineLoadCacheEndpointUriAssembler.java       |  7 +++----
 .../cassandra/CassandraEndpointUriAssembler.java          | 13 ++++++-------
 .../chatscript/ChatScriptEndpointUriAssembler.java        | 11 +++++------
 .../camel/component/chunk/ChunkEndpointUriAssembler.java  |  7 +++----
 .../apache/camel/component/cm/CMEndpointUriAssembler.java |  7 +++----
 .../camel/component/cmis/CMISEndpointUriAssembler.java    |  7 +++----
 .../org/apache/camel/coap/CoAPEndpointUriAssembler.java   |  7 +++----
 .../component/cometd/CometdEndpointUriAssembler.java      | 11 +++++------
 .../component/consul/ConsulEndpointUriAssembler.java      |  7 +++----
 .../controlbus/ControlBusEndpointUriAssembler.java        |  9 ++++-----
 .../camel/component/corda/CordaEndpointUriAssembler.java  |  7 +++----
 .../couchbase/CouchbaseEndpointUriAssembler.java          | 11 +++++------
 .../component/couchdb/CouchDbEndpointUriAssembler.java    | 13 ++++++-------
 .../camel/component/cron/CronEndpointUriAssembler.java    |  7 +++----
 .../crypto/cms/CryptoCmsEndpointUriAssembler.java         |  9 ++++-----
 .../crypto/DigitalSignatureEndpointUriAssembler.java      |  9 ++++-----
 .../camel/component/cxf/CxfEndpointUriAssembler.java      |  9 ++++-----
 .../component/cxf/jaxrs/CxfRsEndpointUriAssembler.java    |  9 ++++-----
 .../dataformat/DataFormatEndpointUriAssembler.java        |  9 ++++-----
 .../component/dataset/DataSetEndpointUriAssembler.java    |  7 +++----
 .../dataset/DataSetTestEndpointUriAssembler.java          |  7 +++----
 .../debezium/DebeziumMongodbEndpointUriAssembler.java     |  7 +++----
 .../debezium/DebeziumMySqlEndpointUriAssembler.java       |  7 +++----
 .../debezium/DebeziumPostgresEndpointUriAssembler.java    |  7 +++----
 .../debezium/DebeziumSqlserverEndpointUriAssembler.java   |  7 +++----
 .../digitalocean/DigitalOceanEndpointUriAssembler.java    |  7 +++----
 .../component/direct/DirectEndpointUriAssembler.java      |  7 +++----
 .../component/directvm/DirectVmEndpointUriAssembler.java  |  7 +++----
 .../disruptor/DisruptorEndpointUriAssembler.java          |  7 +++----
 .../disruptor/vm/DisruptorVmEndpointUriAssembler.java     |  7 +++----
 .../camel/component/djl/DJLEndpointUriAssembler.java      |  7 +++----
 .../camel/component/dns/DnsEndpointUriAssembler.java      |  7 +++----
 .../component/docker/DockerEndpointUriAssembler.java      |  7 +++----
 .../camel/component/dozer/DozerEndpointUriAssembler.java  |  7 +++----
 .../camel/component/drill/DrillEndpointUriAssembler.java  |  7 +++----
 .../component/dropbox/DropboxEndpointUriAssembler.java    |  7 +++----
 .../component/ehcache/EhcacheEndpointUriAssembler.java    |  7 +++----
 .../elasticsearch/ElasticsearchEndpointUriAssembler.java  |  7 +++----
 .../camel/component/elsql/ElsqlEndpointUriAssembler.java  |  9 ++++-----
 .../component/etcd/EtcdKeysEndpointUriAssembler.java      |  7 +++----
 .../component/etcd/EtcdStatsEndpointUriAssembler.java     |  7 +++----
 .../component/etcd/EtcdWatchEndpointUriAssembler.java     |  7 +++----
 .../camel/component/exec/ExecEndpointUriAssembler.java    |  7 +++----
 .../component/facebook/FacebookEndpointUriAssembler.java  |  7 +++----
 .../camel/component/fhir/FhirEndpointUriAssembler.java    |  9 ++++-----
 .../file/watch/FileWatchEndpointUriAssembler.java         |  7 +++----
 .../camel/component/file/FileEndpointUriAssembler.java    |  7 +++----
 .../component/flatpack/FlatpackEndpointUriAssembler.java  |  9 ++++-----
 .../camel/component/flink/FlinkEndpointUriAssembler.java  |  7 +++----
 .../camel/component/fop/FopEndpointUriAssembler.java      |  7 +++----
 .../freemarker/FreemarkerEndpointUriAssembler.java        |  7 +++----
 .../component/file/remote/FtpEndpointUriAssembler.java    | 11 +++++------
 .../component/file/remote/FtpsEndpointUriAssembler.java   | 11 +++++------
 .../component/file/remote/SftpEndpointUriAssembler.java   | 11 +++++------
 .../component/ganglia/GangliaEndpointUriAssembler.java    |  9 ++++-----
 .../component/geocoder/GeoCoderEndpointUriAssembler.java  |  9 ++++-----
 .../camel/component/git/GitEndpointUriAssembler.java      |  7 +++----
 .../component/github/GitHubEndpointUriAssembler.java      |  9 ++++-----
 .../bigquery/GoogleBigQueryEndpointUriAssembler.java      | 11 +++++------
 .../sql/GoogleBigQuerySQLEndpointUriAssembler.java        |  9 ++++-----
 .../calendar/GoogleCalendarEndpointUriAssembler.java      |  9 ++++-----
 .../stream/GoogleCalendarStreamEndpointUriAssembler.java  |  7 +++----
 .../google/drive/GoogleDriveEndpointUriAssembler.java     |  9 ++++-----
 .../google/mail/GoogleMailEndpointUriAssembler.java       |  9 ++++-----
 .../mail/stream/GoogleMailStreamEndpointUriAssembler.java |  7 +++----
 .../google/pubsub/GooglePubsubEndpointUriAssembler.java   |  9 ++++-----
 .../google/sheets/GoogleSheetsEndpointUriAssembler.java   |  9 ++++-----
 .../stream/GoogleSheetsStreamEndpointUriAssembler.java    |  7 +++----
 .../camel/component/gora/GoraEndpointUriAssembler.java    |  7 +++----
 .../camel/component/grape/GrapeEndpointUriAssembler.java  |  7 +++----
 .../component/graphql/GraphqlEndpointUriAssembler.java    |  7 +++----
 .../camel/component/grpc/GrpcEndpointUriAssembler.java    | 11 +++++------
 .../guava/eventbus/GuavaEventBusEndpointUriAssembler.java |  7 +++----
 .../HazelcastAtomicnumberEndpointUriAssembler.java        |  7 +++----
 .../instance/HazelcastInstanceEndpointUriAssembler.java   |  7 +++----
 .../hazelcast/list/HazelcastListEndpointUriAssembler.java |  7 +++----
 .../hazelcast/map/HazelcastMapEndpointUriAssembler.java   |  7 +++----
 .../multimap/HazelcastMultimapEndpointUriAssembler.java   |  7 +++----
 .../queue/HazelcastQueueEndpointUriAssembler.java         |  7 +++----
 .../HazelcastReplicatedmapEndpointUriAssembler.java       |  7 +++----
 .../HazelcastRingbufferEndpointUriAssembler.java          |  7 +++----
 .../hazelcast/seda/HazelcastSedaEndpointUriAssembler.java |  7 +++----
 .../hazelcast/set/HazelcastSetEndpointUriAssembler.java   |  7 +++----
 .../topic/HazelcastTopicEndpointUriAssembler.java         |  7 +++----
 .../camel/component/hbase/HBaseEndpointUriAssembler.java  |  7 +++----
 .../camel/component/hdfs/HdfsEndpointUriAssembler.java    | 11 +++++------
 .../component/hipchat/HipchatEndpointUriAssembler.java    | 11 +++++------
 .../camel/component/http/HttpEndpointUriAssembler.java    |  7 +++----
 .../iec60870/client/ClientEndpointUriAssembler.java       |  7 +++----
 .../iec60870/server/ServerEndpointUriAssembler.java       |  7 +++----
 .../infinispan/InfinispanEndpointUriAssembler.java        |  7 +++----
 .../component/influxdb/InfluxDbEndpointUriAssembler.java  |  7 +++----
 .../camel/component/iota/IOTAEndpointUriAssembler.java    |  7 +++----
 .../camel/component/ipfs/IPFSEndpointUriAssembler.java    |  7 +++----
 .../camel/component/irc/IrcEndpointUriAssembler.java      |  9 ++++-----
 .../component/ironmq/IronMQEndpointUriAssembler.java      |  7 +++----
 .../camel/component/jbpm/JBPMEndpointUriAssembler.java    |  9 ++++-----
 .../component/jcache/JCacheEndpointUriAssembler.java      |  7 +++----
 .../component/jclouds/JcloudsEndpointUriAssembler.java    |  9 ++++-----
 .../camel/component/jcr/JcrEndpointUriAssembler.java      |  9 ++++-----
 .../camel/component/jdbc/JdbcEndpointUriAssembler.java    |  7 +++----
 .../component/jetty9/JettyHttp9EndpointUriAssembler.java  |  7 +++----
 .../jgroups/raft/JGroupsRaftEndpointUriAssembler.java     |  7 +++----
 .../component/jgroups/JGroupsEndpointUriAssembler.java    |  7 +++----
 .../validator/jing/JingEndpointUriAssembler.java          |  7 +++----
 .../camel/component/jira/JiraEndpointUriAssembler.java    |  7 +++----
 .../camel/component/jms/JmsEndpointUriAssembler.java      |  9 ++++-----
 .../camel/component/jmx/JMXEndpointUriAssembler.java      |  7 +++----
 .../camel/component/jolt/JoltEndpointUriAssembler.java    |  7 +++----
 .../camel/component/jooq/JooqEndpointUriAssembler.java    |  7 +++----
 .../camel/component/jpa/JpaEndpointUriAssembler.java      |  7 +++----
 .../camel/component/scp/ScpEndpointUriAssembler.java      | 11 +++++------
 .../camel/component/jslt/JsltEndpointUriAssembler.java    |  7 +++----
 .../jsonvalidator/JsonValidatorEndpointUriAssembler.java  |  7 +++----
 .../component/jsonata/JsonataEndpointUriAssembler.java    |  7 +++----
 .../camel/component/jt400/Jt400EndpointUriAssembler.java  | 15 +++++++--------
 .../camel/component/kafka/KafkaEndpointUriAssembler.java  |  7 +++----
 .../KubernetesConfigMapsEndpointUriAssembler.java         |  7 +++----
 .../KubernetesDeploymentsEndpointUriAssembler.java        |  7 +++----
 .../kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java |  7 +++----
 .../kubernetes/job/KubernetesJobEndpointUriAssembler.java |  7 +++----
 .../KubernetesNamespacesEndpointUriAssembler.java         |  7 +++----
 .../nodes/KubernetesNodesEndpointUriAssembler.java        |  7 +++----
 .../KubernetesPersistentVolumesEndpointUriAssembler.java  |  7 +++----
 ...rnetesPersistentVolumesClaimsEndpointUriAssembler.java |  7 +++----
 .../pods/KubernetesPodsEndpointUriAssembler.java          |  7 +++----
 ...ernetesReplicationControllersEndpointUriAssembler.java |  7 +++----
 .../KubernetesResourcesQuotaEndpointUriAssembler.java     |  7 +++----
 .../secrets/KubernetesSecretsEndpointUriAssembler.java    |  7 +++----
 .../KubernetesServiceAccountsEndpointUriAssembler.java    |  7 +++----
 .../services/KubernetesServicesEndpointUriAssembler.java  |  7 +++----
 .../OpenshiftBuildConfigsEndpointUriAssembler.java        |  7 +++----
 .../builds/OpenshiftBuildsEndpointUriAssembler.java       |  7 +++----
 .../camel/component/kudu/KuduEndpointUriAssembler.java    | 11 +++++------
 .../component/language/LanguageEndpointUriAssembler.java  |  9 ++++-----
 .../camel/component/ldap/LdapEndpointUriAssembler.java    |  7 +++----
 .../camel/component/ldif/LdifEndpointUriAssembler.java    |  7 +++----
 .../camel/component/log/LogEndpointUriAssembler.java      |  7 +++----
 .../component/lucene/LuceneEndpointUriAssembler.java      |  9 ++++-----
 .../lumberjack/LumberjackEndpointUriAssembler.java        |  9 ++++-----
 .../camel/component/mail/MailEndpointUriAssembler.java    |  9 ++++-----
 .../component/master/MasterEndpointUriAssembler.java      |  9 ++++-----
 .../component/metrics/MetricsEndpointUriAssembler.java    |  9 ++++-----
 .../micrometer/MicrometerEndpointUriAssembler.java        | 11 +++++------
 .../metrics/MicroProfileMetricsEndpointUriAssembler.java  |  9 ++++-----
 .../milo/client/MiloClientEndpointUriAssembler.java       |  7 +++----
 .../milo/server/MiloServerEndpointUriAssembler.java       |  7 +++----
 .../camel/component/mina/MinaEndpointUriAssembler.java    | 11 +++++------
 .../camel/component/minio/MinioEndpointUriAssembler.java  |  7 +++----
 .../camel/component/mllp/MllpEndpointUriAssembler.java    |  9 ++++-----
 .../camel/component/mock/MockEndpointUriAssembler.java    |  7 +++----
 .../mongodb/gridfs/GridFsEndpointUriAssembler.java        |  7 +++----
 .../component/mongodb/MongoDbEndpointUriAssembler.java    |  7 +++----
 .../component/validator/msv/MsvEndpointUriAssembler.java  |  7 +++----
 .../component/mustache/MustacheEndpointUriAssembler.java  |  7 +++----
 .../camel/component/mvel/MvelEndpointUriAssembler.java    |  7 +++----
 .../mybatis/MyBatisBeanEndpointUriAssembler.java          |  9 ++++-----
 .../component/mybatis/MyBatisEndpointUriAssembler.java    |  7 +++----
 .../component/nagios/NagiosEndpointUriAssembler.java      |  9 ++++-----
 .../camel/component/nats/NatsEndpointUriAssembler.java    |  7 +++----
 .../netty/http/NettyHttpEndpointUriAssembler.java         | 13 ++++++-------
 .../netty/http/NettyHttpEndpointUriAssemblerTest.java     | 10 +++++-----
 .../camel/component/netty/NettyEndpointUriAssembler.java  | 11 +++++------
 .../component/nitrite/NitriteEndpointUriAssembler.java    |  7 +++----
 .../camel/component/nsq/NsqEndpointUriAssembler.java      |  7 +++----
 .../oaipmh/component/OAIPMHEndpointUriAssembler.java      |  7 +++----
 .../component/olingo2/Olingo2EndpointUriAssembler.java    |  9 ++++-----
 .../component/olingo4/Olingo4EndpointUriAssembler.java    |  9 ++++-----
 .../openstack/cinder/CinderEndpointUriAssembler.java      |  7 +++----
 .../openstack/glance/GlanceEndpointUriAssembler.java      |  7 +++----
 .../openstack/keystone/KeystoneEndpointUriAssembler.java  |  7 +++----
 .../openstack/neutron/NeutronEndpointUriAssembler.java    |  7 +++----
 .../openstack/nova/NovaEndpointUriAssembler.java          |  7 +++----
 .../openstack/swift/SwiftEndpointUriAssembler.java        |  7 +++----
 .../optaplanner/OptaPlannerEndpointUriAssembler.java      |  7 +++----
 .../camel/component/paho/PahoEndpointUriAssembler.java    |  7 +++----
 .../camel/component/pdf/PdfEndpointUriAssembler.java      |  7 +++----
 .../slot/PgReplicationSlotEndpointUriAssembler.java       | 15 +++++++--------
 .../component/pgevent/PgEventEndpointUriAssembler.java    | 13 ++++++-------
 .../platform/http/PlatformHttpEndpointUriAssembler.java   |  7 +++----
 .../component/printer/PrinterEndpointUriAssembler.java    | 11 +++++------
 .../component/pubnub/PubNubEndpointUriAssembler.java      |  7 +++----
 .../component/pulsar/PulsarEndpointUriAssembler.java      | 13 ++++++-------
 .../component/quartz/QuartzEndpointUriAssembler.java      |  9 ++++-----
 .../quickfixj/QuickfixjEndpointUriAssembler.java          |  7 +++----
 .../component/rabbitmq/RabbitMQEndpointUriAssembler.java  |  7 +++----
 .../streams/ReactiveStreamsEndpointUriAssembler.java      |  7 +++----
 .../camel/component/ref/RefEndpointUriAssembler.java      |  7 +++----
 .../rest/openapi/RestOpenApiEndpointUriAssembler.java     |  9 ++++-----
 .../rest/swagger/RestSwaggerEndpointUriAssembler.java     |  9 ++++-----
 .../camel/component/rest/RestApiEndpointUriAssembler.java |  9 ++++-----
 .../camel/component/rest/RestEndpointUriAssembler.java    | 11 +++++------
 .../component/resteasy/ResteasyEndpointUriAssembler.java  |  7 +++----
 .../RobotFrameworkEndpointUriAssembler.java               |  7 +++----
 .../camel/component/rss/RssEndpointUriAssembler.java      |  7 +++----
 .../camel/component/saga/SagaEndpointUriAssembler.java    |  7 +++----
 .../salesforce/SalesforceEndpointUriAssembler.java        |  9 ++++-----
 .../sap/netweaver/NetWeaverEndpointUriAssembler.java      |  7 +++----
 .../component/xquery/XQueryEndpointUriAssembler.java      |  7 +++----
 .../scheduler/SchedulerEndpointUriAssembler.java          |  7 +++----
 .../schematron/SchematronEndpointUriAssembler.java        |  7 +++----
 .../camel/component/seda/SedaEndpointUriAssembler.java    |  7 +++----
 .../component/service/ServiceEndpointUriAssembler.java    |  7 +++----
 .../servicenow/ServiceNowEndpointUriAssembler.java        |  7 +++----
 .../component/servlet/ServletEndpointUriAssembler.java    |  7 +++----
 .../camel/component/sip/SipEndpointUriAssembler.java      |  7 +++----
 .../camel/component/sjms/SjmsEndpointUriAssembler.java    |  9 ++++-----
 .../sjms/batch/SjmsBatchEndpointUriAssembler.java         |  7 +++----
 .../camel/component/sjms2/Sjms2EndpointUriAssembler.java  |  9 ++++-----
 .../camel/component/slack/SlackEndpointUriAssembler.java  |  7 +++----
 .../camel/component/smpp/SmppEndpointUriAssembler.java    |  9 ++++-----
 .../camel/component/snmp/SnmpEndpointUriAssembler.java    |  9 ++++-----
 .../camel/component/solr/SolrEndpointUriAssembler.java    |  7 +++----
 .../component/SoroushBotEndpointUriAssembler.java         |  7 +++----
 .../camel/component/spark/SparkEndpointUriAssembler.java  |  7 +++----
 .../splunkhec/SplunkHECEndpointUriAssembler.java          |  9 ++++-----
 .../component/splunk/SplunkEndpointUriAssembler.java      |  7 +++----
 .../spring/batch/SpringBatchEndpointUriAssembler.java     |  7 +++----
 .../SpringIntegrationEndpointUriAssembler.java            |  7 +++----
 .../springldap/SpringLdapEndpointUriAssembler.java        |  7 +++----
 .../camel/component/redis/RedisEndpointUriAssembler.java  |  9 ++++-----
 .../spring/ws/SpringWebserviceEndpointUriAssembler.java   | 13 ++++++-------
 .../camel/component/event/EventEndpointUriAssembler.java  |  7 +++----
 .../camel/component/sql/SqlEndpointUriAssembler.java      |  7 +++----
 .../sql/stored/SqlStoredEndpointUriAssembler.java         |  7 +++----
 .../camel/component/ssh/SshEndpointUriAssembler.java      |  9 ++++-----
 .../camel/component/stax/StAXEndpointUriAssembler.java    |  7 +++----
 .../camel/component/stomp/StompEndpointUriAssembler.java  |  7 +++----
 .../component/stream/StreamEndpointUriAssembler.java      |  7 +++----
 .../StringTemplateEndpointUriAssembler.java               |  7 +++----
 .../camel/component/stub/StubEndpointUriAssembler.java    |  7 +++----
 .../component/telegram/TelegramEndpointUriAssembler.java  |  7 +++----
 .../component/thrift/ThriftEndpointUriAssembler.java      | 11 +++++------
 .../camel/component/tika/TikaEndpointUriAssembler.java    |  7 +++----
 .../camel/component/timer/TimerEndpointUriAssembler.java  |  7 +++----
 .../component/twilio/TwilioEndpointUriAssembler.java      |  9 ++++-----
 .../TwitterDirectMessageEndpointUriAssembler.java         |  7 +++----
 .../twitter/search/TwitterSearchEndpointUriAssembler.java |  7 +++----
 .../timeline/TwitterTimelineEndpointUriAssembler.java     |  7 +++----
 .../component/undertow/UndertowEndpointUriAssembler.java  |  7 +++----
 .../validator/ValidatorEndpointUriAssembler.java          |  7 +++----
 .../component/velocity/VelocityEndpointUriAssembler.java  |  7 +++----
 .../vertx/http/VertxHttpEndpointUriAssembler.java         |  7 +++----
 .../websocket/VertxWebsocketEndpointUriAssembler.java     | 11 +++++------
 .../camel/component/vertx/VertxEndpointUriAssembler.java  |  7 +++----
 .../apache/camel/component/vm/VmEndpointUriAssembler.java |  7 +++----
 .../component/weather/WeatherEndpointUriAssembler.java    |  7 +++----
 .../camel/component/web3j/Web3jEndpointUriAssembler.java  |  7 +++----
 .../component/webhook/WebhookEndpointUriAssembler.java    |  7 +++----
 .../jsr356/JSR356WebSocketEndpointUriAssembler.java       |  7 +++----
 .../websocket/WebsocketEndpointUriAssembler.java          | 11 +++++------
 .../camel/component/weka/WekaEndpointUriAssembler.java    |  7 +++----
 .../wordpress/WordpressEndpointUriAssembler.java          |  9 ++++-----
 .../component/workday/WorkdayEndpointUriAssembler.java    |  9 ++++-----
 .../component/xchange/XChangeEndpointUriAssembler.java    |  7 +++----
 .../apache/camel/component/xj/XJEndpointUriAssembler.java |  7 +++----
 .../xmlsecurity/XmlSignerEndpointUriAssembler.java        |  7 +++----
 .../xmlsecurity/XmlVerifierEndpointUriAssembler.java      |  7 +++----
 .../camel/component/xmpp/XmppEndpointUriAssembler.java    | 11 +++++------
 .../xslt/saxon/XsltSaxonEndpointUriAssembler.java         |  7 +++----
 .../camel/component/xslt/XsltEndpointUriAssembler.java    |  7 +++----
 .../component/yammer/YammerEndpointUriAssembler.java      |  7 +++----
 .../component/zendesk/ZendeskEndpointUriAssembler.java    |  7 +++----
 .../zookeepermaster/MasterEndpointUriAssembler.java       |  9 ++++-----
 .../zookeeper/ZooKeeperEndpointUriAssembler.java          |  9 ++++-----
 338 files changed, 1148 insertions(+), 1485 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
index cc4d7d2..f4af9dd 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class ActiveMQEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "destinationType", "queue", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index 4f39303..59c22d1 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class WsEndpointUriAssembler extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/AhcEndpointUriAssembler.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointUriAssembler.java
index f1fc2f1..e259d0e 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AhcEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index 5d55534..5fb9cef 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class AMQPEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "destinationType", "queue", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index e7813dd..bbba4aa 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ApnsEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index be54ee0..aa02bdc 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ArangoDbEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "database", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "database", 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/AS2EndpointUriAssembler.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointUriAssembler.java
index 3f19636..976026a 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class AS2EndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index 037a116..3b0f7f4 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AsteriskEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index a59d0f3..8639147 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class AtmosEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index 34f4da9..a27f171 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class WebsocketEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "servicePath", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "servicePath", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index 9cf783a..bf8073f 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "feedUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "feedUri", 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/AtomixMapEndpointUriAssembler.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointUriAssembler.java
index ecb8ce6..ba8db28 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomixMapEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index a7d05ad..de5438a 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomixMessagingEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index 0cbe273..231d8a1 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomixMultiMapEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index cb9e32b..20adcd9 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomixQueueEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index 7c50246..98a92e3 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomixSetEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index 4408526..415d18e 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AtomixValueEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index 34269d7..b48b4bb 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class AvroEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "transport", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "messageName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index c009450..1ad8bc5 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CwEndpointUriAssembler extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "namespace", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "namespace", 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/DdbEndpointUriAssembler.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointUriAssembler.java
index f282dc8..7baa28f 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DdbEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index 5d1bfe1..6901a96 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DdbStreamEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "tableName", 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/EC2EndpointUriAssembler.java b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointUriAssembler.java
index 4a92ad5..5b4327b 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EC2EndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/ECSEndpointUriAssembler.java b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointUriAssembler.java
index a83dd6f..e3ceb37 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ECSEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/EKSEndpointUriAssembler.java b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointUriAssembler.java
index c0baa5f..ffefd0e 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EKSEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/IAMEndpointUriAssembler.java b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointUriAssembler.java
index 4eb5800..1ec46c5 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class IAMEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", 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/KinesisFirehoseEndpointUriAssembler.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointUriAssembler.java
index 5a639ee..f6d681d 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KinesisFirehoseEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index 784685b..da4468a 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KinesisEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "streamName", 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/KMSEndpointUriAssembler.java b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointUriAssembler.java
index caef2ad..e9d39a1 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KMSEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", 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/LambdaEndpointUriAssembler.java b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointUriAssembler.java
index dc8b80d..18c219f 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class LambdaEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "function", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "function", 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/MQEndpointUriAssembler.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointUriAssembler.java
index aeaa610..537c8fe 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MQEndpointUriAssembler extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/MSKEndpointUriAssembler.java b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointUriAssembler.java
index 464b523..5c721ae 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MSKEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", 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/S3EndpointUriAssembler.java b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointUriAssembler.java
index eacb7d9..acdb5c8 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class S3EndpointUriAssembler extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "bucketNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "bucketNameOrArn", 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/SdbEndpointUriAssembler.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointUriAssembler.java
index fb3e745..3363d4d 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SdbEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "domainName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "domainName", 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/SesEndpointUriAssembler.java b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointUriAssembler.java
index 924b4e8..3edf071 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SesEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "from", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "from", 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/SnsEndpointUriAssembler.java b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointUriAssembler.java
index 640c896..a7a147f 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SnsEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "topicNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "topicNameOrArn", 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/SqsEndpointUriAssembler.java b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointUriAssembler.java
index f350cfd..d06b3ec 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SqsEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "queueNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "queueNameOrArn", 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/SWFEndpointUriAssembler.java b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointUriAssembler.java
index 8d8028b..59c13b2 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SWFEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "type", 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/TranslateEndpointUriAssembler.java b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointUriAssembler.java
index 863cd4e..6ce19aa 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TranslateEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/Athena2EndpointUriAssembler.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointUriAssembler.java
index 0d42591..cfe4a58 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Athena2EndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", 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/Cw2EndpointUriAssembler.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointUriAssembler.java
index df65548..39cdcd8 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Cw2EndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "namespace", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "namespace", 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/Ddb2EndpointUriAssembler.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointUriAssembler.java
index a68bd50..54d442f 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Ddb2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index 406760a..63989fa 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Ddb2StreamEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "tableName", 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/AWS2EC2EndpointUriAssembler.java b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointUriAssembler.java
index f7037d8..b9f81a5 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AWS2EC2EndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/ECS2EndpointUriAssembler.java b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointUriAssembler.java
index 12ee54a..85227c4 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ECS2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/EKS2EndpointUriAssembler.java b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointUriAssembler.java
index dbdc5e0..5eaf045 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EKS2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", 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/EventbridgeEndpointUriAssembler.java b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointUriAssembler.java
index 1414940..bd0edf2 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EventbridgeEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "eventbusNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "eventbusNameOrArn", 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/IAM2EndpointUriAssembler.java b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointUriAssembler.java
index fb79b78..342092b 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class IAM2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", 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/KinesisFirehose2EndpointUriAssembler.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointUriAssembler.java
index 8a30a5e..f6fbaa7 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KinesisFirehose2EndpointUriAssembler extends org.apache.camel.suppo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index 4db49ad..84a2137 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Kinesis2EndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "streamName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "streamName", 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/KMS2EndpointUriAssembler.java b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointUriAssembler.java
index f90d86879..99c4fca 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KMS2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", 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/Lambda2EndpointUriAssembler.java b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointUriAssembler.java
index ede2c1c..f538530 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Lambda2EndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "function", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "function", 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/MQ2EndpointUriAssembler.java b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointUriAssembler.java
index 1d09ffd..fd63e22 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MQ2EndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/MSK2EndpointUriAssembler.java b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointUriAssembler.java
index 5ebb783..a9094e9 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MSK2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", 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/AWS2S3EndpointUriAssembler.java b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointUriAssembler.java
index f0d4d05..5d6b83d 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class AWS2S3EndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "bucketNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "bucketNameOrArn", 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/Ses2EndpointUriAssembler.java b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointUriAssembler.java
index 7c7df70..a1224a9 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Ses2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "from", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "from", 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/Sns2EndpointUriAssembler.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointUriAssembler.java
index 1db411f..64b8a50 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Sns2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "topicNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "topicNameOrArn", 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/Sqs2EndpointUriAssembler.java b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointUriAssembler.java
index f83c79c..b723d14 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Sqs2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "queueNameOrArn", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "queueNameOrArn", 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/STS2EndpointUriAssembler.java b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointUriAssembler.java
index 653a84f..1bdf770 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class STS2EndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/Translate2EndpointUriAssembler.java b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointUriAssembler.java
index 6c69084..f5167f4 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class Translate2EndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index 648518a..186fde1 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class EventHubsEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "namespace", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "eventHubName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index da89721..23b13d7 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class BlobEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "accountName", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "containerName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index 0d59393..e07b51a 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class QueueEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "accountName", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "queueName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/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
index 52465c2..97d5514 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class BlobServiceEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "containerOrBlobUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index 6ccc7e9..285b1ca 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class QueueServiceEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "containerAndQueueUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "containerAndQueueUri", 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/BeanValidatorEndpointUriAssembler.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointUriAssembler.java
index 540328d..812b716 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class BeanValidatorEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "label", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index 2e25661..dbb093f 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class BeanEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "beanName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index e23779f..15ee8c2 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ClassEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "beanName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "beanName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index ffd0839..674aa16 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class BeanstalkEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "connectionSettings", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "connectionSettings", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index 303cab7..1a26407 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class BonitaEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operation", 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/BoxEndpointUriAssembler.java b/components/camel-box/camel-box-component/src/generated/java/org/apache/camel/component/box/BoxEndpointUriAssembler.java
index 505b08e..4a992a0 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class BoxEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/BraintreeEndpointUriAssembler.java b/components/camel-braintree/src/generated/java/org/apache/camel/component/braintree/BraintreeEndpointUriAssembler.java
index 7e252a0..7851114 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class BraintreeEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index d9852da..ff0f401 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class BrowseEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index 59ed359..d1d412b 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CaffeineCacheEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index 1c9ab37..c4a4c93 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CaffeineLoadCacheEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index ad0c8da..609d9d6 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class CassandraEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "beanRef", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "hosts", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "keyspace", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index a10f8a4..89cfd6c 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class ChatScriptEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "1024", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "botName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index 3635df9..8e6ba17 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ChunkEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index 908cdc2..4858aa7 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CMEndpointUriAssembler extends org.apache.camel.support.component.E
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index 7afade4..ed65396 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CMISEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cmsUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cmsUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index c24f284..ea4749b 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class CoAPEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "uri", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "uri", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index 44a0f5a..c507424 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,16 +26,16 @@ public class CometdEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "channelName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index 12c9ff5..3f2ea51 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ConsulEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiEndpoint", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiEndpoint", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index bb26fae..87e9707 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class ControlBusEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "command", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "language", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index cdcdb11..6a93dbb 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CordaEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "node", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "node", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index 8c516cd..2adeea4 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class CouchbaseEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "8091", false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index 0450ab1..d8fa528 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class CouchDbEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5984", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index 874a323..d725d9d 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CronEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, 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/CryptoCmsEndpointUriAssembler.java b/components/camel-crypto-cms/src/generated/java/org/apache/camel/component/crypto/cms/CryptoCmsEndpointUriAssembler.java
index 284d05c..2708f70 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class CryptoCmsEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cryptoOperation", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/DigitalSignatureEndpointUriAssembler.java b/components/camel-crypto/src/generated/java/org/apache/camel/component/crypto/DigitalSignatureEndpointUriAssembler.java
index 535c5c0..57a4412 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class DigitalSignatureEndpointUriAssembler extends org.apache.camel.suppo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cryptoOperation", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index 9956a0e..099dcd0 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class CxfEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "beanId", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index 564cc13..61dac40 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class CxfRsEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "beanId", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index 527347b..cdf7d0e 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class DataFormatEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-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
index f7091a2..e4a6d0a 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DataSetEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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
index 3e6d813..147aafa 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DataSetTestEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/DebeziumMongodbEndpointUriAssembler.java b/components/camel-debezium-mongodb/src/generated/java/org/apache/camel/component/debezium/DebeziumMongodbEndpointUriAssembler.java
index f7fd574..3a65791 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DebeziumMongodbEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/DebeziumMySqlEndpointUriAssembler.java b/components/camel-debezium-mysql/src/generated/java/org/apache/camel/component/debezium/DebeziumMySqlEndpointUriAssembler.java
index 39a39ec..0bdf7b6 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DebeziumMySqlEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/DebeziumPostgresEndpointUriAssembler.java b/components/camel-debezium-postgres/src/generated/java/org/apache/camel/component/debezium/DebeziumPostgresEndpointUriAssembler.java
index a7176c8..4ffad3e 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DebeziumPostgresEndpointUriAssembler extends org.apache.camel.suppo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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/DebeziumSqlserverEndpointUriAssembler.java b/components/camel-debezium-sqlserver/src/generated/java/org/apache/camel/component/debezium/DebeziumSqlserverEndpointUriAssembler.java
index da59ea3..21569e7 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DebeziumSqlserverEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index 8b183cf..c51cbcc 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DigitalOceanEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "operation", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
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
index d6f0b3f..37a34f7 100644
--- 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
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DirectEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java b/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java
index 3b632d5..c8b2b38 100644
--- a/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java
+++ b/components/camel-directvm/src/generated/java/org/apache/camel/component/directvm/DirectVmEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DirectVmEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java
index 134bac2..c973e3a 100644
--- a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java
+++ b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/DisruptorEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class DisruptorEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java
index 3e9ebb303..a4c610b 100644
--- a/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java
+++ b/components/camel-disruptor/src/generated/java/org/apache/camel/component/disruptor/vm/DisruptorVmEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class DisruptorVmEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java b/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java
index 1d099d3..9f69c00 100644
--- a/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java
+++ b/components/camel-djl/src/generated/java/org/apache/camel/component/djl/DJLEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DJLEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "application", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "application", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java b/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java
index 99e2443..1b32901 100644
--- a/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java
+++ b/components/camel-dns/src/generated/java/org/apache/camel/component/dns/DnsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DnsEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "dnsType", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "dnsType", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java b/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java
index 016ad4d..7114037 100644
--- a/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java
+++ b/components/camel-docker/src/generated/java/org/apache/camel/component/docker/DockerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DockerEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java b/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java
index 7c8071c..516850a 100644
--- a/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java
+++ b/components/camel-dozer/src/generated/java/org/apache/camel/component/dozer/DozerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DozerEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java b/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java
index 647a64b..4471a17 100644
--- a/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java
+++ b/components/camel-drill/src/generated/java/org/apache/camel/component/drill/DrillEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DrillEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java b/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java
index 2838407..928da7a 100644
--- a/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java
+++ b/components/camel-dropbox/src/generated/java/org/apache/camel/component/dropbox/DropboxEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class DropboxEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java b/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java
index f486280..85ae5e4 100644
--- a/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java
+++ b/components/camel-ehcache/src/generated/java/org/apache/camel/component/ehcache/EhcacheEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EhcacheEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java b/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java
index 6cc6ff2..6a1ed44 100644
--- a/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java
+++ b/components/camel-elasticsearch-rest/src/generated/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ElasticsearchEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "clusterName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "clusterName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java
index 50390d1..51d23a9 100644
--- a/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java
+++ b/components/camel-elsql/src/generated/java/org/apache/camel/component/elsql/ElsqlEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class ElsqlEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "elsqlName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "elsqlName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java
index eeb29f4..4108534 100644
--- a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdKeysEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EtcdKeysEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java
index 0c31af7..35caf3c 100644
--- a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdStatsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EtcdStatsEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java
index de1fd22..58aa28f 100644
--- a/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java
+++ b/components/camel-etcd/src/generated/java/org/apache/camel/component/etcd/EtcdWatchEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EtcdWatchEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java b/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java
index c631646..1b4d824 100644
--- a/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java
+++ b/components/camel-exec/src/generated/java/org/apache/camel/component/exec/ExecEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ExecEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "executable", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "executable", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java b/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java
index 8ba4a95..52c14e0 100644
--- a/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java
+++ b/components/camel-facebook/src/generated/java/org/apache/camel/component/facebook/FacebookEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class FacebookEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java
index 0ab3b63..77ff307 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java
+++ b/components/camel-fhir/camel-fhir-component/src/generated/java/org/apache/camel/component/fhir/FhirEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class FhirEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java b/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java
index d79a31d..8ca9a9f 100644
--- a/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java
+++ b/components/camel-file-watch/src/generated/java/org/apache/camel/component/file/watch/FileWatchEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class FileWatchEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java b/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java
index 84d0015..d06e0ff 100644
--- a/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java
+++ b/components/camel-file/src/generated/java/org/apache/camel/component/file/FileEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class FileEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "directoryName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "directoryName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java b/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java
index 75ef7e9..2187f46 100644
--- a/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java
+++ b/components/camel-flatpack/src/generated/java/org/apache/camel/component/flatpack/FlatpackEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class FlatpackEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "type", "delim", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "type", "delim", false, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java b/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java
index f56f5ba..f06abbb 100644
--- a/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java
+++ b/components/camel-flink/src/generated/java/org/apache/camel/component/flink/FlinkEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class FlinkEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "endpointType", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "endpointType", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java b/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java
index 7f0f52f..78d3d4d 100644
--- a/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java
+++ b/components/camel-fop/src/generated/java/org/apache/camel/component/fop/FopEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class FopEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "outputType", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "outputType", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java b/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java
index fd2625e..b46a3e6 100644
--- a/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java
+++ b/components/camel-freemarker/src/generated/java/org/apache/camel/component/freemarker/FreemarkerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class FreemarkerEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java
index dc27045..0fedc33 100644
--- a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class FtpEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "directoryName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java
index d288c97..36f7a12 100644
--- a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/FtpsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class FtpsEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "directoryName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java
index db02b43..26ae39c 100644
--- a/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java
+++ b/components/camel-ftp/src/generated/java/org/apache/camel/component/file/remote/SftpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class SftpEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "directoryName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java b/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java
index b6cec0f..c6b5ed0 100644
--- a/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java
+++ b/components/camel-ganglia/src/generated/java/org/apache/camel/component/ganglia/GangliaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GangliaEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", "239.2.11.71", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "8649", false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", "239.2.11.71", false, copy);
+        uri = buildPathParameter(syntax, uri, "port", "8649", false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java b/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java
index 8122958..270ee7e 100644
--- a/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java
+++ b/components/camel-geocoder/src/generated/java/org/apache/camel/component/geocoder/GeoCoderEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GeoCoderEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "address", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "latlng", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "address", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "latlng", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java b/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java
index a3e2c53..74cf2dd 100644
--- a/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java
+++ b/components/camel-git/src/generated/java/org/apache/camel/component/git/GitEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GitEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "localPath", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "localPath", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java b/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java
index ae91997..3490f05 100644
--- a/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java
+++ b/components/camel-github/src/generated/java/org/apache/camel/component/github/GitHubEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GitHubEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "type", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "branchName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "type", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "branchName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java
index 3121723..1f8261b 100644
--- a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java
+++ b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/GoogleBigQueryEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class GoogleBigQueryEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "projectId", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "datasetId", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "tableId", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "projectId", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "datasetId", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "tableId", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java
index b2987b7..78fd6fe 100644
--- a/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java
+++ b/components/camel-google-bigquery/src/generated/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GoogleBigQuerySQLEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "query", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "query", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "projectId", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java
index 0ab9542..c2ec648 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/GoogleCalendarEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GoogleCalendarEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java
index 33aeb49..cfd0c56 100644
--- a/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java
+++ b/components/camel-google-calendar/src/generated/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GoogleCalendarStreamEndpointUriAssembler extends org.apache.camel.s
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "index", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "index", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java
index bc41f74..4463d27 100644
--- a/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java
+++ b/components/camel-google-drive/src/generated/java/org/apache/camel/component/google/drive/GoogleDriveEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GoogleDriveEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java
index 79e9b9a..f98abab 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/GoogleMailEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GoogleMailEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java
index 4b1a5a9..df7fce6 100644
--- a/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java
+++ b/components/camel-google-mail/src/generated/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GoogleMailStreamEndpointUriAssembler extends org.apache.camel.suppo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "index", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "index", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java b/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java
index 1d7dc47..6d14b02 100644
--- a/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java
+++ b/components/camel-google-pubsub/src/generated/java/org/apache/camel/component/google/pubsub/GooglePubsubEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GooglePubsubEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "projectId", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "projectId", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java
index 0c5b698..ba8cd3b 100644
--- a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class GoogleSheetsEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java
index f7c9098..99c4966 100644
--- a/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java
+++ b/components/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GoogleSheetsStreamEndpointUriAssembler extends org.apache.camel.sup
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "apiName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java b/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java
index e3cecb0..11976ab 100644
--- a/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java
+++ b/components/camel-gora/src/generated/java/org/apache/camel/component/gora/GoraEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GoraEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java b/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java
index 672ace8..70a7dce 100644
--- a/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java
+++ b/components/camel-grape/src/generated/java/org/apache/camel/component/grape/GrapeEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GrapeEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "defaultCoordinates", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "defaultCoordinates", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java b/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java
index ae1722f..be87571 100644
--- a/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java
+++ b/components/camel-graphql/src/generated/java/org/apache/camel/component/graphql/GraphqlEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GraphqlEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java b/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java
index 4a6fa27..aabe639 100644
--- a/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java
+++ b/components/camel-grpc/src/generated/java/org/apache/camel/component/grpc/GrpcEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class GrpcEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "service", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "service", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java b/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java
index a1edf93..d73b44f 100644
--- a/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java
+++ b/components/camel-guava-eventbus/src/generated/java/org/apache/camel/component/guava/eventbus/GuavaEventBusEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GuavaEventBusEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "eventBusRef", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "eventBusRef", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java
index 6c3c8a2..1822683 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/atomicnumber/HazelcastAtomicnumberEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastAtomicnumberEndpointUriAssembler extends org.apache.camel.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java
index 63636bc..c0f752b 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/instance/HazelcastInstanceEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastInstanceEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java
index 180614d..41d7836 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/list/HazelcastListEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastListEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java
index e417fc9..c62e1be 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/map/HazelcastMapEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastMapEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java
index 6f8a75b..5faf993 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/multimap/HazelcastMultimapEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastMultimapEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java
index 0d67980..d07281a 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastQueueEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java
index 160b0fc..89213cc 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/replicatedmap/HazelcastReplicatedmapEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastReplicatedmapEndpointUriAssembler extends org.apache.camel
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java
index 6bf40d6..d77ef9c 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/ringbuffer/HazelcastRingbufferEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastRingbufferEndpointUriAssembler extends org.apache.camel.su
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java
index 5d7f29c..9261cdd 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastSedaEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java
index efca588..4dc6d76 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/set/HazelcastSetEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastSetEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java
index 88e1560..e360ed9 100644
--- a/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java
+++ b/components/camel-hazelcast/src/generated/java/org/apache/camel/component/hazelcast/topic/HazelcastTopicEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HazelcastTopicEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java b/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java
index 1c204e5..c3c2a41 100644
--- a/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java
+++ b/components/camel-hbase/src/generated/java/org/apache/camel/component/hbase/HBaseEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class HBaseEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "tableName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java b/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java
index bbe13c2..dae686a 100644
--- a/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java
+++ b/components/camel-hdfs/src/generated/java/org/apache/camel/component/hdfs/HdfsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class HdfsEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "hostName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "8020", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "hostName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "8020", false, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java b/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java
index 01f709f..04037c8 100644
--- a/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java
+++ b/components/camel-hipchat/src/generated/java/org/apache/camel/component/hipchat/HipchatEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class HipchatEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "80", false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "80", false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java b/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java
index dca687c..dea96c2 100644
--- a/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java
+++ b/components/camel-http/src/generated/java/org/apache/camel/component/http/HttpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class HttpEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java
index 71fa776..be1825a 100644
--- a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java
+++ b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/client/ClientEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ClientEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "uriPath", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "uriPath", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java
index 4d6ea3d..6a6b1b3 100644
--- a/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java
+++ b/components/camel-iec60870/src/generated/java/org/apache/camel/component/iec60870/server/ServerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ServerEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "uriPath", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "uriPath", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java b/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java
index f556548..3f1b2f9 100644
--- a/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java
+++ b/components/camel-infinispan/src/generated/java/org/apache/camel/component/infinispan/InfinispanEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class InfinispanEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java b/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java
index c5c9a4e..75669ad 100644
--- a/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java
+++ b/components/camel-influxdb/src/generated/java/org/apache/camel/component/influxdb/InfluxDbEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class InfluxDbEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "connectionBean", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "connectionBean", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java b/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java
index 5058e28..921b755 100644
--- a/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java
+++ b/components/camel-iota/src/generated/java/org/apache/camel/component/iota/IOTAEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class IOTAEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java b/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java
index e7ced83..6a101af 100644
--- a/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java
+++ b/components/camel-ipfs/src/generated/java/org/apache/camel/component/ipfs/IPFSEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class IPFSEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "ipfsCmd", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "ipfsCmd", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java b/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java
index 8662018..1898d06 100644
--- a/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java
+++ b/components/camel-irc/src/generated/java/org/apache/camel/component/irc/IrcEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class IrcEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "hostname", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java b/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java
index dfb68d9..905ba17 100644
--- a/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java
+++ b/components/camel-ironmq/src/generated/java/org/apache/camel/component/ironmq/IronMQEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class IronMQEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "queueName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "queueName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java b/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java
index 72daebd..4073171 100644
--- a/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java
+++ b/components/camel-jbpm/src/generated/java/org/apache/camel/component/jbpm/JBPMEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class JBPMEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "connectionURL", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "eventListenerType", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "connectionURL", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "eventListenerType", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java b/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java
index 83e25de..0c64cff 100644
--- a/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java
+++ b/components/camel-jcache/src/generated/java/org/apache/camel/component/jcache/JCacheEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JCacheEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "cacheName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java b/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java
index 16ac847..fb67e72 100644
--- a/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java
+++ b/components/camel-jclouds/src/generated/java/org/apache/camel/component/jclouds/JcloudsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class JcloudsEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "command", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "providerId", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "command", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "providerId", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java b/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java
index 3dee544..dbb4ced 100644
--- a/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java
+++ b/components/camel-jcr/src/generated/java/org/apache/camel/component/jcr/JcrEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class JcrEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "base", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "base", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java b/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java
index 766a881..acdc3ca 100644
--- a/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java
+++ b/components/camel-jdbc/src/generated/java/org/apache/camel/component/jdbc/JdbcEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JdbcEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "dataSourceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "dataSourceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
index bff5b94..d41aaba 100644
--- a/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
+++ b/components/camel-jetty/src/generated/java/org/apache/camel/component/jetty9/JettyHttp9EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JettyHttp9EndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java b/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java
index 3136314..9f228f3 100644
--- a/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java
+++ b/components/camel-jgroups-raft/src/generated/java/org/apache/camel/component/jgroups/raft/JGroupsRaftEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JGroupsRaftEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "clusterName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "clusterName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java b/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java
index c0b58e7..0a16147 100644
--- a/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java
+++ b/components/camel-jgroups/src/generated/java/org/apache/camel/component/jgroups/JGroupsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JGroupsEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "clusterName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "clusterName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java b/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java
index 461fc5f..d197386 100644
--- a/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java
+++ b/components/camel-jing/src/generated/java/org/apache/camel/component/validator/jing/JingEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JingEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java b/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java
index da171e6..baa58cf 100644
--- a/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java
+++ b/components/camel-jira/src/generated/java/org/apache/camel/component/jira/JiraEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JiraEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java
index e220238..7380b20 100644
--- a/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java
+++ b/components/camel-jms/src/generated/java/org/apache/camel/component/jms/JmsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class JmsEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "destinationType", "queue", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java b/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java
index dcb1259..77476fa 100644
--- a/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java
+++ b/components/camel-jmx/src/generated/java/org/apache/camel/component/jmx/JMXEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JMXEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "serverURL", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "serverURL", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java b/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java
index 95be00d..758ac7a 100644
--- a/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java
+++ b/components/camel-jolt/src/generated/java/org/apache/camel/component/jolt/JoltEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JoltEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java b/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java
index 0040731..0abd2ad 100644
--- a/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java
+++ b/components/camel-jooq/src/generated/java/org/apache/camel/component/jooq/JooqEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JooqEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "entityType", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "entityType", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java b/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java
index 3b9e367..4241d9a 100644
--- a/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java
+++ b/components/camel-jpa/src/generated/java/org/apache/camel/component/jpa/JpaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JpaEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "entityType", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "entityType", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java b/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java
index 605e90a..1df870f 100644
--- a/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java
+++ b/components/camel-jsch/src/generated/java/org/apache/camel/component/scp/ScpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class ScpEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "directoryName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java b/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java
index b8152bd..cd27b7e 100644
--- a/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java
+++ b/components/camel-jslt/src/generated/java/org/apache/camel/component/jslt/JsltEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JsltEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java b/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java
index 81b0960..cbcdcd8 100644
--- a/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java
+++ b/components/camel-json-validator/src/generated/java/org/apache/camel/component/jsonvalidator/JsonValidatorEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JsonValidatorEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java b/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java
index 8f9dc52..47579e2 100644
--- a/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java
+++ b/components/camel-jsonata/src/generated/java/org/apache/camel/component/jsonata/JsonataEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class JsonataEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java b/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java
index e1e55fd..cc8d4b0 100644
--- a/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java
+++ b/components/camel-jt400/src/generated/java/org/apache/camel/component/jt400/Jt400EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,18 +20,18 @@ public class Jt400EndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "userID", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "password", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "systemName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "objectPath", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "userID", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "password", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "systemName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "objectPath", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java
index 6a02d71..54165e2 100644
--- a/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java
+++ b/components/camel-kafka/src/generated/java/org/apache/camel/component/kafka/KafkaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KafkaEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java
index 50030a4..f3448a0 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/config_maps/KubernetesConfigMapsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesConfigMapsEndpointUriAssembler extends org.apache.camel.s
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java
index d68fbdd..7d0bcb6 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/deployments/KubernetesDeploymentsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesDeploymentsEndpointUriAssembler extends org.apache.camel.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java
index 82ab880..25f5cbf 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/hpa/KubernetesHPAEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesHPAEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java
index 9d2079d..3b9e082 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/job/KubernetesJobEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesJobEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java
index 2a821cd..cdde84e 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/namespaces/KubernetesNamespacesEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesNamespacesEndpointUriAssembler extends org.apache.camel.s
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java
index 95a6874..b38336f8 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/nodes/KubernetesNodesEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesNodesEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java
index 96c93a2..c5b33a1 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes/KubernetesPersistentVolumesEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesPersistentVolumesEndpointUriAssembler extends org.apache.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java
index 13fd55b..0d2556e 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesPersistentVolumesClaimsEndpointUriAssembler extends org.a
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java
index 5d3467b..9dbbefe 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/pods/KubernetesPodsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesPodsEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java
index afabdbb..fcad2db 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/replication_controllers/KubernetesReplicationControllersEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesReplicationControllersEndpointUriAssembler extends org.ap
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java
index 9a34d36..3898156 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/resources_quota/KubernetesResourcesQuotaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesResourcesQuotaEndpointUriAssembler extends org.apache.cam
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java
index 54973270..f72b5fac 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/secrets/KubernetesSecretsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesSecretsEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java
index 895091a..d20ed27 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/service_accounts/KubernetesServiceAccountsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesServiceAccountsEndpointUriAssembler extends org.apache.ca
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriAssembler.java
index b59db05..dd15074 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/kubernetes/services/KubernetesServicesEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KubernetesServicesEndpointUriAssembler extends org.apache.camel.sup
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriAssembler.java
index 130e6ea..3ecc832 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/build_configs/OpenshiftBuildConfigsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class OpenshiftBuildConfigsEndpointUriAssembler extends org.apache.camel.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriAssembler.java b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriAssembler.java
index 2d7c3af..732044c 100644
--- a/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriAssembler.java
+++ b/components/camel-kubernetes/src/generated/java/org/apache/camel/component/openshift/builds/OpenshiftBuildsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class OpenshiftBuildsEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "masterUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriAssembler.java b/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriAssembler.java
index 5e2259e..d9197fa 100644
--- a/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriAssembler.java
+++ b/components/camel-kudu/src/generated/java/org/apache/camel/component/kudu/KuduEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class KuduEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "tableName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriAssembler.java b/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriAssembler.java
index 354a5c5..b848443 100644
--- a/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriAssembler.java
+++ b/components/camel-language/src/generated/java/org/apache/camel/component/language/LanguageEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class LanguageEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "languageName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "languageName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriAssembler.java b/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriAssembler.java
index b651d8b..d380ebb 100644
--- a/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriAssembler.java
+++ b/components/camel-ldap/src/generated/java/org/apache/camel/component/ldap/LdapEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class LdapEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "dirContextName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "dirContextName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriAssembler.java b/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriAssembler.java
index c7b86f5..c183bd1 100644
--- a/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriAssembler.java
+++ b/components/camel-ldif/src/generated/java/org/apache/camel/component/ldif/LdifEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class LdifEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "ldapConnectionName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "ldapConnectionName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java b/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java
index e18bb4c..27e4a73 100644
--- a/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java
+++ b/components/camel-log/src/generated/java/org/apache/camel/component/log/LogEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class LogEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "loggerName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "loggerName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriAssembler.java b/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriAssembler.java
index ff8b5da..f2099b7 100644
--- a/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriAssembler.java
+++ b/components/camel-lucene/src/generated/java/org/apache/camel/component/lucene/LuceneEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class LuceneEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriAssembler.java b/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriAssembler.java
index c1ae92f..1dc20ed 100644
--- a/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriAssembler.java
+++ b/components/camel-lumberjack/src/generated/java/org/apache/camel/component/lumberjack/LumberjackEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class LumberjackEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5044", false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "5044", false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java b/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java
index 2bcf7d9..e9ba83f 100644
--- a/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java
+++ b/components/camel-mail/src/generated/java/org/apache/camel/component/mail/MailEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,15 +26,15 @@ public class MailEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriAssembler.java b/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriAssembler.java
index df4157b..0b044ea 100644
--- a/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriAssembler.java
+++ b/components/camel-master/src/generated/java/org/apache/camel/component/master/MasterEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class MasterEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "namespace", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "delegateUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "delegateUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriAssembler.java b/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriAssembler.java
index 18bcd3b..c2e767e 100644
--- a/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriAssembler.java
+++ b/components/camel-metrics/src/generated/java/org/apache/camel/component/metrics/MetricsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class MetricsEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "metricsType", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "metricsType", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "metricsName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriAssembler.java b/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriAssembler.java
index 5c6c678..613e331 100644
--- a/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriAssembler.java
+++ b/components/camel-micrometer/src/generated/java/org/apache/camel/component/micrometer/MicrometerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class MicrometerEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "metricsType", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "tags", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "metricsType", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "metricsName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "tags", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriAssembler.java b/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriAssembler.java
index 7311c03..3b98a6d 100644
--- a/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriAssembler.java
+++ b/components/camel-microprofile-metrics/src/generated/java/org/apache/camel/component/microprofile/metrics/MicroProfileMetricsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class MicroProfileMetricsEndpointUriAssembler extends org.apache.camel.su
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "metricType", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "metricName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "metricType", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "metricName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriAssembler.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriAssembler.java
index 60fefaf..d64f557 100644
--- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriAssembler.java
+++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MiloClientEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "endpointUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "endpointUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriAssembler.java b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriAssembler.java
index 40006a4..6d41f6d 100644
--- a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriAssembler.java
+++ b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MiloServerEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "itemId", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "itemId", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriAssembler.java b/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriAssembler.java
index be480b4..1ee6896 100644
--- a/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriAssembler.java
+++ b/components/camel-mina/src/generated/java/org/apache/camel/component/mina/MinaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class MinaEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriAssembler.java b/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriAssembler.java
index 1d35bd1..49547b9 100644
--- a/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriAssembler.java
+++ b/components/camel-minio/src/generated/java/org/apache/camel/component/minio/MinioEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MinioEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "bucketName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "bucketName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriAssembler.java b/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriAssembler.java
index 3deb761..69e852b 100644
--- a/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriAssembler.java
+++ b/components/camel-mllp/src/generated/java/org/apache/camel/component/mllp/MllpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class MllpEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "hostname", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriAssembler.java b/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriAssembler.java
index 754afff..fff7c83 100644
--- a/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriAssembler.java
+++ b/components/camel-mock/src/generated/java/org/apache/camel/component/mock/MockEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MockEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriAssembler.java b/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriAssembler.java
index ed4a9e4..7f20f0a 100644
--- a/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriAssembler.java
+++ b/components/camel-mongodb-gridfs/src/generated/java/org/apache/camel/component/mongodb/gridfs/GridFsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GridFsEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "connectionBean", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "connectionBean", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriAssembler.java b/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriAssembler.java
index 2533c5c..a637b50 100644
--- a/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriAssembler.java
+++ b/components/camel-mongodb/src/generated/java/org/apache/camel/component/mongodb/MongoDbEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MongoDbEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "connectionBean", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "connectionBean", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriAssembler.java b/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriAssembler.java
index 9527d9c..cae3ae5 100644
--- a/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriAssembler.java
+++ b/components/camel-msv/src/generated/java/org/apache/camel/component/validator/msv/MsvEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MsvEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriAssembler.java b/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriAssembler.java
index 6404eb5..1aa6f60 100644
--- a/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriAssembler.java
+++ b/components/camel-mustache/src/generated/java/org/apache/camel/component/mustache/MustacheEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MustacheEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriAssembler.java b/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriAssembler.java
index 78fa78b..a545b02 100644
--- a/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriAssembler.java
+++ b/components/camel-mvel/src/generated/java/org/apache/camel/component/mvel/MvelEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MvelEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriAssembler.java b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriAssembler.java
index 1056b41..cae7de0 100644
--- a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriAssembler.java
+++ b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisBeanEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class MyBatisBeanEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "beanName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "beanName", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriAssembler.java b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriAssembler.java
index ae166c7..f655fbf 100644
--- a/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriAssembler.java
+++ b/components/camel-mybatis/src/generated/java/org/apache/camel/component/mybatis/MyBatisEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class MyBatisEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "statement", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "statement", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriAssembler.java b/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriAssembler.java
index 0b120a3..ee877e0 100644
--- a/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriAssembler.java
+++ b/components/camel-nagios/src/generated/java/org/apache/camel/component/nagios/NagiosEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class NagiosEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriAssembler.java b/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriAssembler.java
index 6f1d913..b39228e 100644
--- a/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriAssembler.java
+++ b/components/camel-nats/src/generated/java/org/apache/camel/component/nats/NatsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class NatsEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
index 0d42779..594021c 100644
--- a/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
+++ b/components/camel-netty-http/src/generated/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class NettyHttpEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java
index 2a8ce1c..219e94d 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java
@@ -38,7 +38,7 @@ public class NettyHttpEndpointUriAssemblerTest extends CamelTestSupport {
         map.put("host", "a-b-c.hostname.tld");
         map.put("port", "8080");
         map.put("path", "anything");
-        String uri = assembler.buildUri(context, "netty-http", map);
+        String uri = assembler.buildUri("netty-http", map);
         assertEquals("netty-http:http:a-b-c.hostname.tld:8080/anything", uri);
 
         map = new LinkedHashMap<>();
@@ -46,7 +46,7 @@ public class NettyHttpEndpointUriAssemblerTest extends CamelTestSupport {
         map.put("host", "a-b-c.server.net");
         map.put("port", "8888");
         map.put("path", "service/v3");
-        uri = assembler.buildUri(context, "netty-http", map);
+        uri = assembler.buildUri("netty-http", map);
         assertEquals("netty-http:http:a-b-c.server.net:8888/service/v3", uri);
 
         map = new HashMap<>();
@@ -57,20 +57,20 @@ public class NettyHttpEndpointUriAssemblerTest extends CamelTestSupport {
         map.put("path", "foo/bar");
         map.put("disconnect", "true");
 
-        uri = assembler.buildUri(context, "netty-http", map);
+        uri = assembler.buildUri("netty-http", map);
         assertEquals("netty-http:http:localhost:8080/foo/bar?disconnect=true", uri);
 
         // lets switch protocol
         map.put("protocol", "https");
 
-        uri = assembler.buildUri(context, "netty-http", map);
+        uri = assembler.buildUri("netty-http", map);
         assertEquals("netty-http:https:localhost:8080/foo/bar?disconnect=true", uri);
 
         // lets set a query parameter in the path
         map.put("path", "foo/bar?verbose=true");
         map.put("disconnect", "true");
 
-        uri = assembler.buildUri(context, "netty-http", map);
+        uri = assembler.buildUri("netty-http", map);
         assertEquals("netty-http:https:localhost:8080/foo/bar?verbose=true&disconnect=true", uri);
     }
 
diff --git a/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriAssembler.java b/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriAssembler.java
index 8352448..b5e360d 100644
--- a/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriAssembler.java
+++ b/components/camel-netty/src/generated/java/org/apache/camel/component/netty/NettyEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class NettyEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "protocol", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "protocol", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriAssembler.java b/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriAssembler.java
index cc2c22d..034eb98 100644
--- a/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriAssembler.java
+++ b/components/camel-nitrite/src/generated/java/org/apache/camel/component/nitrite/NitriteEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class NitriteEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "database", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "database", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriAssembler.java b/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriAssembler.java
index 98fba8d..fb98761 100644
--- a/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriAssembler.java
+++ b/components/camel-nsq/src/generated/java/org/apache/camel/component/nsq/NsqEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class NsqEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriAssembler.java b/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriAssembler.java
index 4d076d9..4a6d846 100644
--- a/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriAssembler.java
+++ b/components/camel-oaipmh/src/generated/java/org/apache/camel/oaipmh/component/OAIPMHEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class OAIPMHEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "baseUrl", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "baseUrl", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriAssembler.java b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriAssembler.java
index 84c55b5..98c861d 100644
--- a/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriAssembler.java
+++ b/components/camel-olingo2/camel-olingo2-component/src/generated/java/org/apache/camel/component/olingo2/Olingo2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class Olingo2EndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriAssembler.java b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriAssembler.java
index b34f7fb..c45c071 100644
--- a/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriAssembler.java
+++ b/components/camel-olingo4/camel-olingo4-component/src/generated/java/org/apache/camel/component/olingo4/Olingo4EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class Olingo4EndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriAssembler.java
index 840fd40..2b8311f 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/cinder/CinderEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class CinderEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriAssembler.java
index 7581a8d..d743d69 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/glance/GlanceEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class GlanceEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriAssembler.java
index 202ac83..d65ccf9 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/keystone/KeystoneEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class KeystoneEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriAssembler.java
index 91416d1..b0d6533 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/neutron/NeutronEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class NeutronEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriAssembler.java
index 86571d0..b9e8905 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/nova/NovaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class NovaEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriAssembler.java b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriAssembler.java
index ea4ed23..709f710 100644
--- a/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriAssembler.java
+++ b/components/camel-openstack/src/generated/java/org/apache/camel/component/openstack/swift/SwiftEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SwiftEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriAssembler.java b/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriAssembler.java
index 6d41946..eb1b35c 100644
--- a/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriAssembler.java
+++ b/components/camel-optaplanner/src/generated/java/org/apache/camel/component/optaplanner/OptaPlannerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class OptaPlannerEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "configFile", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "configFile", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriAssembler.java b/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriAssembler.java
index 8951e60..57b84ce 100644
--- a/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriAssembler.java
+++ b/components/camel-paho/src/generated/java/org/apache/camel/component/paho/PahoEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class PahoEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriAssembler.java b/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriAssembler.java
index 0f45200..a33987b 100644
--- a/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriAssembler.java
+++ b/components/camel-pdf/src/generated/java/org/apache/camel/component/pdf/PdfEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class PdfEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriAssembler.java b/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriAssembler.java
index 979de7b..7602239 100644
--- a/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriAssembler.java
+++ b/components/camel-pg-replication-slot/src/generated/java/org/apache/camel/component/pg/replication/slot/PgReplicationSlotEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,18 +20,18 @@ public class PgReplicationSlotEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "slot", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5432", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "outputPlugin", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "slot", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "host", "localhost", false, copy);
+        uri = buildPathParameter(syntax, uri, "port", "5432", false, copy);
+        uri = buildPathParameter(syntax, uri, "database", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "outputPlugin", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriAssembler.java b/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriAssembler.java
index 96ed10c..df2b9e2 100644
--- a/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriAssembler.java
+++ b/components/camel-pgevent/src/generated/java/org/apache/camel/component/pgevent/PgEventEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class PgEventEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", "localhost", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5432", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", "localhost", false, copy);
+        uri = buildPathParameter(syntax, uri, "port", "5432", false, copy);
+        uri = buildPathParameter(syntax, uri, "database", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "channel", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriAssembler.java b/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriAssembler.java
index 3fc8f15..3a15bc0 100644
--- a/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriAssembler.java
+++ b/components/camel-platform-http/src/generated/java/org/apache/camel/component/platform/http/PlatformHttpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class PlatformHttpEndpointUriAssembler extends org.apache.camel.support.c
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriAssembler.java b/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriAssembler.java
index 341c879..f91157b 100644
--- a/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriAssembler.java
+++ b/components/camel-printer/src/generated/java/org/apache/camel/component/printer/PrinterEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class PrinterEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "hostname", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "printername", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "hostname", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "printername", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriAssembler.java b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriAssembler.java
index 795d589..7808fc1 100644
--- a/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriAssembler.java
+++ b/components/camel-pubnub/src/generated/java/org/apache/camel/component/pubnub/PubNubEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class PubNubEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "channel", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "channel", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriAssembler.java b/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriAssembler.java
index bc7d0c2..de5962a 100644
--- a/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriAssembler.java
+++ b/components/camel-pulsar/src/generated/java/org/apache/camel/component/pulsar/PulsarEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class PulsarEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "persistence", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "tenant", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "persistence", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "tenant", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "namespace", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriAssembler.java b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriAssembler.java
index 0292c44..b4f8c10 100644
--- a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriAssembler.java
+++ b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class QuartzEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "groupName", "Camel", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "triggerName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "groupName", "Camel", false, copy);
+        uri = buildPathParameter(syntax, uri, "triggerName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriAssembler.java b/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriAssembler.java
index 279f4b9..88dd3f1 100644
--- a/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriAssembler.java
+++ b/components/camel-quickfix/src/generated/java/org/apache/camel/component/quickfixj/QuickfixjEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class QuickfixjEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "configurationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "configurationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriAssembler.java b/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriAssembler.java
index 9d4e48b..61b3656 100644
--- a/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriAssembler.java
+++ b/components/camel-rabbitmq/src/generated/java/org/apache/camel/component/rabbitmq/RabbitMQEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class RabbitMQEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "exchangeName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "exchangeName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriAssembler.java b/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriAssembler.java
index 0f794e9..2079719 100644
--- a/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriAssembler.java
+++ b/components/camel-reactive-streams/src/generated/java/org/apache/camel/component/reactive/streams/ReactiveStreamsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ReactiveStreamsEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "stream", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "stream", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriAssembler.java b/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriAssembler.java
index 3b9a8fb..c216664 100644
--- a/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriAssembler.java
+++ b/components/camel-ref/src/generated/java/org/apache/camel/component/ref/RefEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class RefEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriAssembler.java b/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriAssembler.java
index f71e638..ce90a01 100644
--- a/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriAssembler.java
+++ b/components/camel-rest-openapi/src/generated/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class RestOpenApiEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "specificationUri", "openapi.json", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "operationId", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "specificationUri", "openapi.json", false, copy);
+        uri = buildPathParameter(syntax, uri, "operationId", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriAssembler.java b/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriAssembler.java
index 30bdb94..460fc75 100644
--- a/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriAssembler.java
+++ b/components/camel-rest-swagger/src/generated/java/org/apache/camel/component/rest/swagger/RestSwaggerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class RestSwaggerEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "specificationUri", "swagger.json", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "operationId", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "specificationUri", "swagger.json", false, copy);
+        uri = buildPathParameter(syntax, uri, "operationId", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriAssembler.java b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriAssembler.java
index 2afd38e..98a817c 100644
--- a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriAssembler.java
+++ b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestApiEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class RestApiEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "path", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "contextIdPattern", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "contextIdPattern", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriAssembler.java b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriAssembler.java
index 8db0eed..6b99833 100644
--- a/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriAssembler.java
+++ b/components/camel-rest/src/generated/java/org/apache/camel/component/rest/RestEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class RestEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "method", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "uriTemplate", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "method", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "uriTemplate", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriAssembler.java b/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriAssembler.java
index 4b5ec11..8450f9d 100644
--- a/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriAssembler.java
+++ b/components/camel-resteasy/src/generated/java/org/apache/camel/component/resteasy/ResteasyEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ResteasyEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "httpUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriAssembler.java b/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriAssembler.java
index 0f4069b..e899e21 100644
--- a/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriAssembler.java
+++ b/components/camel-robotframework/src/generated/java/org/apache/camel/component/robotframework/RobotFrameworkEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class RobotFrameworkEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriAssembler.java b/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriAssembler.java
index d920fde..0f532d9 100644
--- a/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriAssembler.java
+++ b/components/camel-rss/src/generated/java/org/apache/camel/component/rss/RssEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class RssEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "feedUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "feedUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriAssembler.java b/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriAssembler.java
index 8f5148c..88f882f 100644
--- a/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriAssembler.java
+++ b/components/camel-saga/src/generated/java/org/apache/camel/component/saga/SagaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SagaEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "action", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "action", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriAssembler.java b/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriAssembler.java
index 09f6c5f..dbbffb7 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriAssembler.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class SalesforceEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "operationName", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "topicName", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operationName", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "topicName", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriAssembler.java b/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriAssembler.java
index 5a5c30d..01f6feb 100644
--- a/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriAssembler.java
+++ b/components/camel-sap-netweaver/src/generated/java/org/apache/camel/component/sap/netweaver/NetWeaverEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class NetWeaverEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "url", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "url", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriAssembler.java b/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriAssembler.java
index 134dc3e..ffad6a1 100644
--- a/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriAssembler.java
+++ b/components/camel-saxon/src/generated/java/org/apache/camel/component/xquery/XQueryEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class XQueryEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriAssembler.java b/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriAssembler.java
index 2b0d77c..f0a6c41 100644
--- a/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriAssembler.java
+++ b/components/camel-scheduler/src/generated/java/org/apache/camel/component/scheduler/SchedulerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SchedulerEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriAssembler.java b/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriAssembler.java
index 701e003..2957912 100644
--- a/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriAssembler.java
+++ b/components/camel-schematron/src/generated/java/org/apache/camel/component/schematron/SchematronEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SchematronEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "path", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriAssembler.java b/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriAssembler.java
index c70d641..9e6563b 100644
--- a/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriAssembler.java
+++ b/components/camel-seda/src/generated/java/org/apache/camel/component/seda/SedaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SedaEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriAssembler.java b/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriAssembler.java
index dc6c21d..483bd36 100644
--- a/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriAssembler.java
+++ b/components/camel-service/src/generated/java/org/apache/camel/component/service/ServiceEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ServiceEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "delegateUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "delegateUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriAssembler.java b/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriAssembler.java
index 0d1d666..ed65b16 100644
--- a/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriAssembler.java
+++ b/components/camel-servicenow/camel-servicenow-component/src/generated/java/org/apache/camel/component/servicenow/ServiceNowEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ServiceNowEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "instanceName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "instanceName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriAssembler.java b/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriAssembler.java
index 6440299..7a47b51 100644
--- a/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriAssembler.java
+++ b/components/camel-servlet/src/generated/java/org/apache/camel/component/servlet/ServletEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class ServletEndpointUriAssembler extends org.apache.camel.support.compon
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "contextPath", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "contextPath", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriAssembler.java b/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriAssembler.java
index 1467fbe..b95d392 100644
--- a/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriAssembler.java
+++ b/components/camel-sip/src/generated/java/org/apache/camel/component/sip/SipEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class SipEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "uri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "uri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriAssembler.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriAssembler.java
index 752080e..7703c5e 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriAssembler.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/SjmsEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class SjmsEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "destinationType", "queue", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriAssembler.java b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriAssembler.java
index c7c075f..3f841bc 100644
--- a/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriAssembler.java
+++ b/components/camel-sjms/src/generated/java/org/apache/camel/component/sjms/batch/SjmsBatchEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SjmsBatchEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriAssembler.java b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriAssembler.java
index c274e2c..b0de7eb 100644
--- a/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriAssembler.java
+++ b/components/camel-sjms2/src/generated/java/org/apache/camel/component/sjms2/Sjms2EndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class Sjms2EndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "destinationType", "queue", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriAssembler.java b/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriAssembler.java
index 4f26a07..3e6be58 100644
--- a/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriAssembler.java
+++ b/components/camel-slack/src/generated/java/org/apache/camel/component/slack/SlackEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SlackEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "channel", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "channel", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriAssembler.java b/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriAssembler.java
index a5afe72..18291ac 100644
--- a/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriAssembler.java
+++ b/components/camel-smpp/src/generated/java/org/apache/camel/component/smpp/SmppEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,15 +26,15 @@ public class SmppEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", "localhost", false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "2775", false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", "localhost", false, copy);
+        uri = buildPathParameter(syntax, uri, "port", "2775", false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriAssembler.java b/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriAssembler.java
index 148db1b..4911876 100644
--- a/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriAssembler.java
+++ b/components/camel-snmp/src/generated/java/org/apache/camel/component/snmp/SnmpEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class SnmpEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriAssembler.java b/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriAssembler.java
index 60bf588..e364622 100644
--- a/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriAssembler.java
+++ b/components/camel-solr/src/generated/java/org/apache/camel/component/solr/SolrEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -27,14 +26,14 @@ public class SolrEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "url", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "url", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriAssembler.java b/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriAssembler.java
index b64ebae..471efe3 100644
--- a/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriAssembler.java
+++ b/components/camel-soroush/src/generated/java/org/apache/camel/component/soroushbot/component/SoroushBotEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SoroushBotEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "action", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "action", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriAssembler.java b/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriAssembler.java
index 0fe9b6c..61e656f 100644
--- a/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriAssembler.java
+++ b/components/camel-spark/src/generated/java/org/apache/camel/component/spark/SparkEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SparkEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "endpointType", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "endpointType", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriAssembler.java b/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriAssembler.java
index 219cbe0..c11668c 100644
--- a/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriAssembler.java
+++ b/components/camel-splunk-hec/src/generated/java/org/apache/camel/component/splunkhec/SplunkHECEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class SplunkHECEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "splunkURL", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "token", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "splunkURL", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "token", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriAssembler.java b/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriAssembler.java
index ed45166..c09ad50 100644
--- a/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriAssembler.java
+++ b/components/camel-splunk/src/generated/java/org/apache/camel/component/splunk/SplunkEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SplunkEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriAssembler.java b/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriAssembler.java
index b64d34d..626b847 100644
--- a/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriAssembler.java
+++ b/components/camel-spring-batch/src/generated/java/org/apache/camel/component/spring/batch/SpringBatchEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SpringBatchEndpointUriAssembler extends org.apache.camel.support.co
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "jobName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "jobName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriAssembler.java b/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriAssembler.java
index 1605b9f..1d27fed 100644
--- a/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriAssembler.java
+++ b/components/camel-spring-integration/src/generated/java/org/apache/camel/component/spring/integration/SpringIntegrationEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SpringIntegrationEndpointUriAssembler extends org.apache.camel.supp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "defaultChannel", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "defaultChannel", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriAssembler.java b/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriAssembler.java
index 6cbb4b0..eee6e25 100644
--- a/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriAssembler.java
+++ b/components/camel-spring-ldap/src/generated/java/org/apache/camel/component/springldap/SpringLdapEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SpringLdapEndpointUriAssembler extends org.apache.camel.support.com
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "templateName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "templateName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriAssembler.java b/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriAssembler.java
index 1c0c293..33ef04a6 100644
--- a/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriAssembler.java
+++ b/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/RedisEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class RedisEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriAssembler.java b/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriAssembler.java
index 5087fb5..1a08d7b 100644
--- a/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriAssembler.java
+++ b/components/camel-spring-ws/src/generated/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,17 +20,17 @@ public class SpringWebserviceEndpointUriAssembler extends org.apache.camel.suppo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "type", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "lookupKey", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "webServiceEndpointUri", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "expression", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "type", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "lookupKey", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "webServiceEndpointUri", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "expression", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriAssembler.java b/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriAssembler.java
index 8bb6ed2..ec85428 100644
--- a/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriAssembler.java
+++ b/components/camel-spring/src/generated/java/org/apache/camel/component/event/EventEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class EventEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriAssembler.java b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriAssembler.java
index fe729b4..5fd6055 100644
--- a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriAssembler.java
+++ b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/SqlEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SqlEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "query", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "query", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriAssembler.java b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriAssembler.java
index 2fb16f9..927cfef 100644
--- a/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriAssembler.java
+++ b/components/camel-sql/src/generated/java/org/apache/camel/component/sql/stored/SqlStoredEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class SqlStoredEndpointUriAssembler extends org.apache.camel.support.comp
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "template", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "template", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriAssembler.java b/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriAssembler.java
index 7c39d83..78c7083 100644
--- a/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriAssembler.java
+++ b/components/camel-ssh/src/generated/java/org/apache/camel/component/ssh/SshEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class SshEndpointUriAssembler extends org.apache.camel.support.component.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "22", false, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "port", "22", false, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriAssembler.java b/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriAssembler.java
index d92525e..9def716 100644
--- a/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriAssembler.java
+++ b/components/camel-stax/src/generated/java/org/apache/camel/component/stax/StAXEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class StAXEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "contentHandlerClass", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "contentHandlerClass", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriAssembler.java b/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriAssembler.java
index 1ce784a..27fcd44 100644
--- a/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriAssembler.java
+++ b/components/camel-stomp/src/generated/java/org/apache/camel/component/stomp/StompEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class StompEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "destination", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "destination", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriAssembler.java b/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriAssembler.java
index 6a5a066..6d96541 100644
--- a/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriAssembler.java
+++ b/components/camel-stream/src/generated/java/org/apache/camel/component/stream/StreamEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class StreamEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "kind", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "kind", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriAssembler.java b/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriAssembler.java
index 92dcca0..314efc0 100644
--- a/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriAssembler.java
+++ b/components/camel-stringtemplate/src/generated/java/org/apache/camel/component/stringtemplate/StringTemplateEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class StringTemplateEndpointUriAssembler extends org.apache.camel.support
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "resourceUri", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriAssembler.java b/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriAssembler.java
index 70068fa..19284eb 100644
--- a/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriAssembler.java
+++ b/components/camel-stub/src/generated/java/org/apache/camel/component/stub/StubEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class StubEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "name", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriAssembler.java b/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriAssembler.java
index b2cb291..2ad67f0 100644
--- a/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriAssembler.java
+++ b/components/camel-telegram/src/generated/java/org/apache/camel/component/telegram/TelegramEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TelegramEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "type", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriAssembler.java b/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriAssembler.java
index 681ca33..71da945 100644
--- a/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriAssembler.java
+++ b/components/camel-thrift/src/generated/java/org/apache/camel/component/thrift/ThriftEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,16 +20,16 @@ public class ThriftEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "host", null, false, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "service", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "host", null, false, copy);
+        uri = buildPathParameter(syntax, uri, "port", null, true, copy);
+        uri = buildPathParameter(syntax, uri, "service", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriAssembler.java b/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriAssembler.java
index 9ce83ab..7c13909 100644
--- a/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriAssembler.java
+++ b/components/camel-tika/src/generated/java/org/apache/camel/component/tika/TikaEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TikaEndpointUriAssembler extends org.apache.camel.support.component
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "operation", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriAssembler.java b/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriAssembler.java
index 4688aa9..ce363e5 100644
--- a/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriAssembler.java
+++ b/components/camel-timer/src/generated/java/org/apache/camel/component/timer/TimerEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TimerEndpointUriAssembler extends org.apache.camel.support.componen
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "timerName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "timerName", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriAssembler.java b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriAssembler.java
index 4ce75c3..d3a73c7 100644
--- a/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriAssembler.java
+++ b/components/camel-twilio/src/generated/java/org/apache/camel/component/twilio/TwilioEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,15 +20,15 @@ public class TwilioEndpointUriAssembler extends org.apache.camel.support.compone
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "apiName", null, true, copy);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        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-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriAssembler.java b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriAssembler.java
index e9fe334..b9f502c 100644
--- a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriAssembler.java
+++ b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/directmessage/TwitterDirectMessageEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TwitterDirectMessageEndpointUriAssembler extends org.apache.camel.s
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "user", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "user", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriAssembler.java b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriAssembler.java
index 1bcb67b..8033cbc 100644
--- a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriAssembler.java
+++ b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/search/TwitterSearchEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TwitterSearchEndpointUriAssembler extends org.apache.camel.support.
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "keywords", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "keywords", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriAssembler.java b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriAssembler.java
index 7311e3b..9e51d4a 100644
--- a/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriAssembler.java
+++ b/components/camel-twitter/src/generated/java/org/apache/camel/component/twitter/timeline/TwitterTimelineEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class TwitterTimelineEndpointUriAssembler extends org.apache.camel.suppor
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "timelineType", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "timelineType", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriAssembler.java b/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriAssembler.java
index dc44e61..aa54ba9 100644
--- a/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriAssembler.java
+++ b/components/camel-undertow/src/generated/java/org/apache/camel/component/undertow/UndertowEndpointUriAssembler.java
@@ -5,7 +5,6 @@ import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.spi.EndpointUriAssembler;
 
 /**
@@ -21,14 +20,14 @@ public class UndertowEndpointUriAssembler extends org.apache.camel.support.compo
     }
 
     @Override
-    public String buildUri(CamelContext camelContext, String scheme, Map<String, Object> parameters) throws URISyntaxException {
+    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(camelContext, syntax, uri, "httpURI", null, true, copy);
-        uri = buildQueryParameters(camelContext, uri, copy);
+        uri = buildPathParameter(syntax, uri, "httpURI", null, true, copy);
+        uri = buildQueryParameters(uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriAssembler.java b/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriAssembler.java
index a6b9a79..7dead9b 100644
--- a/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriAssembler.java
+++ b/components/camel-validator/src/generated/java/org/apache/camel/component/validator/ValidatorEndpointUriAssembler.java
... 766 lines suppressed ...