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

[camel] 11/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 3ee633a22252aef2f009b7d726cc06aa322f004a
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Sep 25 14:05:37 2020 +0200

    CAMEL-15567: components - Generate source code for creating endpoint uri via a map of properties. WIP
---
 .../activemq/ActiveMQEndpointUriAssembler.java     |  9 ++-
 .../component/ahc/ws/WsEndpointUriAssembler.java   |  7 +-
 .../component/ahc/AhcEndpointUriAssembler.java     |  7 +-
 .../component/amqp/AMQPEndpointUriAssembler.java   |  9 ++-
 .../component/apns/ApnsEndpointUriAssembler.java   |  7 +-
 .../arangodb/ArangoDbEndpointUriAssembler.java     |  7 +-
 .../component/as2/AS2EndpointUriAssembler.java     |  9 ++-
 .../asterisk/AsteriskEndpointUriAssembler.java     |  7 +-
 .../component/atmos/AtmosEndpointUriAssembler.java |  9 ++-
 .../websocket/WebsocketEndpointUriAssembler.java   |  7 +-
 .../component/atom/AtomEndpointUriAssembler.java   |  7 +-
 .../client/map/AtomixMapEndpointUriAssembler.java  |  7 +-
 .../AtomixMessagingEndpointUriAssembler.java       |  7 +-
 .../AtomixMultiMapEndpointUriAssembler.java        |  7 +-
 .../queue/AtomixQueueEndpointUriAssembler.java     |  7 +-
 .../client/set/AtomixSetEndpointUriAssembler.java  |  7 +-
 .../value/AtomixValueEndpointUriAssembler.java     |  7 +-
 .../component/avro/AvroEndpointUriAssembler.java   | 13 ++--
 .../component/aws/cw/CwEndpointUriAssembler.java   |  7 +-
 .../component/aws/ddb/DdbEndpointUriAssembler.java |  7 +-
 .../ddbstream/DdbStreamEndpointUriAssembler.java   |  7 +-
 .../component/aws/ec2/EC2EndpointUriAssembler.java |  7 +-
 .../component/aws/ecs/ECSEndpointUriAssembler.java |  7 +-
 .../component/aws/eks/EKSEndpointUriAssembler.java |  7 +-
 .../component/aws/iam/IAMEndpointUriAssembler.java |  7 +-
 .../KinesisFirehoseEndpointUriAssembler.java       |  7 +-
 .../aws/kinesis/KinesisEndpointUriAssembler.java   |  7 +-
 .../component/aws/kms/KMSEndpointUriAssembler.java |  7 +-
 .../aws/lambda/LambdaEndpointUriAssembler.java     |  7 +-
 .../component/aws/mq/MQEndpointUriAssembler.java   |  7 +-
 .../component/aws/msk/MSKEndpointUriAssembler.java |  7 +-
 .../component/aws/s3/S3EndpointUriAssembler.java   |  7 +-
 .../component/aws/sdb/SdbEndpointUriAssembler.java |  7 +-
 .../component/aws/ses/SesEndpointUriAssembler.java |  7 +-
 .../component/aws/sns/SnsEndpointUriAssembler.java |  7 +-
 .../component/aws/sqs/SqsEndpointUriAssembler.java |  7 +-
 .../component/aws/swf/SWFEndpointUriAssembler.java |  7 +-
 .../translate/TranslateEndpointUriAssembler.java   |  7 +-
 .../aws2/athena/Athena2EndpointUriAssembler.java   |  7 +-
 .../component/aws2/cw/Cw2EndpointUriAssembler.java |  7 +-
 .../aws2/ddb/Ddb2EndpointUriAssembler.java         |  7 +-
 .../ddbstream/Ddb2StreamEndpointUriAssembler.java  |  7 +-
 .../aws2/ec2/AWS2EC2EndpointUriAssembler.java      |  7 +-
 .../aws2/ecs/ECS2EndpointUriAssembler.java         |  7 +-
 .../aws2/eks/EKS2EndpointUriAssembler.java         |  7 +-
 .../EventbridgeEndpointUriAssembler.java           |  7 +-
 .../aws2/iam/IAM2EndpointUriAssembler.java         |  7 +-
 .../KinesisFirehose2EndpointUriAssembler.java      |  7 +-
 .../aws2/kinesis/Kinesis2EndpointUriAssembler.java |  7 +-
 .../aws2/kms/KMS2EndpointUriAssembler.java         |  7 +-
 .../aws2/lambda/Lambda2EndpointUriAssembler.java   |  7 +-
 .../component/aws2/mq/MQ2EndpointUriAssembler.java |  7 +-
 .../aws2/msk/MSK2EndpointUriAssembler.java         |  7 +-
 .../aws2/s3/AWS2S3EndpointUriAssembler.java        |  7 +-
 .../aws2/ses/Ses2EndpointUriAssembler.java         |  7 +-
 .../aws2/sns/Sns2EndpointUriAssembler.java         |  7 +-
 .../aws2/sqs/Sqs2EndpointUriAssembler.java         |  7 +-
 .../aws2/sts/STS2EndpointUriAssembler.java         |  7 +-
 .../translate/Translate2EndpointUriAssembler.java  |  7 +-
 .../eventhubs/EventHubsEndpointUriAssembler.java   |  9 ++-
 .../storage/blob/BlobEndpointUriAssembler.java     |  9 ++-
 .../storage/queue/QueueEndpointUriAssembler.java   |  9 ++-
 .../blob/BlobServiceEndpointUriAssembler.java      |  7 +-
 .../queue/QueueServiceEndpointUriAssembler.java    |  7 +-
 .../BeanValidatorEndpointUriAssembler.java         |  7 +-
 .../component/bean/BeanEndpointUriAssembler.java   |  7 +-
 .../beanclass/ClassEndpointUriAssembler.java       |  7 +-
 .../beanstalk/BeanstalkEndpointUriAssembler.java   |  7 +-
 .../bonita/BonitaEndpointUriAssembler.java         |  7 +-
 .../component/box/BoxEndpointUriAssembler.java     |  9 ++-
 .../braintree/BraintreeEndpointUriAssembler.java   |  9 ++-
 .../browse/BrowseEndpointUriAssembler.java         |  7 +-
 .../cache/CaffeineCacheEndpointUriAssembler.java   |  7 +-
 .../CaffeineLoadCacheEndpointUriAssembler.java     |  7 +-
 .../cassandra/CassandraEndpointUriAssembler.java   | 13 ++--
 .../chatscript/ChatScriptEndpointUriAssembler.java | 11 ++--
 .../component/chunk/ChunkEndpointUriAssembler.java |  7 +-
 .../camel/component/cm/CMEndpointUriAssembler.java |  7 +-
 .../component/cmis/CMISEndpointUriAssembler.java   |  7 +-
 .../camel/coap/CoAPEndpointUriAssembler.java       |  7 +-
 .../cometd/CometdEndpointUriAssembler.java         | 11 ++--
 .../consul/ConsulEndpointUriAssembler.java         |  7 +-
 .../controlbus/ControlBusEndpointUriAssembler.java |  9 ++-
 .../component/corda/CordaEndpointUriAssembler.java |  7 +-
 .../couchbase/CouchbaseEndpointUriAssembler.java   | 11 ++--
 .../couchdb/CouchDbEndpointUriAssembler.java       | 13 ++--
 .../component/cron/CronEndpointUriAssembler.java   |  7 +-
 .../crypto/cms/CryptoCmsEndpointUriAssembler.java  |  9 ++-
 .../DigitalSignatureEndpointUriAssembler.java      |  9 ++-
 .../component/cxf/CxfEndpointUriAssembler.java     |  9 ++-
 .../cxf/jaxrs/CxfRsEndpointUriAssembler.java       |  9 ++-
 .../dataformat/DataFormatEndpointUriAssembler.java |  9 ++-
 .../dataset/DataSetEndpointUriAssembler.java       |  7 +-
 .../dataset/DataSetTestEndpointUriAssembler.java   |  7 +-
 .../DebeziumMongodbEndpointUriAssembler.java       |  7 +-
 .../DebeziumMySqlEndpointUriAssembler.java         |  7 +-
 .../DebeziumPostgresEndpointUriAssembler.java      |  7 +-
 .../DebeziumSqlserverEndpointUriAssembler.java     |  7 +-
 .../DigitalOceanEndpointUriAssembler.java          |  7 +-
 .../direct/DirectEndpointUriAssembler.java         |  7 +-
 .../directvm/DirectVmEndpointUriAssembler.java     |  7 +-
 .../disruptor/DisruptorEndpointUriAssembler.java   |  7 +-
 .../vm/DisruptorVmEndpointUriAssembler.java        |  7 +-
 .../component/djl/DJLEndpointUriAssembler.java     |  7 +-
 .../component/dns/DnsEndpointUriAssembler.java     |  7 +-
 .../docker/DockerEndpointUriAssembler.java         |  7 +-
 .../component/dozer/DozerEndpointUriAssembler.java |  7 +-
 .../component/drill/DrillEndpointUriAssembler.java |  7 +-
 .../dropbox/DropboxEndpointUriAssembler.java       |  7 +-
 .../ehcache/EhcacheEndpointUriAssembler.java       |  7 +-
 .../ElasticsearchEndpointUriAssembler.java         |  7 +-
 .../component/elsql/ElsqlEndpointUriAssembler.java |  9 ++-
 .../etcd/EtcdKeysEndpointUriAssembler.java         |  7 +-
 .../etcd/EtcdStatsEndpointUriAssembler.java        |  7 +-
 .../etcd/EtcdWatchEndpointUriAssembler.java        |  7 +-
 .../component/exec/ExecEndpointUriAssembler.java   |  7 +-
 .../facebook/FacebookEndpointUriAssembler.java     |  7 +-
 .../component/fhir/FhirEndpointUriAssembler.java   |  9 ++-
 .../file/watch/FileWatchEndpointUriAssembler.java  |  7 +-
 .../component/file/FileEndpointUriAssembler.java   |  7 +-
 .../flatpack/FlatpackEndpointUriAssembler.java     |  9 ++-
 .../component/flink/FlinkEndpointUriAssembler.java |  7 +-
 .../component/fop/FopEndpointUriAssembler.java     |  7 +-
 .../freemarker/FreemarkerEndpointUriAssembler.java |  7 +-
 .../file/remote/FtpEndpointUriAssembler.java       | 11 ++--
 .../file/remote/FtpsEndpointUriAssembler.java      | 11 ++--
 .../file/remote/SftpEndpointUriAssembler.java      | 11 ++--
 .../ganglia/GangliaEndpointUriAssembler.java       |  9 ++-
 .../geocoder/GeoCoderEndpointUriAssembler.java     |  9 ++-
 .../component/git/GitEndpointUriAssembler.java     |  7 +-
 .../github/GitHubEndpointUriAssembler.java         |  9 ++-
 .../GoogleBigQueryEndpointUriAssembler.java        | 11 ++--
 .../sql/GoogleBigQuerySQLEndpointUriAssembler.java |  9 ++-
 .../GoogleCalendarEndpointUriAssembler.java        |  9 ++-
 .../GoogleCalendarStreamEndpointUriAssembler.java  |  7 +-
 .../drive/GoogleDriveEndpointUriAssembler.java     |  9 ++-
 .../mail/GoogleMailEndpointUriAssembler.java       |  9 ++-
 .../GoogleMailStreamEndpointUriAssembler.java      |  7 +-
 .../pubsub/GooglePubsubEndpointUriAssembler.java   |  9 ++-
 .../sheets/GoogleSheetsEndpointUriAssembler.java   |  9 ++-
 .../GoogleSheetsStreamEndpointUriAssembler.java    |  7 +-
 .../component/gora/GoraEndpointUriAssembler.java   |  7 +-
 .../component/grape/GrapeEndpointUriAssembler.java |  7 +-
 .../graphql/GraphqlEndpointUriAssembler.java       |  7 +-
 .../component/grpc/GrpcEndpointUriAssembler.java   | 11 ++--
 .../GuavaEventBusEndpointUriAssembler.java         |  7 +-
 .../HazelcastAtomicnumberEndpointUriAssembler.java |  7 +-
 .../HazelcastInstanceEndpointUriAssembler.java     |  7 +-
 .../list/HazelcastListEndpointUriAssembler.java    |  7 +-
 .../map/HazelcastMapEndpointUriAssembler.java      |  7 +-
 .../HazelcastMultimapEndpointUriAssembler.java     |  7 +-
 .../queue/HazelcastQueueEndpointUriAssembler.java  |  7 +-
 ...HazelcastReplicatedmapEndpointUriAssembler.java |  7 +-
 .../HazelcastRingbufferEndpointUriAssembler.java   |  7 +-
 .../seda/HazelcastSedaEndpointUriAssembler.java    |  7 +-
 .../set/HazelcastSetEndpointUriAssembler.java      |  7 +-
 .../topic/HazelcastTopicEndpointUriAssembler.java  |  7 +-
 .../component/hbase/HBaseEndpointUriAssembler.java |  7 +-
 .../component/hdfs/HdfsEndpointUriAssembler.java   | 11 ++--
 .../hipchat/HipchatEndpointUriAssembler.java       | 11 ++--
 .../component/http/HttpEndpointUriAssembler.java   |  7 +-
 .../client/ClientEndpointUriAssembler.java         |  7 +-
 .../server/ServerEndpointUriAssembler.java         |  7 +-
 .../infinispan/InfinispanEndpointUriAssembler.java |  7 +-
 .../influxdb/InfluxDbEndpointUriAssembler.java     |  7 +-
 .../component/iota/IOTAEndpointUriAssembler.java   |  7 +-
 .../component/ipfs/IPFSEndpointUriAssembler.java   |  7 +-
 .../component/irc/IrcEndpointUriAssembler.java     |  9 ++-
 .../ironmq/IronMQEndpointUriAssembler.java         |  7 +-
 .../component/jbpm/JBPMEndpointUriAssembler.java   |  9 ++-
 .../jcache/JCacheEndpointUriAssembler.java         |  7 +-
 .../jclouds/JcloudsEndpointUriAssembler.java       |  9 ++-
 .../component/jcr/JcrEndpointUriAssembler.java     |  9 ++-
 .../component/jdbc/JdbcEndpointUriAssembler.java   |  7 +-
 .../jetty9/JettyHttp9EndpointUriAssembler.java     |  7 +-
 .../raft/JGroupsRaftEndpointUriAssembler.java      |  7 +-
 .../jgroups/JGroupsEndpointUriAssembler.java       |  7 +-
 .../validator/jing/JingEndpointUriAssembler.java   |  7 +-
 .../component/jira/JiraEndpointUriAssembler.java   |  7 +-
 .../component/jms/JmsEndpointUriAssembler.java     |  9 ++-
 .../component/jmx/JMXEndpointUriAssembler.java     |  7 +-
 .../component/jolt/JoltEndpointUriAssembler.java   |  7 +-
 .../component/jooq/JooqEndpointUriAssembler.java   |  7 +-
 .../component/jpa/JpaEndpointUriAssembler.java     |  7 +-
 .../component/scp/ScpEndpointUriAssembler.java     | 11 ++--
 .../component/jslt/JsltEndpointUriAssembler.java   |  7 +-
 .../JsonValidatorEndpointUriAssembler.java         |  7 +-
 .../jsonata/JsonataEndpointUriAssembler.java       |  7 +-
 .../component/jt400/Jt400EndpointUriAssembler.java | 15 +++--
 .../component/kafka/KafkaEndpointUriAssembler.java |  7 +-
 .../KubernetesConfigMapsEndpointUriAssembler.java  |  7 +-
 .../KubernetesDeploymentsEndpointUriAssembler.java |  7 +-
 .../hpa/KubernetesHPAEndpointUriAssembler.java     |  7 +-
 .../job/KubernetesJobEndpointUriAssembler.java     |  7 +-
 .../KubernetesNamespacesEndpointUriAssembler.java  |  7 +-
 .../nodes/KubernetesNodesEndpointUriAssembler.java |  7 +-
 ...netesPersistentVolumesEndpointUriAssembler.java |  7 +-
 ...ersistentVolumesClaimsEndpointUriAssembler.java |  7 +-
 .../pods/KubernetesPodsEndpointUriAssembler.java   |  7 +-
 ...ReplicationControllersEndpointUriAssembler.java |  7 +-
 ...bernetesResourcesQuotaEndpointUriAssembler.java |  7 +-
 .../KubernetesSecretsEndpointUriAssembler.java     |  7 +-
 ...ernetesServiceAccountsEndpointUriAssembler.java |  7 +-
 .../KubernetesServicesEndpointUriAssembler.java    |  7 +-
 .../OpenshiftBuildConfigsEndpointUriAssembler.java |  7 +-
 .../OpenshiftBuildsEndpointUriAssembler.java       |  7 +-
 .../component/kudu/KuduEndpointUriAssembler.java   | 11 ++--
 .../language/LanguageEndpointUriAssembler.java     |  9 ++-
 .../component/ldap/LdapEndpointUriAssembler.java   |  7 +-
 .../component/ldif/LdifEndpointUriAssembler.java   |  7 +-
 .../component/log/LogEndpointUriAssembler.java     |  7 +-
 .../lucene/LuceneEndpointUriAssembler.java         |  9 ++-
 .../lumberjack/LumberjackEndpointUriAssembler.java |  9 ++-
 .../component/mail/MailEndpointUriAssembler.java   |  9 ++-
 .../master/MasterEndpointUriAssembler.java         |  9 ++-
 .../metrics/MetricsEndpointUriAssembler.java       |  9 ++-
 .../micrometer/MicrometerEndpointUriAssembler.java | 11 ++--
 .../MicroProfileMetricsEndpointUriAssembler.java   |  9 ++-
 .../client/MiloClientEndpointUriAssembler.java     |  7 +-
 .../server/MiloServerEndpointUriAssembler.java     |  7 +-
 .../component/mina/MinaEndpointUriAssembler.java   | 11 ++--
 .../component/minio/MinioEndpointUriAssembler.java |  7 +-
 .../component/mllp/MllpEndpointUriAssembler.java   |  9 ++-
 .../component/mock/MockEndpointUriAssembler.java   |  7 +-
 .../mongodb/gridfs/GridFsEndpointUriAssembler.java |  7 +-
 .../mongodb/MongoDbEndpointUriAssembler.java       |  7 +-
 .../validator/msv/MsvEndpointUriAssembler.java     |  7 +-
 .../mustache/MustacheEndpointUriAssembler.java     |  7 +-
 .../component/mvel/MvelEndpointUriAssembler.java   |  7 +-
 .../mybatis/MyBatisBeanEndpointUriAssembler.java   |  9 ++-
 .../mybatis/MyBatisEndpointUriAssembler.java       |  7 +-
 .../nagios/NagiosEndpointUriAssembler.java         |  9 ++-
 .../component/nats/NatsEndpointUriAssembler.java   |  7 +-
 .../netty/http/NettyHttpEndpointUriAssembler.java  | 13 ++--
 .../http/NettyHttpEndpointUriAssemblerTest.java    | 77 ++++++++++++++++++++++
 .../component/netty/NettyEndpointUriAssembler.java | 11 ++--
 .../nitrite/NitriteEndpointUriAssembler.java       |  7 +-
 .../component/nsq/NsqEndpointUriAssembler.java     |  7 +-
 .../component/OAIPMHEndpointUriAssembler.java      |  7 +-
 .../olingo2/Olingo2EndpointUriAssembler.java       |  9 ++-
 .../olingo4/Olingo4EndpointUriAssembler.java       |  9 ++-
 .../cinder/CinderEndpointUriAssembler.java         |  7 +-
 .../glance/GlanceEndpointUriAssembler.java         |  7 +-
 .../keystone/KeystoneEndpointUriAssembler.java     |  7 +-
 .../neutron/NeutronEndpointUriAssembler.java       |  7 +-
 .../openstack/nova/NovaEndpointUriAssembler.java   |  7 +-
 .../openstack/swift/SwiftEndpointUriAssembler.java |  7 +-
 .../OptaPlannerEndpointUriAssembler.java           |  7 +-
 .../component/paho/PahoEndpointUriAssembler.java   |  7 +-
 .../component/pdf/PdfEndpointUriAssembler.java     |  7 +-
 .../PgReplicationSlotEndpointUriAssembler.java     | 15 +++--
 .../pgevent/PgEventEndpointUriAssembler.java       | 13 ++--
 .../http/PlatformHttpEndpointUriAssembler.java     |  7 +-
 .../printer/PrinterEndpointUriAssembler.java       | 11 ++--
 .../pubnub/PubNubEndpointUriAssembler.java         |  7 +-
 .../pulsar/PulsarEndpointUriAssembler.java         | 13 ++--
 .../quartz/QuartzEndpointUriAssembler.java         |  9 ++-
 .../quickfixj/QuickfixjEndpointUriAssembler.java   |  7 +-
 .../rabbitmq/RabbitMQEndpointUriAssembler.java     |  7 +-
 .../ReactiveStreamsEndpointUriAssembler.java       |  7 +-
 .../component/ref/RefEndpointUriAssembler.java     |  7 +-
 .../openapi/RestOpenApiEndpointUriAssembler.java   |  9 ++-
 .../swagger/RestSwaggerEndpointUriAssembler.java   |  9 ++-
 .../rest/RestApiEndpointUriAssembler.java          |  9 ++-
 .../component/rest/RestEndpointUriAssembler.java   | 11 ++--
 .../resteasy/ResteasyEndpointUriAssembler.java     |  7 +-
 .../RobotFrameworkEndpointUriAssembler.java        |  7 +-
 .../component/rss/RssEndpointUriAssembler.java     |  7 +-
 .../component/saga/SagaEndpointUriAssembler.java   |  7 +-
 .../salesforce/SalesforceEndpointUriAssembler.java |  9 ++-
 .../netweaver/NetWeaverEndpointUriAssembler.java   |  7 +-
 .../xquery/XQueryEndpointUriAssembler.java         |  7 +-
 .../scheduler/SchedulerEndpointUriAssembler.java   |  7 +-
 .../schematron/SchematronEndpointUriAssembler.java |  7 +-
 .../component/seda/SedaEndpointUriAssembler.java   |  7 +-
 .../service/ServiceEndpointUriAssembler.java       |  7 +-
 .../servicenow/ServiceNowEndpointUriAssembler.java |  7 +-
 .../servlet/ServletEndpointUriAssembler.java       |  7 +-
 .../component/sip/SipEndpointUriAssembler.java     |  7 +-
 .../component/sjms/SjmsEndpointUriAssembler.java   |  9 ++-
 .../sjms/batch/SjmsBatchEndpointUriAssembler.java  |  7 +-
 .../component/sjms2/Sjms2EndpointUriAssembler.java |  9 ++-
 .../component/slack/SlackEndpointUriAssembler.java |  7 +-
 .../component/smpp/SmppEndpointUriAssembler.java   |  9 ++-
 .../component/snmp/SnmpEndpointUriAssembler.java   |  9 ++-
 .../component/solr/SolrEndpointUriAssembler.java   |  7 +-
 .../component/SoroushBotEndpointUriAssembler.java  |  7 +-
 .../component/spark/SparkEndpointUriAssembler.java |  7 +-
 .../splunkhec/SplunkHECEndpointUriAssembler.java   |  9 ++-
 .../splunk/SplunkEndpointUriAssembler.java         |  7 +-
 .../batch/SpringBatchEndpointUriAssembler.java     |  7 +-
 .../SpringIntegrationEndpointUriAssembler.java     |  7 +-
 .../springldap/SpringLdapEndpointUriAssembler.java |  7 +-
 .../component/redis/RedisEndpointUriAssembler.java |  9 ++-
 .../ws/SpringWebserviceEndpointUriAssembler.java   | 13 ++--
 .../component/event/EventEndpointUriAssembler.java |  7 +-
 .../component/sql/SqlEndpointUriAssembler.java     |  7 +-
 .../sql/stored/SqlStoredEndpointUriAssembler.java  |  7 +-
 .../component/ssh/SshEndpointUriAssembler.java     |  9 ++-
 .../component/stax/StAXEndpointUriAssembler.java   |  7 +-
 .../component/stomp/StompEndpointUriAssembler.java |  7 +-
 .../stream/StreamEndpointUriAssembler.java         |  7 +-
 .../StringTemplateEndpointUriAssembler.java        |  7 +-
 .../component/stub/StubEndpointUriAssembler.java   |  7 +-
 .../telegram/TelegramEndpointUriAssembler.java     |  7 +-
 .../thrift/ThriftEndpointUriAssembler.java         | 11 ++--
 .../component/tika/TikaEndpointUriAssembler.java   |  7 +-
 .../component/timer/TimerEndpointUriAssembler.java |  7 +-
 .../twilio/TwilioEndpointUriAssembler.java         |  9 ++-
 .../TwitterDirectMessageEndpointUriAssembler.java  |  7 +-
 .../search/TwitterSearchEndpointUriAssembler.java  |  7 +-
 .../TwitterTimelineEndpointUriAssembler.java       |  7 +-
 .../undertow/UndertowEndpointUriAssembler.java     |  7 +-
 .../validator/ValidatorEndpointUriAssembler.java   |  7 +-
 .../velocity/VelocityEndpointUriAssembler.java     |  7 +-
 .../vertx/http/VertxHttpEndpointUriAssembler.java  |  7 +-
 .../VertxWebsocketEndpointUriAssembler.java        | 11 ++--
 .../component/vertx/VertxEndpointUriAssembler.java |  7 +-
 .../camel/component/vm/VmEndpointUriAssembler.java |  7 +-
 .../weather/WeatherEndpointUriAssembler.java       |  7 +-
 .../component/web3j/Web3jEndpointUriAssembler.java |  7 +-
 .../webhook/WebhookEndpointUriAssembler.java       |  7 +-
 .../JSR356WebSocketEndpointUriAssembler.java       |  7 +-
 .../websocket/WebsocketEndpointUriAssembler.java   | 11 ++--
 .../component/weka/WekaEndpointUriAssembler.java   |  7 +-
 .../wordpress/WordpressEndpointUriAssembler.java   |  9 ++-
 .../workday/WorkdayEndpointUriAssembler.java       |  9 ++-
 .../xchange/XChangeEndpointUriAssembler.java       |  7 +-
 .../camel/component/xj/XJEndpointUriAssembler.java |  7 +-
 .../xmlsecurity/XmlSignerEndpointUriAssembler.java |  7 +-
 .../XmlVerifierEndpointUriAssembler.java           |  7 +-
 .../component/xmpp/XmppEndpointUriAssembler.java   | 11 ++--
 .../xslt/saxon/XsltSaxonEndpointUriAssembler.java  |  7 +-
 .../component/xslt/XsltEndpointUriAssembler.java   |  7 +-
 .../yammer/YammerEndpointUriAssembler.java         |  7 +-
 .../zendesk/ZendeskEndpointUriAssembler.java       |  7 +-
 .../MasterEndpointUriAssembler.java                |  9 ++-
 .../zookeeper/ZooKeeperEndpointUriAssembler.java   |  9 ++-
 .../component/EndpointUriAssemblerSupport.java     |  9 ++-
 .../packaging/EndpointUriAssemblerGenerator.java   |  7 +-
 340 files changed, 1907 insertions(+), 809 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 4671bbe..cc4d7d2 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.activemq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class ActiveMQEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 6764a7b..4f39303 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ahc.ws;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class WsEndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d2860d0..f1fc2f1 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ahc;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AhcEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 5423476..5d55534 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.amqp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class AMQPEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 d852895..e7813dd 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.apns;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ApnsEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, copy);
+        uri = buildQueryParameters(camelContext, 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 7edca8a..be54ee0 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.arangodb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ArangoDbEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 17c1d7b..3f19636 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.as2;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class AS2EndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 4a507e0..037a116 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.asterisk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AsteriskEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 0972370..a59d0f3 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atmos;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class AtmosEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 2830237..34f4da9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atmosphere.websocket;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class WebsocketEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "servicePath", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "servicePath", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 e63cd46..9cf783a 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atom;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "feedUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "feedUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 906d060..ecb8ce6 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atomix.client.map;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomixMapEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 870f2ec..a7d05ad 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atomix.client.messaging;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomixMessagingEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 61fce2d..0cbe273 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atomix.client.multimap;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomixMultiMapEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 c5963c0..cb9e32b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atomix.client.queue;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomixQueueEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 6b1c0a5..7c50246 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atomix.client.set;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomixSetEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 efede6b..4408526 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.atomix.client.value;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AtomixValueEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 a2b7b71..34269d7 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.avro;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class AvroEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "transport", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "messageName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 46c9466..c009450 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.cw;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CwEndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 f9a3f4b..f282dc8 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.ddb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DdbEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 ca84076..5d1bfe1 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.ddbstream;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DdbStreamEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 3d51764..4a92ad5 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.ec2;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EC2EndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 b45fe74..a83dd6f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.ecs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ECSEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 c131bbe..c0baa5f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.eks;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EKSEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 a26ed2a..4eb5800 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.iam;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class IAMEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 067ede1..5a639ee 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.firehose;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KinesisFirehoseEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 effadeaf..784685b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.kinesis;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KinesisEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 19d8e95..caef2ad 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.kms;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KMSEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 ef1ac73..dc8b80d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.lambda;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class LambdaEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 bcdd8f9..aeaa610 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.mq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MQEndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 1e3ad07..464b523 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.msk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MSKEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 8bc6e3b..eacb7d9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.s3;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class S3EndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "bucketNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "bucketNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 1cf9461..fb3e745 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.sdb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SdbEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "domainName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "domainName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 80c67e3..924b4e8 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.ses;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SesEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "from", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "from", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 586c8b0..640c896 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.sns;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SnsEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topicNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topicNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 78b7b8d..f350cfd 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.sqs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SqsEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "queueNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "queueNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 67b88e7..8d8028b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.swf;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SWFEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 c28c78a..863cd4e 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws.translate;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TranslateEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d5df9c4..0d42591 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.athena;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Athena2EndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 05a49f1..df65548 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.cw;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Cw2EndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 b318ad9..a68bd50 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.ddb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Ddb2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 c45a645..406760a 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.ddbstream;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Ddb2StreamEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 610b691..f7037d8 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.ec2;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AWS2EC2EndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 4280abb..12ee54a 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.ecs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ECS2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 949ff4d..dbdc5e0 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.eks;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EKS2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 b69f6c9..1414940 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.eventbridge;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EventbridgeEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "eventbusNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "eventbusNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 1e12eaa..fb79b78 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.iam;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class IAM2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 bb0f2b5..8a30a5e 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.firehose;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KinesisFirehose2EndpointUriAssembler extends org.apache.camel.suppo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d6b86c8..4db49ad 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.kinesis;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Kinesis2EndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "streamName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 e6163f3..f90d86879 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.kms;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KMS2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 53ec894..ede2c1c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.lambda;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Lambda2EndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 cee88a2..1d09ffd 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.mq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MQ2EndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 baf926c..5ebb783 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.msk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MSK2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 7762754..f0d4d05 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.s3;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class AWS2S3EndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "bucketNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "bucketNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 58fc2c5..7c7df70 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.ses;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Ses2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "from", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "from", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 4b90fab..1db411f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.sns;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Sns2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topicNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topicNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 ddf85ce..f83c79c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.sqs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Sqs2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "queueNameOrArn", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "queueNameOrArn", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 dfc163d..653a84f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.sts;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class STS2EndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 24da733..6c69084 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.aws2.translate;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Translate2EndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 980147d..648518a 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.azure.eventhubs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class EventHubsEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "eventHubName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 bc580a3..da89721 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.azure.storage.blob;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class BlobEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "accountName", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "containerName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 ce0192b..0d59393 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.azure.storage.queue;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class QueueEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "accountName", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "queueName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 1bfe756..52465c2 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.azure.blob;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class BlobServiceEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "containerOrBlobUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "containerOrBlobUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 8b9f1d9..6ccc7e9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.azure.queue;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class QueueServiceEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "containerAndQueueUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "containerAndQueueUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 376ce3b..540328d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.bean.validator;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class BeanValidatorEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "label", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 07493b7..2e25661 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.bean;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class BeanEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d69025a..e23779f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.beanclass;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ClassEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 1ebd116..ffd0839 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.beanstalk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class BeanstalkEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionSettings", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "connectionSettings", null, false, copy);
+        uri = buildQueryParameters(camelContext, 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 862a91b..303cab7 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.bonita;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class BonitaEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 f27e746..505b08e 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.box;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class BoxEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 5b91d46..7e252a0 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.braintree;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class BraintreeEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 525a3c5..d9852da 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.browse;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class BrowseEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 0b30886..59ed359 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.caffeine.cache;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CaffeineCacheEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 07aea69..1c9ab37 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.caffeine.load;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CaffeineLoadCacheEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 e207539..ad0c8da 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cassandra;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class CassandraEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanRef", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "hosts", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "keyspace", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 cdd7dda..a10f8a4 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.chatscript;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class ChatScriptEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "1024", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "botName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 78ef3c7..3635df9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.chunk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ChunkEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 19bb474..908cdc2 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cm;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CMEndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 2cf479c..7afade4 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cmis;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CMISEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cmsUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cmsUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 2f1c13f..c24f284 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
@@ -2,6 +2,7 @@
 package org.apache.camel.coap;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class CoAPEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, false, copy);
+        uri = buildQueryParameters(camelContext, 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 843831b..44a0f5a 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cometd;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,10 +31,12 @@ public class CometdEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "channelName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 f369586..12c9ff5 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.consul;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ConsulEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiEndpoint", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiEndpoint", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 0fee39b..bb26fae 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.controlbus;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class ControlBusEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "language", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 c597c16..cdcdb11 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.corda;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CordaEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "node", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "node", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 22e39f9..8c516cd 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.couchbase;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class CouchbaseEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "8091", false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 aae6b78..0450ab1 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.couchdb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class CouchDbEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5984", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 a86bf6b..874a323 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cron;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CronEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 a5775b3..284d05c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.crypto.cms;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class CryptoCmsEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cryptoOperation", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 f9233b2..535c5c0 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.crypto;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class DigitalSignatureEndpointUriAssembler extends org.apache.camel.suppo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cryptoOperation", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 687068f..9956a0e 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cxf;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class CxfEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanId", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 d8969ad..564cc13 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.cxf.jaxrs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class CxfRsEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanId", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 444fe8f8..527347b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.dataformat;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class DataFormatEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 9a91bac..f7091a2 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.dataset;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DataSetEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d5f7e25..3e6d813 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.dataset;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DataSetTestEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 97c8bbe..f7fd574 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.debezium;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DebeziumMongodbEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 798d8d3..39a39ec 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.debezium;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DebeziumMySqlEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 a5c1a5e..a7176c8 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.debezium;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DebeziumPostgresEndpointUriAssembler extends org.apache.camel.suppo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 366a070..da59ea3 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.debezium;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DebeziumSqlserverEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 49877ae..8b183cf 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.digitalocean;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DigitalOceanEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, false, copy);
+        uri = buildQueryParameters(camelContext, 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 25bc4e4..d6f0b3f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.direct;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DirectEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 9d47d1c..3b632d5 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.directvm;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DirectVmEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 a1e808a..134bac2 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.disruptor;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class DisruptorEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 25cb018..3e9ebb303 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.disruptor.vm;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class DisruptorVmEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 f2d7e27..1d099d3 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.djl;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DJLEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "application", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "application", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 2d699a2..99e2443 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.dns;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DnsEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "dnsType", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "dnsType", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d91d557..016ad4d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.docker;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DockerEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 75d3956..7c8071c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.dozer;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DozerEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 aa68e4a..647a64b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.drill;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DrillEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 2ae76b6..2838407 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.dropbox;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class DropboxEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 07fc480..f486280 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ehcache;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EhcacheEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 af0552c..6cc6ff2 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.elasticsearch;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ElasticsearchEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 cd6727b..50390d1 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.elsql;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class ElsqlEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "elsqlName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 8e8697e..eeb29f4 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.etcd;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EtcdKeysEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(camelContext, 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 c608a0d..0c31af7 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.etcd;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EtcdStatsEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(camelContext, 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 72db4d41..de1fd22 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.etcd;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EtcdWatchEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, copy);
+        uri = buildQueryParameters(camelContext, 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 9f0c3c1..c631646 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.exec;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ExecEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "executable", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "executable", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d90a523..8ba4a95 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.facebook;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class FacebookEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 0d2c02a..0ab3b63 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.fhir;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class FhirEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 8128688..d79a31d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.file.watch;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class FileWatchEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 f86947b..84d0015 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.file;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class FileEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 76e88e3..75ef7e9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.flatpack;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class FlatpackEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", "delim", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 a7aea31..f56f5ba 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.flink;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class FlinkEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "endpointType", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "endpointType", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 114f4e7..7f0f52f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.fop;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class FopEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "outputType", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "outputType", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 7ef5488..fd2625e 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.freemarker;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class FreemarkerEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 f36fbb6..dc27045 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.file.remote;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class FtpEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 12b0181..d288c97 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.file.remote;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class FtpsEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 3671d0e..db02b43 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.file.remote;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class SftpEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 523c01a..b6cec0f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ganglia;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GangliaEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "239.2.11.71", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "8649", false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 f8bdfd6..8122958 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.geocoder;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GeoCoderEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "latlng", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 643c7b0..a3e2c53 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.git;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GitEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "localPath", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "localPath", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 fc1e7d3..ae91997 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.github;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GitHubEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "branchName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 e8642ea..3121723 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.bigquery;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class GoogleBigQueryEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "datasetId", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "tableId", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 be65f37..b2987b7 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.bigquery.sql;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GoogleBigQuerySQLEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "query", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 5f7ce70..0ab9542 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.calendar;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GoogleCalendarEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 afe0a35..33aeb49 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.calendar.stream;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GoogleCalendarStreamEndpointUriAssembler extends org.apache.camel.s
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "index", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "index", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 0bae34b..bc41f74 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.drive;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GoogleDriveEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 91fe071..79e9b9a 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.mail;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GoogleMailEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 2bb8b47..4b1a5a9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.mail.stream;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GoogleMailStreamEndpointUriAssembler extends org.apache.camel.suppo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "index", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "index", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 ae9ed31..1d7dc47 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.pubsub;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GooglePubsubEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "projectId", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 9faaf18..0c5b698 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.sheets;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class GoogleSheetsEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 885531b..f7c9098 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.google.sheets.stream;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GoogleSheetsStreamEndpointUriAssembler extends org.apache.camel.sup
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 a9a676a..e3cecb0 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.gora;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GoraEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 5fd0d3d..672ace8 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.grape;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GrapeEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "defaultCoordinates", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "defaultCoordinates", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 fefacb5..ae1722f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.graphql;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GraphqlEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 cabf7a9..4a6fa27 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.grpc;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class GrpcEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "service", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 a1b704c..a1edf93 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.guava.eventbus;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GuavaEventBusEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "eventBusRef", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "eventBusRef", null, false, copy);
+        uri = buildQueryParameters(camelContext, 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 57950fb..6c3c8a2 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.atomicnumber;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastAtomicnumberEndpointUriAssembler extends org.apache.camel.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 4c36b55..63636bc 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.instance;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastInstanceEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d31448d..180614d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.list;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastListEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 65e2e2d..e417fc9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.map;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastMapEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 2279e6a..6f8a75b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.multimap;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastMultimapEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 56205a9..0d67980 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.queue;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastQueueEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 0378177..160b0fc 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.replicatedmap;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastReplicatedmapEndpointUriAssembler extends org.apache.camel
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 09c5305..6bf40d6 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.ringbuffer;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastRingbufferEndpointUriAssembler extends org.apache.camel.su
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 6993d08..5d7f29c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.seda;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastSedaEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 78eb02c..efca588 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.set;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastSetEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 f50726d..88e1560 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hazelcast.topic;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HazelcastTopicEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 a03b0bf..1c204e5 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hbase;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class HBaseEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 aad5e54..bbe13c2 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hdfs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class HdfsEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "hostName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "8020", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 f6e1d02..01f709f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.hipchat;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class HipchatEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "80", false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 07552d1..dca687c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.http;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class HttpEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 5d4dcba..71fa776 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.iec60870.client;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ClientEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uriPath", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uriPath", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 bd58a52..4d6ea3d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.iec60870.server;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ServerEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uriPath", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uriPath", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 f2d4882..f556548 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.infinispan;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class InfinispanEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 e7a1106..c5c9a4e 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.influxdb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class InfluxDbEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 07455ae..5058e28 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.iota;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class IOTAEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d6088b1..e7ced83 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ipfs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class IPFSEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "ipfsCmd", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "ipfsCmd", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 bba7989..8662018 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.irc;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class IrcEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 6b2f826..dfb68d9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ironmq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class IronMQEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "queueName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "queueName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 b175b91..72daebd 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jbpm;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class JBPMEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionURL", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "eventListenerType", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 f2cca26..83e25de 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jcache;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JCacheEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "cacheName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 e97c6c8..16ac847 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jclouds;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class JcloudsEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "providerId", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 a283771..3dee544 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jcr;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class JcrEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "base", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 ca489c8..766a881 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jdbc;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JdbcEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "dataSourceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "dataSourceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 68943b1c..bff5b94 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jetty9;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JettyHttp9EndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 906c708..3136314 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jgroups.raft;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JGroupsRaftEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d98164b..c0b58e7 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jgroups;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JGroupsEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "clusterName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 ccb00b1..461fc5f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.validator.jing;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JingEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 a67b38d..da171e6 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jira;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JiraEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 75a1d91..e220238 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jms;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class JmsEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 d9a425f..dcb1259 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jmx;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JMXEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "serverURL", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "serverURL", null, false, copy);
+        uri = buildQueryParameters(camelContext, 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 64cb5e5..95be00d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jolt;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JoltEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 cc0939e..0040731 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jooq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JooqEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "entityType", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "entityType", null, false, copy);
+        uri = buildQueryParameters(camelContext, 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 f3b0563..3b9e367 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jpa;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JpaEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "entityType", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "entityType", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 9126a7e..605e90a 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.scp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class ScpEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "directoryName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 7eaf21d..b8152bd 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jslt;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JsltEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 6fdee30..81b0960 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jsonvalidator;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JsonValidatorEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 2c49737..8f9dc52 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jsonata;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JsonataEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 2ffa3b4..e1e55fd 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.jt400;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,12 +25,14 @@ public class Jt400EndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "userID", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "password", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "systemName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "objectPath", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 fe017da..6a02d71 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kafka;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KafkaEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 62846f2..50030a4 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.config_maps;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesConfigMapsEndpointUriAssembler extends org.apache.camel.s
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 e7844f1..d68fbdd 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.deployments;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesDeploymentsEndpointUriAssembler extends org.apache.camel.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 247ce00..82ab880 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.hpa;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesHPAEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 b9441c5..9d2079d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.job;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesJobEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 791af23..2a821cd 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.namespaces;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesNamespacesEndpointUriAssembler extends org.apache.camel.s
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 f1368f1..95a6874 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.nodes;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesNodesEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d88e0ab..96c93a2 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.persistent_volumes;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesPersistentVolumesEndpointUriAssembler extends org.apache.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 810e5d8..13fd55b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.persistent_volumes_claims;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesPersistentVolumesClaimsEndpointUriAssembler extends org.a
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 c3aa19f..5d3467b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.pods;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesPodsEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 bf1a103..afabdbb 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.replication_controllers;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesReplicationControllersEndpointUriAssembler extends org.ap
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 394acb5..9a34d36 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.resources_quota;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesResourcesQuotaEndpointUriAssembler extends org.apache.cam
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 e520bae..54973270 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.secrets;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesSecretsEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 47a8bc0..895091a 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.service_accounts;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesServiceAccountsEndpointUriAssembler extends org.apache.ca
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 66b2576..b59db05 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kubernetes.services;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KubernetesServicesEndpointUriAssembler extends org.apache.camel.sup
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 e713479..130e6ea 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openshift.build_configs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class OpenshiftBuildConfigsEndpointUriAssembler extends org.apache.camel.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 764a807..2d7c3af 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openshift.builds;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class OpenshiftBuildsEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "masterUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 b0bce55..5e2259e 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.kudu;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class KuduEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "tableName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 ff621ed..354a5c5 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.language;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class LanguageEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "languageName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 981fc3c..b651d8b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ldap;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class LdapEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "dirContextName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "dirContextName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 64744db..c7b86f5 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ldif;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class LdifEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "ldapConnectionName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "ldapConnectionName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 250bb46..e18bb4c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.log;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class LogEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "loggerName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "loggerName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 77e08fb..ff8b5da 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.lucene;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class LuceneEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 9ae09d6..c1ae92f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.lumberjack;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class LumberjackEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5044", false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 f5fae41..2bcf7d9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mail;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,9 +31,11 @@ public class MailEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 6673f4d..df4157b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.master;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class MasterEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "delegateUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 ce2a7c9..18bcd3b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.metrics;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class MetricsEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsType", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 00294fb..5c6c678 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.micrometer;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class MicrometerEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsType", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "metricsName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "tags", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 bf3d1ab..7311c03 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.microprofile.metrics;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class MicroProfileMetricsEndpointUriAssembler extends org.apache.camel.su
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "metricType", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "metricName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 f460aac..60fefaf 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.milo.client;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MiloClientEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "endpointUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "endpointUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 9a81bca..40006a4 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.milo.server;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MiloServerEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "itemId", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "itemId", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 15fe931..be480b4 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mina;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class MinaEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 52f4988..1d35bd1 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.minio;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MinioEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "bucketName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "bucketName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 0173826..3deb761 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mllp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class MllpEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 c3921bd..754afff 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mock;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MockEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d668621..ed4a9e4 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mongodb.gridfs;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GridFsEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 9d38d90..2533c5c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mongodb;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MongoDbEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "connectionBean", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 c860e6b..9527d9c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.validator.msv;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MsvEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 47b32b6..6404eb5 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mustache;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MustacheEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 8817245..78fa78b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mvel;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MvelEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 ec1fedc..1056b41 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mybatis;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class MyBatisBeanEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "beanName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 d6d887f..ae166c7 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.mybatis;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class MyBatisEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "statement", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "statement", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 8346a62..0b120a3 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.nagios;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class NagiosEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 92035cb..6f1d913 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.nats;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class NatsEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 3bc4475..0d42779 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.netty.http;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class NettyHttpEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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
new file mode 100644
index 0000000..2a8ce1c
--- /dev/null
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpEndpointUriAssemblerTest.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.netty.http;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.camel.ExtendedCamelContext;
+import org.apache.camel.spi.EndpointUriAssembler;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class NettyHttpEndpointUriAssemblerTest extends CamelTestSupport {
+
+    @Test
+    public void testAsEndpointUriNettyHttpHostnameWithDash() throws Exception {
+        EndpointUriAssembler assembler = context.adapt(ExtendedCamelContext.class).getEndpointUriAssembler("netty-http");
+
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("protocol", "http");
+        map.put("host", "a-b-c.hostname.tld");
+        map.put("port", "8080");
+        map.put("path", "anything");
+        String uri = assembler.buildUri(context, "netty-http", map);
+        assertEquals("netty-http:http:a-b-c.hostname.tld:8080/anything", uri);
+
+        map = new LinkedHashMap<>();
+        map.put("protocol", "http");
+        map.put("host", "a-b-c.server.net");
+        map.put("port", "8888");
+        map.put("path", "service/v3");
+        uri = assembler.buildUri(context, "netty-http", map);
+        assertEquals("netty-http:http:a-b-c.server.net:8888/service/v3", uri);
+
+        map = new HashMap<>();
+        // use http protocol
+        map.put("protocol", "http");
+        map.put("host", "localhost");
+        map.put("port", "8080");
+        map.put("path", "foo/bar");
+        map.put("disconnect", "true");
+
+        uri = assembler.buildUri(context, "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);
+        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);
+        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 dea5b40..8352448 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.netty;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class NettyEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "protocol", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 dd84afb..cc2c22d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.nitrite;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class NitriteEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 d529a99..98fba8d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.nsq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class NsqEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 50b9056..4d076d9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.oaipmh.component;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class OAIPMHEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "baseUrl", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "baseUrl", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 08e3f95..84c55b5 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.olingo2;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class Olingo2EndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 47e7a30..b34f7fb 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.olingo4;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class Olingo4EndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 9bfb9a3..840fd40 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openstack.cinder;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class CinderEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 0f9c855..7581a8d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openstack.glance;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class GlanceEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 1b11faa..202ac83 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openstack.keystone;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class KeystoneEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 ab51c4e..91416d1 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openstack.neutron;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class NeutronEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 52e600d..86571d0 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openstack.nova;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class NovaEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 eccfeca..ea4ed23 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.openstack.swift;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SwiftEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 c94514c..6d41946 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.optaplanner;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class OptaPlannerEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "configFile", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "configFile", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 6f51096..8951e60 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.paho;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class PahoEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 f98107f..0f45200 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.pdf;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class PdfEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 7704ee4..979de7b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.pg.replication.slot;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,12 +25,14 @@ public class PgReplicationSlotEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "slot", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5432", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "outputPlugin", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 f75b634..96ed10c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.pgevent;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class PgEventEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "5432", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "database", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 9b570ea..3fc8f15 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.platform.http;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class PlatformHttpEndpointUriAssembler extends org.apache.camel.support.c
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 0c64812..341c879 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.printer;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class PrinterEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "hostname", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "printername", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 ad7c55a..795d589 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.pubnub;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class PubNubEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 b36e2fc..bc7d0c2 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.pulsar;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class PulsarEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "persistence", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "tenant", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "namespace", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "topic", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 b4e1836..0292c44 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.quartz;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class QuartzEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "groupName", "Camel", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "triggerName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 9c8b077..279f4b9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.quickfixj;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class QuickfixjEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "configurationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "configurationName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 a87e623..9d4e48b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.rabbitmq;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class RabbitMQEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "exchangeName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "exchangeName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 9960256..0f794e9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.reactive.streams;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ReactiveStreamsEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "stream", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "stream", null, false, copy);
+        uri = buildQueryParameters(camelContext, 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 2bfb60b..3b9a8fb 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ref;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class RefEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 e674a4d..f71e638 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.rest.openapi;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class RestOpenApiEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "specificationUri", "openapi.json", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "operationId", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 518da0a..30bdb94 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.rest.swagger;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class RestSwaggerEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "specificationUri", "swagger.json", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "operationId", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 073fb30..2afd38e 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.rest;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class RestApiEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "contextIdPattern", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 ba3c2d3..8db0eed 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.rest;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class RestEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "method", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "uriTemplate", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 7552198..4b5ec11 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.resteasy;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ResteasyEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 20a3bd0..0f4069b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.robotframework;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class RobotFrameworkEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 fcd2d08..d920fde 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.rss;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class RssEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "feedUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "feedUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 9c799fe..8f5148c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.saga;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SagaEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "action", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "action", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 11e61fd..09f6c5f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.salesforce;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class SalesforceEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operationName", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "topicName", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 c9cae37..5a5c30d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sap.netweaver;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class NetWeaverEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "url", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "url", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 ee523e2..134dc3e 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xquery;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XQueryEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 15cfe6c..2b0d77c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.scheduler;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SchedulerEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 f473c95..701e003 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.schematron;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SchematronEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 b36fc25..c70d641 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.seda;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SedaEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 1a19021..dc6c21d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.service;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ServiceEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "delegateUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "delegateUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 9b76d9b..0d1d666 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.servicenow;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ServiceNowEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "instanceName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "instanceName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 916635e..6440299 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.servlet;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ServletEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "contextPath", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "contextPath", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 06cbc39..1467fbe 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sip;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class SipEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 728d2da..752080e 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sjms;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class SjmsEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 73fbe4b..c7c075f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sjms.batch;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SjmsBatchEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 7a08abc..c274e2c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sjms2;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class Sjms2EndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationType", "queue", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "destinationName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 44265c2..4f26a07 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.slack;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SlackEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "channel", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 f046a1a..a5afe72 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.smpp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,9 +31,11 @@ public class SmppEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "localhost", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "2775", false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 05960f6..148db1b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.snmp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class SnmpEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 76819c2..60bf588 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.solr;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -30,8 +31,10 @@ public class SolrEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "url", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "url", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 fa0b8d1..b64ebae 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.soroushbot.component;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SoroushBotEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "action", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "action", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 7275093..0fe9b6c 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.spark;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SparkEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "endpointType", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "endpointType", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 e1801b3..219cbe0 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.splunkhec;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class SplunkHECEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "splunkURL", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "token", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 9fa989b..ed45166 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.splunk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SplunkEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 2857b90..b64d34d 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.spring.batch;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SpringBatchEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "jobName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "jobName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 edd068c..1605b9f 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.spring.integration;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SpringIntegrationEndpointUriAssembler extends org.apache.camel.supp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "defaultChannel", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "defaultChannel", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 8b7e417..6cbb4b0 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.springldap;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SpringLdapEndpointUriAssembler extends org.apache.camel.support.com
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "templateName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "templateName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 fd08d18..1c0c293 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.redis;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class RedisEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 b565a92..5087fb5 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.spring.ws;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,11 +25,13 @@ public class SpringWebserviceEndpointUriAssembler extends org.apache.camel.suppo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "lookupKey", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "webServiceEndpointUri", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "expression", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 51ebf77..8bb6ed2 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.event;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class EventEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, false, copy);
+        uri = buildQueryParameters(camelContext, 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 1637a89..fe729b4 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sql;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SqlEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "query", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "query", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 4e20528..2fb16f9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.sql.stored;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class SqlStoredEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "template", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "template", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 54ca812..7c39d83 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.ssh;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class SshEndpointUriAssembler extends org.apache.camel.support.component.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "22", false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 ed2345c..d92525e 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.stax;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class StAXEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "contentHandlerClass", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "contentHandlerClass", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 4361300..1ce784a 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.stomp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class StompEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "destination", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "destination", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 3413087..6a5a066 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.stream;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class StreamEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "kind", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "kind", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 b1e8e74..92dcca0 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.stringtemplate;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class StringTemplateEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 2314997..70068fa 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.stub;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class StubEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 740b347..b2cb291 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.telegram;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TelegramEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "type", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 aaface0..681ca33 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.thrift;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class ThriftEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "service", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 7f04c05..9ce83ab 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.tika;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TikaEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 9302d1b..4688aa9 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.timer;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TimerEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "timerName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "timerName", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 cc9de83..4ce75c3 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.twilio;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class TwilioEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "apiName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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);
         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 3eaccf4..e9fe334 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.twitter.directmessage;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TwitterDirectMessageEndpointUriAssembler extends org.apache.camel.s
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "user", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "user", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 8b2a214..1bcb67b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.twitter.search;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TwitterSearchEndpointUriAssembler extends org.apache.camel.support.
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "keywords", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "keywords", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 c18ac64..7311e3b 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.twitter.timeline;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class TwitterTimelineEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "timelineType", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "timelineType", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 03c7f7b..dc44e61 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.undertow;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class UndertowEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpURI", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpURI", null, true, copy);
+        uri = buildQueryParameters(camelContext, 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 7d6bf11..a6b9a79 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
@@ -2,6 +2,7 @@
 package org.apache.camel.component.validator;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ValidatorEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-velocity/src/generated/java/org/apache/camel/component/velocity/VelocityEndpointUriAssembler.java b/components/camel-velocity/src/generated/java/org/apache/camel/component/velocity/VelocityEndpointUriAssembler.java
index 8ed89eb..dea0b24 100644
--- a/components/camel-velocity/src/generated/java/org/apache/camel/component/velocity/VelocityEndpointUriAssembler.java
+++ b/components/camel-velocity/src/generated/java/org/apache/camel/component/velocity/VelocityEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.velocity;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class VelocityEndpointUriAssembler extends org.apache.camel.support.compo
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpEndpointUriAssembler.java b/components/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpEndpointUriAssembler.java
index 94d2311..e0a7adb 100644
--- a/components/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpEndpointUriAssembler.java
+++ b/components/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.vertx.http;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class VertxHttpEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "httpUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriAssembler.java b/components/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriAssembler.java
index 2be1df1..980e231 100644
--- a/components/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriAssembler.java
+++ b/components/camel-vertx-websocket/src/generated/java/org/apache/camel/component/vertx/websocket/VertxWebsocketEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.vertx.websocket;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class VertxWebsocketEndpointUriAssembler extends org.apache.camel.support
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "0.0.0.0", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "0", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", "/", true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", "0.0.0.0", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "0", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "path", "/", true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-vertx/src/generated/java/org/apache/camel/component/vertx/VertxEndpointUriAssembler.java b/components/camel-vertx/src/generated/java/org/apache/camel/component/vertx/VertxEndpointUriAssembler.java
index ca87945..3c3d80b 100644
--- a/components/camel-vertx/src/generated/java/org/apache/camel/component/vertx/VertxEndpointUriAssembler.java
+++ b/components/camel-vertx/src/generated/java/org/apache/camel/component/vertx/VertxEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.vertx;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class VertxEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "address", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "address", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-vm/src/generated/java/org/apache/camel/component/vm/VmEndpointUriAssembler.java b/components/camel-vm/src/generated/java/org/apache/camel/component/vm/VmEndpointUriAssembler.java
index f87e4b5..b17e6fe 100644
--- a/components/camel-vm/src/generated/java/org/apache/camel/component/vm/VmEndpointUriAssembler.java
+++ b/components/camel-vm/src/generated/java/org/apache/camel/component/vm/VmEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.vm;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class VmEndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-weather/src/generated/java/org/apache/camel/component/weather/WeatherEndpointUriAssembler.java b/components/camel-weather/src/generated/java/org/apache/camel/component/weather/WeatherEndpointUriAssembler.java
index 562a68b..4ccee97 100644
--- a/components/camel-weather/src/generated/java/org/apache/camel/component/weather/WeatherEndpointUriAssembler.java
+++ b/components/camel-weather/src/generated/java/org/apache/camel/component/weather/WeatherEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.weather;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class WeatherEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-web3j/src/generated/java/org/apache/camel/component/web3j/Web3jEndpointUriAssembler.java b/components/camel-web3j/src/generated/java/org/apache/camel/component/web3j/Web3jEndpointUriAssembler.java
index 91a1166..9b0be5e 100644
--- a/components/camel-web3j/src/generated/java/org/apache/camel/component/web3j/Web3jEndpointUriAssembler.java
+++ b/components/camel-web3j/src/generated/java/org/apache/camel/component/web3j/Web3jEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.web3j;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class Web3jEndpointUriAssembler extends org.apache.camel.support.componen
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "nodeAddress", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "nodeAddress", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-webhook/src/generated/java/org/apache/camel/component/webhook/WebhookEndpointUriAssembler.java b/components/camel-webhook/src/generated/java/org/apache/camel/component/webhook/WebhookEndpointUriAssembler.java
index 8413cb5..15fc71f 100644
--- a/components/camel-webhook/src/generated/java/org/apache/camel/component/webhook/WebhookEndpointUriAssembler.java
+++ b/components/camel-webhook/src/generated/java/org/apache/camel/component/webhook/WebhookEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.webhook;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class WebhookEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "endpointUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "endpointUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-websocket-jsr356/src/generated/java/org/apache/camel/websocket/jsr356/JSR356WebSocketEndpointUriAssembler.java b/components/camel-websocket-jsr356/src/generated/java/org/apache/camel/websocket/jsr356/JSR356WebSocketEndpointUriAssembler.java
index b772ab6..24b357a 100644
--- a/components/camel-websocket-jsr356/src/generated/java/org/apache/camel/websocket/jsr356/JSR356WebSocketEndpointUriAssembler.java
+++ b/components/camel-websocket-jsr356/src/generated/java/org/apache/camel/websocket/jsr356/JSR356WebSocketEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.websocket.jsr356;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class JSR356WebSocketEndpointUriAssembler extends org.apache.camel.suppor
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "uri", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriAssembler.java b/components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriAssembler.java
index b3879ad..65db8fc 100644
--- a/components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriAssembler.java
+++ b/components/camel-websocket/src/generated/java/org/apache/camel/component/websocket/WebsocketEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.websocket;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class WebsocketEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", "0.0.0.0", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", "9292", false, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "host", "0.0.0.0", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "port", "9292", false, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriAssembler.java b/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriAssembler.java
index 108c095..af34523 100644
--- a/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriAssembler.java
+++ b/components/camel-weka/src/generated/java/org/apache/camel/component/weka/WekaEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.weka;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class WekaEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "command", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-wordpress/src/generated/java/org/apache/camel/component/wordpress/WordpressEndpointUriAssembler.java b/components/camel-wordpress/src/generated/java/org/apache/camel/component/wordpress/WordpressEndpointUriAssembler.java
index 64886a2..353f9a5 100644
--- a/components/camel-wordpress/src/generated/java/org/apache/camel/component/wordpress/WordpressEndpointUriAssembler.java
+++ b/components/camel-wordpress/src/generated/java/org/apache/camel/component/wordpress/WordpressEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.wordpress;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class WordpressEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "operationDetail", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "operation", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "operationDetail", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-workday/src/generated/java/org/apache/camel/component/workday/WorkdayEndpointUriAssembler.java b/components/camel-workday/src/generated/java/org/apache/camel/component/workday/WorkdayEndpointUriAssembler.java
index ae2e491..f8cb543 100644
--- a/components/camel-workday/src/generated/java/org/apache/camel/component/workday/WorkdayEndpointUriAssembler.java
+++ b/components/camel-workday/src/generated/java/org/apache/camel/component/workday/WorkdayEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.workday;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class WorkdayEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "entity", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "entity", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xchange/src/generated/java/org/apache/camel/component/xchange/XChangeEndpointUriAssembler.java b/components/camel-xchange/src/generated/java/org/apache/camel/component/xchange/XChangeEndpointUriAssembler.java
index 09c1b24..dc461ee 100644
--- a/components/camel-xchange/src/generated/java/org/apache/camel/component/xchange/XChangeEndpointUriAssembler.java
+++ b/components/camel-xchange/src/generated/java/org/apache/camel/component/xchange/XChangeEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xchange;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XChangeEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xj/src/generated/java/org/apache/camel/component/xj/XJEndpointUriAssembler.java b/components/camel-xj/src/generated/java/org/apache/camel/component/xj/XJEndpointUriAssembler.java
index 966891a..a4b8108 100644
--- a/components/camel-xj/src/generated/java/org/apache/camel/component/xj/XJEndpointUriAssembler.java
+++ b/components/camel-xj/src/generated/java/org/apache/camel/component/xj/XJEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xj;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XJEndpointUriAssembler extends org.apache.camel.support.component.E
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpointUriAssembler.java b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpointUriAssembler.java
index ce37bc3..65b6699 100644
--- a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpointUriAssembler.java
+++ b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xmlsecurity;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XmlSignerEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierEndpointUriAssembler.java b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierEndpointUriAssembler.java
index 64744f5..d5f6249 100644
--- a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierEndpointUriAssembler.java
+++ b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlVerifierEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xmlsecurity;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XmlVerifierEndpointUriAssembler extends org.apache.camel.support.co
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "name", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xmpp/src/generated/java/org/apache/camel/component/xmpp/XmppEndpointUriAssembler.java b/components/camel-xmpp/src/generated/java/org/apache/camel/component/xmpp/XmppEndpointUriAssembler.java
index 4af888d..2e053e0 100644
--- a/components/camel-xmpp/src/generated/java/org/apache/camel/component/xmpp/XmppEndpointUriAssembler.java
+++ b/components/camel-xmpp/src/generated/java/org/apache/camel/component/xmpp/XmppEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xmpp;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,10 +25,12 @@ public class XmppEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "host", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "port", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "participant", null, false, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        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, "participant", null, false, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xslt-saxon/src/generated/java/org/apache/camel/component/xslt/saxon/XsltSaxonEndpointUriAssembler.java b/components/camel-xslt-saxon/src/generated/java/org/apache/camel/component/xslt/saxon/XsltSaxonEndpointUriAssembler.java
index eb85752..67dd877 100644
--- a/components/camel-xslt-saxon/src/generated/java/org/apache/camel/component/xslt/saxon/XsltSaxonEndpointUriAssembler.java
+++ b/components/camel-xslt-saxon/src/generated/java/org/apache/camel/component/xslt/saxon/XsltSaxonEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xslt.saxon;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XsltSaxonEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-xslt/src/generated/java/org/apache/camel/component/xslt/XsltEndpointUriAssembler.java b/components/camel-xslt/src/generated/java/org/apache/camel/component/xslt/XsltEndpointUriAssembler.java
index 4e1603c..8b9c857 100644
--- a/components/camel-xslt/src/generated/java/org/apache/camel/component/xslt/XsltEndpointUriAssembler.java
+++ b/components/camel-xslt/src/generated/java/org/apache/camel/component/xslt/XsltEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.xslt;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class XsltEndpointUriAssembler extends org.apache.camel.support.component
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "resourceUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-yammer/src/generated/java/org/apache/camel/component/yammer/YammerEndpointUriAssembler.java b/components/camel-yammer/src/generated/java/org/apache/camel/component/yammer/YammerEndpointUriAssembler.java
index fa59e86..c77fc33 100644
--- a/components/camel-yammer/src/generated/java/org/apache/camel/component/yammer/YammerEndpointUriAssembler.java
+++ b/components/camel-yammer/src/generated/java/org/apache/camel/component/yammer/YammerEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.yammer;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class YammerEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "function", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriAssembler.java b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriAssembler.java
index 99dbc06..39295e3 100644
--- a/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriAssembler.java
+++ b/components/camel-zendesk/src/generated/java/org/apache/camel/component/zendesk/ZendeskEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.zendesk;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,8 +25,10 @@ public class ZendeskEndpointUriAssembler extends org.apache.camel.support.compon
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "methodName", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-zookeeper-master/src/generated/java/org/apache/camel/component/zookeepermaster/MasterEndpointUriAssembler.java b/components/camel-zookeeper-master/src/generated/java/org/apache/camel/component/zookeepermaster/MasterEndpointUriAssembler.java
index 5757cda..43c771b 100644
--- a/components/camel-zookeeper-master/src/generated/java/org/apache/camel/component/zookeepermaster/MasterEndpointUriAssembler.java
+++ b/components/camel-zookeeper-master/src/generated/java/org/apache/camel/component/zookeepermaster/MasterEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.zookeepermaster;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class MasterEndpointUriAssembler extends org.apache.camel.support.compone
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "groupName", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "consumerEndpointUri", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "groupName", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "consumerEndpointUri", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointUriAssembler.java b/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointUriAssembler.java
index 49c5535..69f652c 100644
--- a/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointUriAssembler.java
+++ b/components/camel-zookeeper/src/generated/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointUriAssembler.java
@@ -2,6 +2,7 @@
 package org.apache.camel.component.zookeeper;
 
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -24,9 +25,11 @@ public class ZooKeeperEndpointUriAssembler extends org.apache.camel.support.comp
         String syntax = scheme + BASE;
         String uri = syntax;
 
-        uri = buildPathParameter(camelContext, syntax, uri, "serverUrls", null, true, parameters);
-        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, parameters);
-        uri = buildQueryParameters(camelContext, uri, parameters);
+        Map<String, Object> copy = new HashMap<>(parameters);
+
+        uri = buildPathParameter(camelContext, syntax, uri, "serverUrls", null, true, copy);
+        uri = buildPathParameter(camelContext, syntax, uri, "path", null, true, copy);
+        uri = buildQueryParameters(camelContext, uri, copy);
         return uri;
     }
 }
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
index cb6ee24..cfcb0d5 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/component/EndpointUriAssemblerSupport.java
@@ -68,7 +68,14 @@ public abstract class EndpointUriAssemblerSupport {
         Map<String, Object> map = new TreeMap<>(parameters);
         String query = URISupport.createQueryString(map);
         if (ObjectHelper.isNotEmpty(query)) {
-            uri = uri + "?" + query;
+            // there may be a ? sign in the context path then use & instead
+            // (this is not correct but lets deal with this as the camel-catalog handled this)
+            boolean questionMark = uri.indexOf('?') != -1;
+            if (questionMark) {
+                uri = uri + "&" + query;
+            } else {
+                uri = uri + "?" + query;
+            }
         }
         return uri;
     }
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
index ebb61f9..90e8f0b 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointUriAssemblerGenerator.java
@@ -37,6 +37,7 @@ public final class EndpointUriAssemblerGenerator {
         w.write("package " + pn + ";\n");
         w.write("\n");
         w.write("import java.net.URISyntaxException;\n");
+        w.write("import java.util.HashMap;\n");
         w.write("import java.util.Map;\n");
         w.write("\n");
         w.write("import org.apache.camel.CamelContext;\n");
@@ -73,11 +74,13 @@ public final class EndpointUriAssemblerGenerator {
         w.write("        String syntax = scheme + BASE;\n");
         w.write("        String uri = syntax;\n");
         w.write("\n");
+        w.write("        Map<String, Object> copy = new HashMap<>(parameters);\n");
+        w.write("\n");
         for (BaseOptionModel option : model.getEndpointPathOptions()) {
             w.write("        uri = buildPathParameter(camelContext, syntax, uri, \"" + option.getName() + "\", "
-                    + defaultValue(option) + ", " + option.isRequired() + ", parameters);\n");
+                    + defaultValue(option) + ", " + option.isRequired() + ", copy);\n");
         }
-        w.write("        uri = buildQueryParameters(camelContext, uri, parameters);\n");
+        w.write("        uri = buildQueryParameters(camelContext, uri, copy);\n");
         w.write("        return uri;\n");
         w.write("    }\n");
         w.write("}\n");